Merge pull request #17385 from JuliaLang/yyc/gc/array-wb

Fix array copy write barrier check
JuliaLang · Jul 12, 2016 · f881efb · f881efb
2 parents 38c803d + c13c6d9
commit f881efb
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/array.c b/src/array.c
@@ -965,8 +965,9 @@ JL_DLLEXPORT void jl_array_ptr_copy(jl_array_t *dest, void **dest_p,
     // Destination is old and doesn't refer to any young object
     if (__unlikely(jl_astaggedvalue(owner)->bits.gc == GC_OLD_MARKED)) {
         jl_value_t *src_owner = jl_array_owner(src);
-        // Source is young or might refer to young objects
-        if (!(jl_astaggedvalue(src_owner)->bits.gc & GC_OLD)) {
+        // Source is young or being promoted or might refer to young objects
+        // (i.e. source is not an old object that doesn't have wb triggered)
+        if (jl_astaggedvalue(src_owner)->bits.gc != GC_OLD_MARKED) {
             ssize_t done;
             if (dest_p < src_p || dest_p > src_p + n) {
                 done = jl_array_ptr_copy_forward(owner, src_p, dest_p, n);