Skip to content

Commit 1707c3f

Browse files
gacholiogacholio
authored
Merge pull request #11691 from sharon-wang/corprotected
Fix DDR field inconsistency in mixed refs builds
2 parents 266490a + 9e27c71 commit 1707c3f

19 files changed

+122
-117
lines changed

‎runtime/gc_base/ObjectAccessBarrier.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 1991, 2020 IBM Corp. and others
2+
* Copyright (c) 1991, 2021 IBM Corp. and others
33
*
44
* This program and the accompanying materials are made available under
55
* the terms of the Eclipse Public License 2.0 which accompanies this
@@ -50,7 +50,7 @@ MM_ObjectAccessBarrier::initialize(MM_EnvironmentBase *env)
5050
J9JavaVM *vm = (J9JavaVM*)env->getOmrVM()->_language_vm;
5151
OMR_VM *omrVM = env->getOmrVM();
5252

53-
#if defined (OMR_GC_COMPRESSED_POINTERS)
53+
#if defined(OMR_GC_COMPRESSED_POINTERS)
5454
if (env->compressObjectReferences()) {
5555

5656
#if defined(J9VM_GC_REALTIME)
@@ -67,14 +67,14 @@ MM_ObjectAccessBarrier::initialize(MM_EnvironmentBase *env)
6767
}
6868
#endif /* J9VM_GC_REALTIME */
6969

70-
#if defined (OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES)
70+
#if defined(OMR_GC_FULL_POINTERS)
7171
_compressObjectReferences = true;
72-
#endif /* defined (OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES) */
72+
#endif /* defined(OMR_GC_FULL_POINTERS) */
7373
_compressedPointersShift = omrVM->_compressedPointersShift;
7474
vm->compressedPointersShift = omrVM->_compressedPointersShift;
7575
Trc_MM_CompressedAccessBarrierInitialized(env->getLanguageVMThread(), 0, _compressedPointersShift);
7676
}
77-
#endif /* OMR_GC_COMPRESSED_POINTERS */
77+
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) */
7878

7979
vm->objectAlignmentInBytes = omrVM->_objectAlignmentInBytes;
8080
vm->objectAlignmentShift = omrVM->_objectAlignmentShift;

‎runtime/gc_base/ObjectAccessBarrier.hpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 1991, 2020 IBM Corp. and others
2+
* Copyright (c) 1991, 2021 IBM Corp. and others
33
*
44
* This program and the accompanying materials are made available under
55
* the terms of the Eclipse Public License 2.0 which accompanies this
@@ -53,12 +53,12 @@ class MM_ObjectAccessBarrier : public MM_BaseVirtual
5353
protected:
5454
MM_GCExtensions *_extensions;
5555
MM_Heap *_heap;
56-
#if defined (OMR_GC_COMPRESSED_POINTERS)
57-
#if defined (OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES)
56+
#if defined(OMR_GC_COMPRESSED_POINTERS)
57+
#if defined(OMR_GC_FULL_POINTERS)
5858
bool _compressObjectReferences;
59-
#endif /* defined (OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES) */
59+
#endif /* defined(OMR_GC_FULL_POINTERS) */
6060
UDATA _compressedPointersShift; /**< the number of bits to shift by when converting between the compressed pointers heap and real heap */
61-
#endif /* defined (OMR_GC_COMPRESSED_POINTERS) */
61+
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) */
6262
UDATA _referenceLinkOffset; /** Offset within java/lang/ref/Reference of the reference link field */
6363
UDATA _ownableSynchronizerLinkOffset; /** Offset within java/util/concurrent/locks/AbstractOwnableSynchronizer of the ownable synchronizer link field */
6464
public:
@@ -572,12 +572,12 @@ class MM_ObjectAccessBarrier : public MM_BaseVirtual
572572
MM_ObjectAccessBarrier(MM_EnvironmentBase *env) : MM_BaseVirtual()
573573
, _extensions(NULL)
574574
, _heap(NULL)
575-
#if defined (OMR_GC_COMPRESSED_POINTERS)
576-
#if defined (OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES)
575+
#if defined(OMR_GC_COMPRESSED_POINTERS)
576+
#if defined(OMR_GC_FULL_POINTERS)
577577
, _compressObjectReferences(false)
578-
#endif /* defined (OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES) */
578+
#endif /* defined(OMR_GC_FULL_POINTERS) */
579579
, _compressedPointersShift(0)
580-
#endif /* OMR_GC_COMPRESSED_POINTERS */
580+
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) */
581581
, _referenceLinkOffset(UDATA_MAX)
582582
, _ownableSynchronizerLinkOffset(UDATA_MAX)
583583
{

‎runtime/gc_base/ScavengerForwardedHeader.hpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 1991, 2020 IBM Corp. and others
2+
* Copyright (c) 1991, 2021 IBM Corp. and others
33
*
44
* This program and the accompanying materials are made available under
55
* the terms of the Eclipse Public License 2.0 which accompanies this
@@ -58,9 +58,9 @@ class MM_ScavengerForwardedHeader
5858
protected:
5959
omrobjectptr_t _objectPtr; /**< the object on which to act */
6060
UDATA _preserved; /**< a backup copy of the header fields which may be modified by this class */
61-
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES)
62-
bool _compressObjectReferences;
63-
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES) */
61+
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS)
62+
bool const _compressObjectReferences;
63+
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) */
6464
private:
6565

6666
public:
@@ -300,9 +300,9 @@ class MM_ScavengerForwardedHeader
300300
MM_ScavengerForwardedHeader(omrobjectptr_t object, MM_GCExtensionsBase *extensions) :
301301
_objectPtr(object)
302302
, _preserved(*(volatile UDATA *)_objectPtr)
303-
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES)
303+
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS)
304304
, _compressObjectReferences(extensions->compressObjectReferences())
305-
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES) */
305+
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) */
306306
{
307307
}
308308

@@ -323,9 +323,9 @@ class MM_ScavengerForwardedHeader
323323
MM_ScavengerForwardedHeader(omrobjectptr_t object, bool compress) :
324324
_objectPtr(object)
325325
, _preserved(*(volatile UDATA *)_objectPtr)
326-
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES)
326+
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS)
327327
, _compressObjectReferences(compress)
328-
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES) */
328+
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) */
329329
{
330330
}
331331

‎runtime/gc_glue_java/ArrayletObjectModelBase.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 1991, 2020 IBM Corp. and others
2+
* Copyright (c) 1991, 2021 IBM Corp. and others
33
*
44
* This program and the accompanying materials are made available under
55
* the terms of the Eclipse Public License 2.0 which accompanies this
@@ -26,9 +26,9 @@
2626
bool
2727
GC_ArrayletObjectModelBase::initialize(MM_GCExtensionsBase * extensions)
2828
{
29-
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES)
29+
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS)
3030
_compressObjectReferences = extensions->compressObjectReferences();
31-
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES) */
31+
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) */
3232
_omrVM = extensions->getOmrVM();
3333
_arrayletRangeBase = NULL;
3434
_arrayletRangeTop = (void *)UDATA_MAX;

‎runtime/gc_glue_java/ArrayletObjectModelBase.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 1991, 2020 IBM Corp. and others
2+
* Copyright (c) 1991, 2021 IBM Corp. and others
33
*
44
* This program and the accompanying materials are made available under
55
* the terms of the Eclipse Public License 2.0 which accompanies this
@@ -41,13 +41,13 @@ class GC_ArrayletObjectModelBase
4141
* Data members
4242
*/
4343
private:
44-
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES)
45-
bool _compressObjectReferences;
46-
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES) */
4744
#if defined(J9VM_GC_ENABLE_DOUBLE_MAP)
4845
bool _enableDoubleMapping; /** Allows arraylets to be double mapped */
4946
#endif /* J9VM_GC_ENABLE_DOUBLE_MAP */
5047
protected:
48+
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS)
49+
bool _compressObjectReferences;
50+
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) */
5151
OMR_VM *_omrVM; /**< used so that we can pull the arrayletLeafSize and arrayletLeafLogSize for arraylet sizing calculations */
5252
void * _arrayletRangeBase; /**< The base heap range of where discontiguous arraylets are allowed. */
5353
void * _arrayletRangeTop; /**< The top heap range of where discontiguous arraylets are allowed. */

‎runtime/gc_glue_java/MixedObjectModel.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 1991, 2020 IBM Corp. and others
2+
* Copyright (c) 1991, 2021 IBM Corp. and others
33
*
44
* This program and the accompanying materials are made available under
55
* the terms of the Eclipse Public License 2.0 which accompanies this
@@ -27,9 +27,9 @@
2727
bool
2828
GC_MixedObjectModel::initialize(MM_GCExtensionsBase *extensions)
2929
{
30-
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES)
30+
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS)
3131
_compressObjectReferences = extensions->compressObjectReferences();
32-
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES) */
32+
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) */
3333
return true;
3434
}
3535

‎runtime/gc_glue_java/MixedObjectModel.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 1991, 2020 IBM Corp. and others
2+
* Copyright (c) 1991, 2021 IBM Corp. and others
33
*
44
* This program and the accompanying materials are made available under
55
* the terms of the Eclipse Public License 2.0 which accompanies this
@@ -43,10 +43,10 @@ class GC_MixedObjectModel
4343
* Data members
4444
*/
4545
private:
46-
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES)
47-
bool _compressObjectReferences;
48-
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES) */
4946
protected:
47+
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS)
48+
bool _compressObjectReferences;
49+
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) */
5050
public:
5151

5252
/*

‎runtime/gc_glue_java/ObjectModelDelegate.hpp

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2017, 2020 IBM Corp. and others
2+
* Copyright (c) 2017, 2021 IBM Corp. and others
33
*
44
* This program and the accompanying materials are made available under
55
* the terms of the Eclipse Public License 2.0 which accompanies this
@@ -51,16 +51,15 @@ class GC_ObjectModelDelegate
5151
static const uintptr_t _objectHeaderSlotOffset = 0;
5252
static const uintptr_t _objectHeaderSlotFlagsShift = 0;
5353

54-
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS)
55-
bool _compressObjectReferences;
56-
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) */
57-
5854
const uintptr_t _delegateHeaderSlotFlagsMask;
5955

6056
GC_ArrayObjectModel *_arrayObjectModel;
6157
GC_MixedObjectModel *_mixedObjectModel;
6258

6359
protected:
60+
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS)
61+
bool _compressObjectReferences;
62+
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) */
6463
public:
6564

6665
/*

‎runtime/gc_glue_java/ScavengerDelegate.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2019, 2020 IBM Corp. and others
2+
* Copyright (c) 2019, 2021 IBM Corp. and others
33
*
44
* This program and the accompanying materials are made available under
55
* the terms of the Eclipse Public License 2.0 which accompanies this
@@ -803,9 +803,6 @@ MM_ScavengerDelegate::MM_ScavengerDelegate(MM_EnvironmentBase* env)
803803
: _omrVM(MM_GCExtensions::getExtensions(env)->getOmrVM())
804804
, _javaVM(MM_GCExtensions::getExtensions(env)->getJavaVM())
805805
, _extensions(MM_GCExtensions::getExtensions(env))
806-
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES)
807-
, _compressObjectReferences(env->compressObjectReferences())
808-
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES) */
809806
, _shouldScavengeFinalizableObjects(false)
810807
, _shouldScavengeUnfinalizedObjects(false)
811808
, _shouldScavengeSoftReferenceObjects(false)
@@ -817,6 +814,9 @@ MM_ScavengerDelegate::MM_ScavengerDelegate(MM_EnvironmentBase* env)
817814
#if defined(OMR_GC_CONCURRENT_SCAVENGER)
818815
, _flushCachesAsyncCallbackKey(-1)
819816
#endif /* OMR_GC_CONCURRENT_SCAVENGER */
817+
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS)
818+
, _compressObjectReferences(env->compressObjectReferences())
819+
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) */
820820
{
821821
_typeId = __FUNCTION__;
822822
}

‎runtime/gc_glue_java/ScavengerDelegate.hpp

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2019, 2020 IBM Corp. and others
2+
* Copyright (c) 2019, 2021 IBM Corp. and others
33
*
44
* This program and the accompanying materials are made available under
55
* the terms of the Eclipse Public License 2.0 which accompanies this
@@ -60,13 +60,12 @@ class MM_ParallelSweepScheme;
6060
* @ingroup GC_Base
6161
*/
6262
class MM_ScavengerDelegate : public MM_BaseNonVirtual {
63+
64+
/* Data members & types */
6365
private:
6466
OMR_VM *_omrVM;
6567
J9JavaVM *_javaVM;
6668
MM_GCExtensions *_extensions;
67-
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES)
68-
bool _compressObjectReferences;
69-
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES) */
7069
volatile bool _shouldScavengeFinalizableObjects; /**< Set to true at the beginning of a collection if there are any pending finalizable objects */
7170
volatile bool _shouldScavengeUnfinalizedObjects; /**< Set to true at the beginning of a collection if there are any unfinalized objects */
7271
volatile bool _shouldScavengeSoftReferenceObjects; /**< Set to true if there are any SoftReference objects discovered */
@@ -81,8 +80,13 @@ class MM_ScavengerDelegate : public MM_BaseNonVirtual {
8180
#endif /* OMR_GC_CONCURRENT_SCAVENGER */
8281

8382
protected:
83+
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS)
84+
bool _compressObjectReferences;
85+
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) */
86+
8487
public:
8588

89+
/* Methods */
8690
private:
8791

8892
/*

‎runtime/gc_include/ObjectAccessBarrierAPI.hpp

+12-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 1991, 2020 IBM Corp. and others
2+
* Copyright (c) 1991, 2021 IBM Corp. and others
33
*
44
* This program and the accompanying materials are made available under
55
* the terms of the Eclipse Public License 2.0 which accompanies this
@@ -52,16 +52,18 @@ class MM_ObjectAccessBarrierAPI
5252

5353
/* Data members & types */
5454
public:
55-
protected:
55+
5656
private:
5757
const UDATA _writeBarrierType;
5858
const UDATA _readBarrierType;
59-
#if defined (OMR_GC_COMPRESSED_POINTERS)
59+
#if defined(OMR_GC_COMPRESSED_POINTERS)
6060
const UDATA _compressedPointersShift;
61-
#if defined(OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES)
61+
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) */
62+
63+
protected:
64+
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS)
6265
bool const _compressObjectReferences;
63-
#endif /* defined(OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES) */
64-
#endif /* defined (OMR_GC_COMPRESSED_POINTERS) */
66+
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) */
6567

6668
/* Methods */
6769
public:
@@ -72,12 +74,12 @@ class MM_ObjectAccessBarrierAPI
7274
MM_ObjectAccessBarrierAPI(J9VMThread *currentThread)
7375
: _writeBarrierType(currentThread->javaVM->gcWriteBarrierType)
7476
, _readBarrierType(currentThread->javaVM->gcReadBarrierType)
75-
#if defined (OMR_GC_COMPRESSED_POINTERS)
77+
#if defined(OMR_GC_COMPRESSED_POINTERS)
7678
, _compressedPointersShift(currentThread->javaVM->compressedPointersShift)
77-
#if defined(OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES)
79+
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) */
80+
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS)
7881
, _compressObjectReferences(J9VMTHREAD_COMPRESS_OBJECT_REFERENCES(currentThread))
79-
#endif /* defined(OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES) */
80-
#endif /* defined (OMR_GC_COMPRESSED_POINTERS) */
82+
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) */
8183
{}
8284

8385
/**

‎runtime/gc_structs/ArrayletLeafIterator.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 1991, 2020 IBM Corp. and others
2+
* Copyright (c) 1991, 2021 IBM Corp. and others
33
*
44
* This program and the accompanying materials are made available under
55
* the terms of the Eclipse Public License 2.0 which accompanies this
@@ -46,9 +46,9 @@ class GC_ArrayletLeafIterator
4646
{
4747
protected:
4848
OMR_VM *const _omrVM;
49-
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES)
49+
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS)
5050
bool const _compressObjectReferences;
51-
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES) */
51+
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) */
5252
GC_SlotObject _slotObject;
5353
J9IndexableObject *_spinePtr; /**< The pointer to the beginning of the actual indexable object (ie: the spine) */
5454
GC_ArrayletObjectModel::ArrayLayout _layout; /**< The layout of the arraylet being iterated */
@@ -124,9 +124,9 @@ class GC_ArrayletLeafIterator
124124

125125
GC_ArrayletLeafIterator(J9JavaVM *javaVM, J9IndexableObject *objectPtr) :
126126
_omrVM(javaVM->omrVM)
127-
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES)
127+
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS)
128128
, _compressObjectReferences(J9JAVAVM_COMPRESS_OBJECT_REFERENCES(javaVM))
129-
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) && !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES) */
129+
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) */
130130
, _slotObject(GC_SlotObject(_omrVM, NULL))
131131
{
132132
initialize(objectPtr);

0 commit comments

Comments
 (0)