Minor fixes to support sticky

Author: udesou

src/gc-mmtk.c

@@ -878,6 +878,7 @@ inline void mmtk_set_side_metadata(const void* side_metadata_base, void* obj) {
 STATIC_INLINE void mmtk_immortal_post_alloc_fast(MMTkMutatorContext* mutator, void* obj, size_t size) {
     if (MMTK_NEEDS_WRITE_BARRIER == MMTK_OBJECT_BARRIER) {
         mmtk_set_side_metadata(MMTK_SIDE_LOG_BIT_BASE_ADDRESS, obj);
+    }
 }
 
 JL_DLLEXPORT jl_value_t *jl_mmtk_gc_alloc_default(jl_ptls_t ptls, int osize, size_t align, void *ty)
@@ -1094,6 +1095,11 @@ void jl_gc_notify_image_load(const char* img_data, size_t len)
     mmtk_set_vm_space((void*)img_data, len);
 }
 
+void jl_gc_notify_image_alloc(const char* img_data, size_t len)
+{
+    mmtk_immortal_region_post_alloc((void*)img_data, len);
+}
+
 // ========================================================================= //
 // Code specific to stock that is not supported by MMTk
 // ========================================================================= //
@@ -1143,7 +1149,7 @@ JL_DLLEXPORT void jl_gc_queue_root(const struct _jl_value_t *ptr) JL_NOTSAFEPOIN
 {
     jl_task_t *ct = jl_current_task;
     jl_ptls_t ptls = ct->ptls;
-    mmtk_object_reference_write_slow(&ptls->gc_tls.mmtk_mutator, parent, (const void*) 0);
+    mmtk_object_reference_write_slow(&ptls->gc_tls.mmtk_mutator, ptr, (const void*) 0);
 }
 
 JL_DLLEXPORT void jl_gc_queue_multiroot(const struct _jl_value_t *root, const void *stored,
@@ -1225,82 +1231,6 @@ JL_DLLEXPORT jl_value_t *jl_gc_internal_obj_base_ptr(void *p)
     return NULL;
 }
 
-JL_DLLEXPORT void jl_genericmemory_copyto(jl_genericmemory_t *dest, char* destdata,
-                                          jl_genericmemory_t *src, char* srcdata,
-                                          size_t n) JL_NOTSAFEPOINT
-{
-    jl_datatype_t *dt = (jl_datatype_t*)jl_typetagof(dest);
-    if (dt != (jl_datatype_t*)jl_typetagof(src))
-        jl_exceptionf(jl_argumenterror_type, "jl_genericmemory_copyto requires source and dest to have same type");
-    const jl_datatype_layout_t *layout = dt->layout;
-    if (layout->flags.arrayelem_isboxed) {
-        _Atomic(void*) * dest_p = (_Atomic(void*)*)destdata;
-        _Atomic(void*) * src_p = (_Atomic(void*)*)srcdata;
-        jl_value_t *owner = jl_genericmemory_owner(dest);
-        jl_gc_wb(owner, NULL);
-        if (__unlikely(jl_astaggedvalue(owner)->bits.gc == GC_OLD_MARKED)) {
-            jl_value_t *src_owner = jl_genericmemory_owner(src);
-            ssize_t done = 0;
-            if (jl_astaggedvalue(src_owner)->bits.gc != GC_OLD_MARKED) {
-                if (dest_p < src_p || dest_p > src_p + n) {
-                    for (; done < n; done++) { // copy forwards
-                        void *val = jl_atomic_load_relaxed(src_p + done);
-                        jl_atomic_store_release(dest_p + done, val);
-                        // `val` is young or old-unmarked
-                        if (val && !(jl_astaggedvalue(val)->bits.gc & GC_MARKED)) {
-                            jl_gc_queue_root(owner);
-                            break;
-                        }
-                    }
-                    src_p += done;
-                    dest_p += done;
-                } else {
-                    for (; done < n; done++) { // copy backwards
-                        void *val = jl_atomic_load_relaxed(src_p + n - done - 1);
-                        jl_atomic_store_release(dest_p + n - done - 1, val);
-                        // `val` is young or old-unmarked
-                        if (val && !(jl_astaggedvalue(val)->bits.gc & GC_MARKED)) {
-                            jl_gc_queue_root(owner);
-                            break;
-                        }
-                    }
-                }
-                n -= done;
-            }
-        }
-        return memmove_refs(dest_p, src_p, n);
-    }
-    size_t elsz = layout->size;
-    char *src_p = srcdata;
-    int isbitsunion = layout->flags.arrayelem_isunion;
-    if (isbitsunion) {
-        char *sourcetypetagdata = jl_genericmemory_typetagdata(src);
-        char *desttypetagdata = jl_genericmemory_typetagdata(dest);
-        memmove(desttypetagdata+(size_t)destdata, sourcetypetagdata+(size_t)srcdata, n);
-        srcdata = (char*)src->ptr + elsz*(size_t)srcdata;
-        destdata = (char*)dest->ptr + elsz*(size_t)destdata;
-    }
-    if (layout->first_ptr != -1) {
-        memmove_refs((_Atomic(void*)*)destdata, (_Atomic(void*)*)srcdata, n * elsz / sizeof(void*));
-        jl_value_t *owner = jl_genericmemory_owner(dest);
-        if (__unlikely(jl_astaggedvalue(owner)->bits.gc == GC_OLD_MARKED)) {
-            jl_value_t *src_owner = jl_genericmemory_owner(src);
-            if (jl_astaggedvalue(src_owner)->bits.gc != GC_OLD_MARKED) {
-                dt = (jl_datatype_t*)jl_tparam1(dt);
-                for (size_t done = 0; done < n; done++) { // copy forwards
-                    char* s = (char*)src_p+done*elsz;
-                    if (*((jl_value_t**)s+layout->first_ptr) != NULL)
-                        jl_gc_queue_multiroot(owner, s, dt);
-                }
-            }
-        }
-    }
-    else {
-        memmove(destdata, srcdata, n * elsz);
-    }
-}
-
-
 #ifdef __cplusplus
 }
 #endif

src/julia.h

@@ -66,7 +66,6 @@
 
 typedef struct _jl_taggedvalue_t jl_taggedvalue_t;
 typedef struct _jl_tls_states_t *jl_ptls_t;
-typedef struct _jl_genericmemory_t jl_genericmemory_t;
 
 #ifdef JL_LIBRARY_EXPORTS
 #include "uv.h"
@@ -1226,12 +1225,6 @@ JL_DLLEXPORT void jl_free_stack(void *stkbuf, size_t bufsz);
 // thread-local allocator of the current thread.
 JL_DLLEXPORT jl_weakref_t *jl_gc_new_weakref(jl_value_t *value);
 
-#ifndef MMTK_GC
-#include "gc-wb-stock.h"
-#else
-#include "gc-wb-mmtk.h"
-#endif
-
 JL_DLLEXPORT void jl_gc_safepoint(void);
 JL_DLLEXPORT int jl_safepoint_suspend_thread(int tid, int waitstate);
 JL_DLLEXPORT void jl_safepoint_suspend_all_threads(struct _jl_task_t *ct);

src/staticdata.c

@@ -3480,6 +3480,7 @@ JL_DLLEXPORT jl_image_buf_t jl_preload_sysimg(const char *fname)
         ios_seek_end(&f);
         size_t len = ios_pos(&f);
         char *sysimg = (char*)jl_gc_perm_alloc(len, 0, 64, 0);
+        jl_gc_notify_image_alloc(sysimg, len);
         ios_seek(&f, 0);
 
         if (ios_readall(&f, sysimg, len) != len)
@@ -4264,9 +4265,10 @@ static jl_value_t *jl_restore_package_image_from_stream(ios_t *f, jl_image_t *im
         char *sysimg;
         int success = !needs_permalloc;
         ios_seek(f, datastartpos);
-        if (needs_permalloc)
+        if (needs_permalloc) {
             sysimg = (char*)jl_gc_perm_alloc(len, 0, 64, 0);
-        else
+            jl_gc_notify_image_alloc(sysimg, len);
+        } else
             sysimg = &f->buf[f->bpos];
         if (needs_permalloc)
             success = ios_readall(f, sysimg, len) == len;