[前][次][番号順一覧][スレッド一覧]

ruby-changes:72508

From: Takashi <ko1@a...>
Date: Tue, 12 Jul 2022 15:50:55 +0900 (JST)
Subject: [ruby-changes:72508] cbcc92f788 (master): MJIT: s/assert/VM_ASSERT/

https://git.ruby-lang.org/ruby.git/commit/?id=cbcc92f788

From cbcc92f7888a7e2425edf57ee82d992c6cbb4f78 Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@g...>
Date: Mon, 11 Jul 2022 23:49:11 -0700
Subject: MJIT: s/assert/VM_ASSERT/

include/ruby/assert.h sets NDEBUG by default.
As MJIT CI uses -DVM_CHECK_MODE, using only VM_ASSERT might be more
helpful.
---
 mjit.c        | 4 ++--
 mjit_worker.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mjit.c b/mjit.c
index d687075b03..a5c89a1ced 100644
--- a/mjit.c
+++ b/mjit.c
@@ -484,7 +484,7 @@ rb_mjit_wait_call(rb_execution_context_t *ec, struct rb_iseq_constant_body *body https://github.com/ruby/ruby/blob/trunk/mjit.c#L484
 struct rb_mjit_compile_info*
 rb_mjit_iseq_compile_info(const struct rb_iseq_constant_body *body)
 {
-    assert(body->jit_unit != NULL);
+    VM_ASSERT(body->jit_unit != NULL);
     return &body->jit_unit->compile_info;
 }
 
@@ -496,7 +496,7 @@ mjit_recompile(const rb_iseq_t *iseq) https://github.com/ruby/ruby/blob/trunk/mjit.c#L496
 
     verbose(1, "JIT recompile: %s@%s:%d", RSTRING_PTR(ISEQ_BODY(iseq)->location.label),
             RSTRING_PTR(rb_iseq_path(iseq)), FIX2INT(ISEQ_BODY(iseq)->location.first_lineno));
-    assert(ISEQ_BODY(iseq)->jit_unit != NULL);
+    VM_ASSERT(ISEQ_BODY(iseq)->jit_unit != NULL);
 
     mjit_add_iseq_to_process(iseq, &ISEQ_BODY(iseq)->jit_unit->compile_info, true);
     check_unit_queue();
diff --git a/mjit_worker.c b/mjit_worker.c
index 95c127759e..f164a0957e 100644
--- a/mjit_worker.c
+++ b/mjit_worker.c
@@ -1235,7 +1235,7 @@ unload_units(void) https://github.com/ruby/ruby/blob/trunk/mjit_worker.c#L1235
 
     // Detect units which are in use and can't be unloaded.
     ccan_list_for_each(&active_units.head, unit, unode) {
-        assert(unit->iseq != NULL && unit->handle != NULL);
+        VM_ASSERT(unit->iseq != NULL && unit->handle != NULL);
         unit->used_code_p = false;
     }
     // All threads have a root_fiber which has a mjit_cont. Other normal fibers also
@@ -1267,7 +1267,7 @@ unload_units(void) https://github.com/ruby/ruby/blob/trunk/mjit_worker.c#L1267
             if (max_queue_calls > ISEQ_BODY(unit->iseq)->total_calls) {
                 verbose(2, "Unloading unit %d (calls=%lu, threshold=%lu)",
                         unit->id, ISEQ_BODY(unit->iseq)->total_calls, max_queue_calls);
-                assert(unit->handle != NULL);
+                VM_ASSERT(unit->handle != NULL);
                 remove_from_list(unit, &active_units);
                 free_unit(unit);
                 unloaded_p = true;
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]