suggestions from Yi' review

Author: d-netto

src/engine.cpp

@@ -18,7 +18,7 @@ struct ReservationInfo {
 
 struct InferKey {
     jl_method_instance_t *mi = nullptr;
-    jl_value_t *owner = nullptr;
+    JL_ROOT jl_value_t *owner = nullptr;
 };
 
 template<> struct llvm::DenseMapInfo<InferKey> {
@@ -64,15 +64,15 @@ jl_code_instance_t *jl_engine_reserve(jl_method_instance_t *m, jl_value_t *owner
     auto tid = jl_atomic_load_relaxed(&ct->tid);
     if (([tid, m, owner, ci] () -> bool { // necessary scope block / lambda for unique_lock
             jl_unique_gcsafe_lock lock(engine_lock);
-            arraylist_push(&objects_pinned_by_inference_engine, owner);
+            arraylist_push(&gc_pinned_objects, owner);
             InferKey key{m, owner};
             if ((signed)Awaiting.size() < tid + 1)
                 Awaiting.resize(tid + 1);
             while (1) {
                 auto record = Reservations.find(key);
                 if (record == Reservations.end()) {
                     Reservations[key] = ReservationInfo{tid, ci};
-                    arraylist_pop(&objects_pinned_by_inference_engine);
+                    arraylist_pop(&gc_pinned_objects);
                     return false;
                 }
                 // before waiting, need to run deadlock/cycle detection
@@ -81,7 +81,7 @@ jl_code_instance_t *jl_engine_reserve(jl_method_instance_t *m, jl_value_t *owner
                 auto wait_tid = record->second.tid;
                 while (1) {
                     if (wait_tid == tid) {
-                        arraylist_pop(&objects_pinned_by_inference_engine);
+                        arraylist_pop(&gc_pinned_objects);
                         return true;
                     }
                     if ((signed)Awaiting.size() <= wait_tid)
@@ -99,7 +99,7 @@ jl_code_instance_t *jl_engine_reserve(jl_method_instance_t *m, jl_value_t *owner
                 lock.wait(engine_wait);
                 Awaiting[tid] = InferKey{};
             }
-            arraylist_pop(&objects_pinned_by_inference_engine);
+            arraylist_pop(&gc_pinned_objects);
         })())
         ct->ptls->engine_nqueued--;
     JL_GC_POP();

src/gc-common.c

@@ -687,7 +687,7 @@ JL_DLLEXPORT int jl_gc_enable(int on)
 // MISC
 // =========================================================================== //
 
-arraylist_t objects_pinned_by_inference_engine;
+arraylist_t gc_pinned_objects;
 
 JL_DLLEXPORT jl_weakref_t *jl_gc_new_weakref(jl_value_t *value)
 {

src/gc-mmtk.c

@@ -74,7 +74,7 @@ void jl_gc_init(void) {
 
     jl_set_check_alive_type(mmtk_is_reachable_object);
 
-    arraylist_new(&objects_pinned_by_inference_engine, 0);
+    arraylist_new(&gc_pinned_objects, 0);
     arraylist_new(&to_finalize, 0);
     arraylist_new(&finalizer_list_marked, 0);
     gc_num.interval = default_collect_interval;
@@ -251,8 +251,8 @@ JL_DLLEXPORT void jl_gc_collect(jl_gc_collection_t collection) {
 
 void gc_pin_objects_from_inference_engine(arraylist_t *objects_pinned_by_call)
 {
-    for (size_t i = 0; i < objects_pinned_by_inference_engine.len; i++) {
-        void *obj = objects_pinned_by_inference_engine.items[i];
+    for (size_t i = 0; i < gc_pinned_objects.len; i++) {
+        void *obj = gc_pinned_objects.items[i];
         unsigned char got_pinned = mmtk_pin_object(obj);
         if (got_pinned) {
             arraylist_push(objects_pinned_by_call, obj);

src/julia.h

@@ -1346,7 +1346,7 @@ JL_DLLEXPORT JL_CONST_FUNC jl_gcframe_t **(jl_get_pgcstack)(void) JL_GLOBALLY_RO
 
 // object pinning  ------------------------------------------------------------
 
-extern arraylist_t objects_pinned_by_inference_engine;
+extern arraylist_t gc_pinned_objects;
 typedef bool (*check_alive_fn_type)(void *);
 JL_DLLEXPORT void jl_set_check_alive_type(check_alive_fn_type fn);
 JL_DLLEXPORT void jl_log_pinning_event(void *pinned_object, const char *filename, int lineno);

src/support/analyzer_annotations.h

@@ -15,6 +15,7 @@
 #define JL_NOTSAFEPOINT_ENTER __attribute__((annotate("julia_notsafepoint_enter")))
 #define JL_NOTSAFEPOINT_LEAVE __attribute__((annotate("julia_notsafepoint_leave")))
 #define JL_MAYBE_UNROOTED __attribute__((annotate("julia_maybe_unrooted")))
+#define JL_ROOT __attribute__((annotate("julia_rooted")))
 #define JL_GLOBALLY_ROOTED __attribute__((annotate("julia_globally_rooted")))
 #define JL_ROOTING_ARGUMENT __attribute__((annotate("julia_rooting_argument")))
 #define JL_ROOTED_ARGUMENT __attribute__((annotate("julia_rooted_argument")))
@@ -38,6 +39,7 @@ extern "C" {
 #define JL_NOTSAFEPOINT_ENTER
 #define JL_NOTSAFEPOINT_LEAVE
 #define JL_MAYBE_UNROOTED
+#define JL_ROOT
 #define JL_GLOBALLY_ROOTED
 #define JL_ROOTING_ARGUMENT
 #define JL_ROOTED_ARGUMENT