Update how OMR_SELF_FORWARDED_TAG is defined

Signed-off-by: Igor Braga <higorb1@gmail.com>
eclipse · Jan 27, 2021 · de70a26 · de70a26
1 parent a10621b
commit de70a26
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/gc/structs/ForwardedHeader.hpp b/gc/structs/ForwardedHeader.hpp
@@ -42,14 +42,10 @@
    This hint is not necessary for correctness of copying protocol, it's just an optimization to avoid visiting destination object header
    in cases when it's likely not in data cash (GC thread encountering already forwarded object) */
 #define OMR_BEING_COPIED_HINT 2
-/* Define OMR_SELF_FORWARDED_TAG */
-#if defined(J9_GC_MULTI_SLOT_HOLE)
-#define OMR_SELF_FORWARDED_TAG J9_GC_MULTI_SLOT_HOLE
-#else
+/* We define OMR_SELF_FORWARDED_TAG as 1 and not as J9_GC_MULTI_SLOT_HOLE (due to DDR pre-preprocessor limitation of not processing #includes properly) */
 #define OMR_SELF_FORWARDED_TAG 1
-#endif
 /* combine OMR_FORWARDED_TAG with OMR_BEING_COPIED_HINT and OMR_SELF_FORWARDED_TAG into one mask which should be stripped from the pointer in order to remove all tags */
-#define OMR_FORWARDED_TAG_MASK (OMR_FORWARDED_TAG | OMR_BEING_COPIED_HINT | (uintptr_t)OMR_SELF_FORWARDED_TAG)
+#define OMR_FORWARDED_TAG_MASK (OMR_FORWARDED_TAG | OMR_BEING_COPIED_HINT | OMR_SELF_FORWARDED_TAG)
 
 
 /* Destination object header bits, masks, consts... */