More gc

Author: timholy

src/dump.c

@@ -2348,7 +2348,8 @@ static void jl_insert_backedges(jl_array_t *list, jl_array_t *targets)
     // map(enable, ((list[i] => targets[list[i + 1] .* 2]) for i in 1:2:length(list) if all(valids[list[i + 1]])))
     size_t i, l = jl_array_len(list);
     jl_array_t *valids = NULL;
-    JL_GC_PUSH1(&valids);
+    jl_value_t *loctag = NULL;
+    JL_GC_PUSH3(&valids, &_jl_debug_method_invalidation, &loctag);
     jl_verify_edges(targets, &valids);
     for (i = 0; i < l; i += 2) {
         jl_method_instance_t *caller = (jl_method_instance_t*)jl_array_ptr_ref(list, i);
@@ -2388,7 +2389,9 @@ static void jl_insert_backedges(jl_array_t *list, jl_array_t *targets)
         else {
             if (_jl_debug_method_invalidation) {
                 jl_array_ptr_1d_push(_jl_debug_method_invalidation, (jl_value_t*)caller);
-                jl_array_ptr_1d_push(_jl_debug_method_invalidation, jl_cstr_to_string("insert_backedges"));
+                loctag = jl_cstr_to_string("insert_backedges");
+                jl_gc_wb(_jl_debug_method_invalidation, loctag);
+                jl_array_ptr_1d_push(_jl_debug_method_invalidation, loctag);
             }
         }
     }

src/gf.c

@@ -1502,8 +1502,13 @@ JL_DLLEXPORT jl_value_t *jl_debug_method_invalidation(int state)
 static void invalidate_method_instance(jl_method_instance_t *replaced, size_t max_world, int depth)
 {
     if (_jl_debug_method_invalidation) {
+        jl_value_t *boxeddepth = NULL;
+        JL_GC_PUSH2(&_jl_debug_method_invalidation, boxeddepth);
         jl_array_ptr_1d_push(_jl_debug_method_invalidation, (jl_value_t*)replaced);
-        jl_array_ptr_1d_push(_jl_debug_method_invalidation, jl_box_int32(depth));
+        boxeddepth = jl_box_int32(depth);
+        jl_array_ptr_1d_push(_jl_debug_method_invalidation, boxeddepth);
+        jl_gc_wb(_jl_debug_method_invalidation, boxeddepth);
+        JL_GC_POP();
     }
     if (!jl_is_method(replaced->def.method))
         return; // shouldn't happen, but better to be safe
@@ -1631,8 +1636,13 @@ static int invalidate_mt_cache(jl_typemap_entry_t *oldentry, void *closure0)
         }
         if (intersects) {
             if (_jl_debug_method_invalidation) {
+                jl_value_t *loctag = NULL;
+                JL_GC_PUSH2(&_jl_debug_method_invalidation, &loctag);
                 jl_array_ptr_1d_push(_jl_debug_method_invalidation, (jl_value_t*)mi);
-                jl_array_ptr_1d_push(_jl_debug_method_invalidation, jl_cstr_to_string("mt"));
+                loctag = jl_cstr_to_string("mt");
+                jl_gc_wb(_jl_debug_method_invalidation, loctag);
+                jl_array_ptr_1d_push(_jl_debug_method_invalidation, loctag);
+                JL_GC_POP();
             }
             oldentry->max_world = env->max_world;
         }
@@ -1700,7 +1710,7 @@ JL_DLLEXPORT void jl_method_table_insert(jl_methtable_t *mt, jl_method_t *method
         method->primary_world = ++jl_world_counter;
     size_t max_world = method->primary_world - 1;
     int invalidated = 0;
-    JL_GC_PUSH1(&oldvalue);
+    JL_GC_PUSH2(&oldvalue, &_jl_debug_method_invalidation);
     JL_LOCK(&mt->writelock);
     // first delete the existing entry (we'll disable it later)
     struct jl_typemap_assoc search = {(jl_value_t*)type, method->primary_world, NULL, 0, ~(size_t)0};