Adding more OBJHASH_PIN and PTRHASH_PIN and fix jl_pinned_ref_create

Author: udesou

src/engine.cpp

@@ -27,12 +27,12 @@ template<> struct llvm::DenseMapInfo<InferKey> {
 
   static inline InferKey getEmptyKey() {
     return InferKey{FirstInfo::getEmptyKey(),
-                    jl_pinned_ref_create(jl_value_t, SecondInfo::getEmptyKey())};
+                    jl_pinned_ref_assume(jl_value_t, SecondInfo::getEmptyKey())};
   }
 
   static inline InferKey getTombstoneKey() {
     return InferKey{FirstInfo::getTombstoneKey(),
-                    jl_pinned_ref_create(jl_value_t, SecondInfo::getTombstoneKey())};
+                    jl_pinned_ref_assume(jl_value_t, SecondInfo::getTombstoneKey())};
   }
 
   static unsigned getHashValue(const InferKey& PairVal) {

src/genericmemory.c

@@ -47,6 +47,7 @@ JL_DLLEXPORT jl_genericmemory_t *jl_alloc_genericmemory_unchecked(jl_ptls_t ptls
     else {
         int isaligned = 1; // jl_gc_managed_malloc is always aligned
         jl_gc_track_malloced_genericmemory(ptls, m, isaligned);
+        OBJ_PIN(m);
         jl_genericmemory_data_owner_field(m) = (jl_value_t*)m;
     }
     // length set by codegen

src/precompile_utils.c

@@ -412,8 +412,12 @@ static void jl_rebuild_methtables(arraylist_t* MIs, htable_t* mtables)
         if ((jl_value_t *)old_mt == jl_nothing)
             continue;
         jl_sym_t *name = old_mt->name;
-        if (!ptrhash_has(mtables, old_mt))
-            ptrhash_put(mtables, old_mt, jl_new_method_table(name, m->module));
+        if (!ptrhash_has(mtables, old_mt)) {
+            jl_methtable_t *new_mt = jl_new_method_table(name, m->module);
+            OBJHASH_PIN(old_mt)
+            OBJHASH_PIN(new_mt)
+            ptrhash_put(mtables, old_mt, new_mt);
+        }
         jl_methtable_t *mt = (jl_methtable_t*)ptrhash_get(mtables, old_mt);
         size_t world =  jl_atomic_load_acquire(&jl_world_counter);
         jl_value_t * lookup = jl_methtable_lookup(mt, m->sig, world);

src/signals-mach.c

@@ -782,7 +782,7 @@ void jl_profile_thread_mach(int tid)
         profile_bt_data_prof[profile_bt_size_cur++].uintptr = ptls->tid + 1;
 
         // store task id (never null)
-        profile_bt_data_prof[profile_bt_size_cur++].jlvalue = (jl_value_t*)jl_atomic_load_relaxed(&ptls->current_task);
+        jl_pinned_ref_set(profile_bt_data_prof[profile_bt_size_cur++].jlvalue, (jl_value_t*)jl_atomic_load_relaxed(&ptls->current_task));
 
         // store cpu cycle clock
         profile_bt_data_prof[profile_bt_size_cur++].uintptr = cycleclock();

src/staticdata.c

@@ -2591,12 +2591,16 @@ static void jl_prune_module_bindings(jl_module_t * m) JL_GC_DISABLED
     void *idx = ptrhash_get(&serialization_order, bindings);
     assert(idx != HT_NOTFOUND && idx != (void*)(uintptr_t)-1);
     assert(serialization_queue.items[(char*)idx - 1 - (char*)HT_NOTFOUND] == bindings);
+    OBJHASH_PIN(bindings2)
+    OBJHASH_PIN(idx)
     ptrhash_put(&serialization_order, bindings2, idx);
     serialization_queue.items[(char*)idx - 1 - (char*)HT_NOTFOUND] = bindings2;
 
     idx = ptrhash_get(&serialization_order, bindingkeyset);
     assert(idx != HT_NOTFOUND && idx != (void*)(uintptr_t)-1);
     assert(serialization_queue.items[(char*)idx - 1 - (char*)HT_NOTFOUND] == bindingkeyset);
+    OBJHASH_PIN(jl_atomic_load_relaxed(&bindingkeyset2))
+    OBJHASH_PIN(idx)
     ptrhash_put(&serialization_order, jl_atomic_load_relaxed(&bindingkeyset2), idx);
     serialization_queue.items[(char*)idx - 1 - (char*)HT_NOTFOUND] = jl_atomic_load_relaxed(&bindingkeyset2);
     jl_atomic_store_relaxed(&m->bindings, bindings2);
@@ -2947,6 +2951,8 @@ static void jl_save_system_image_to_stream(ios_t *f, jl_array_t *mod_array,
             }
             else {
                 // replace the bits
+                OBJHASH_PIN(fldaddr)
+                OBJHASH_PIN(newval)
                 ptrhash_put(&bits_replace, (void*)fldaddr, newval);
                 // and any pointers inside
                 jl_datatype_t *rty = (jl_datatype_t*)jl_typeof(newval);
@@ -3006,6 +3012,7 @@ static void jl_save_system_image_to_stream(ios_t *f, jl_array_t *mod_array,
     htable_new(&fptr_to_id, sizeof(id_to_fptrs) / sizeof(*id_to_fptrs));
     uintptr_t i;
     for (i = 0; id_to_fptrs[i] != NULL; i++) {
+        PTRHASH_PIN(id_to_fptrs[i])
         ptrhash_put(&fptr_to_id, (void*)(uintptr_t)id_to_fptrs[i], (void*)(i + 2));
     }
     htable_new(&serialization_order, 25000);