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

ruby-changes:63416

From: Aaron <ko1@a...>
Date: Fri, 23 Oct 2020 01:52:35 +0900 (JST)
Subject: [ruby-changes:63416] 9a6720a15d (master): Revert "Add assertions when inline caches are copied to MJIT"

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

From 9a6720a15d1e0c7c2423e99efecc3447484abb8f Mon Sep 17 00:00:00 2001
From: Aaron Patterson <tenderlove@r...>
Date: Thu, 22 Oct 2020 09:49:26 -0700
Subject: Revert "Add assertions when inline caches are copied to MJIT"

This reverts commit 6cb6d5abc36ede9d5158c2cd90734134838e6bfb.
This reverts commit 1484b786aee8d411a9e2278ac6d6e44aedbf6662.

I think we don't need these assertions anymore.  I believe the problem
is solved by abf678a4397c6c00a1bb686043e377d372e695a4

diff --git a/mjit_worker.c b/mjit_worker.c
index 63f976a..ee2259b 100644
--- a/mjit_worker.c
+++ b/mjit_worker.c
@@ -1261,17 +1261,6 @@ mjit_capture_cc_entries(const struct rb_iseq_constant_body *compiled_iseq, const https://github.com/ruby/ruby/blob/trunk/mjit_worker.c#L1261
     // Capture cc to cc_enties
     for (unsigned int i = 0; i < captured_iseq->ci_size; i++) {
         cc_entries[i] = captured_iseq->call_data[i].cc;
-
-        // Adding assertions to debug GC problem.
-        // FIXME: remove these when we find it
-        const struct rb_callcache *cc = cc_entries[i];
-
-        if (cc && vm_cc_markable(cc)) {
-            assert(BUILTIN_TYPE((VALUE)cc) != T_MOVED);
-            assert(BUILTIN_TYPE((VALUE)vm_cc_cme(cc)) != T_MOVED);
-            assert(!rb_objspace_garbage_object_p((VALUE)cc));
-            assert(!rb_objspace_garbage_object_p((VALUE)vm_cc_cme(cc)));
-        }
     }
 
     return cc_entries_index;
-- 
cgit v0.10.2


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

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