projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2820 from kumpera/license-change-rebased
[mono.git]
/
mono
/
sgen
/
sgen-marksweep-drain-gray-stack.h
diff --git
a/mono/sgen/sgen-marksweep-drain-gray-stack.h
b/mono/sgen/sgen-marksweep-drain-gray-stack.h
index 15ccf336df6f9eddb4d909ad0b448a54c62793eb..ad2bb6fe272a44cbf08ce80ac65da5dbd177a0c7 100644
(file)
--- a/
mono/sgen/sgen-marksweep-drain-gray-stack.h
+++ b/
mono/sgen/sgen-marksweep-drain-gray-stack.h
@@
-223,7
+223,7
@@
SCAN_OBJECT_FUNCTION_NAME (GCObject *full_object, SgenDescriptor desc, SgenGrayQ
COPY_OR_MARK_FUNCTION_NAME ((ptr), __old, queue); \
} \
} else { \
COPY_OR_MARK_FUNCTION_NAME ((ptr), __old, queue); \
} \
} else { \
- if (G_UNLIKELY (sgen_ptr_in_nursery (__old) && !sgen_ptr_in_nursery ((ptr)))) \
+ if (G_UNLIKELY (sgen_ptr_in_nursery (__old) && !sgen_ptr_in_nursery ((ptr))
&& !sgen_cement_is_forced (__old)
)) \
mark_mod_union_card ((full_object), (void**)(ptr), __old); \
} \
} while (0)
mark_mod_union_card ((full_object), (void**)(ptr), __old); \
} \
} while (0)
@@
-235,7
+235,7
@@
SCAN_OBJECT_FUNCTION_NAME (GCObject *full_object, SgenDescriptor desc, SgenGrayQ
PREFETCH_READ (__old); \
COPY_OR_MARK_FUNCTION_NAME ((ptr), __old, queue); \
} else { \
PREFETCH_READ (__old); \
COPY_OR_MARK_FUNCTION_NAME ((ptr), __old, queue); \
} else { \
- if (G_UNLIKELY (sgen_ptr_in_nursery (__old) && !sgen_ptr_in_nursery ((ptr)))) \
+ if (G_UNLIKELY (sgen_ptr_in_nursery (__old) && !sgen_ptr_in_nursery ((ptr))
&& !sgen_cement_is_forced (__old)
)) \
mark_mod_union_card ((full_object), (void**)(ptr), __old); \
} \
} while (0)
mark_mod_union_card ((full_object), (void**)(ptr), __old); \
} \
} while (0)