Skip to content

Commit 51f7079

Browse files
authored
Merge pull request #20922 from LinHu2016/fix_unsafe_issue
Fix potential issue in initializing unsafeIndexableHeaderSize
2 parents a0970db + 63db1b1 commit 51f7079

1 file changed

Lines changed: 2 additions & 6 deletions

File tree

runtime/gc_modron_startup/mminit.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3325,11 +3325,8 @@ initializeIndexableObjectHeaderSizes(J9JavaVM* vm)
33253325
#else /* defined(J9VM_ENV_DATA64) */
33263326
setIndexableObjectHeaderSizeWithoutDataAddress(vm);
33273327
#endif /* defined(J9VM_ENV_DATA64) */
3328-
if (MM_GCExtensions::getExtensions(vm)->isVirtualLargeObjectHeapEnabled) {
3329-
vm->unsafeIndexableHeaderSize = 0;
3330-
} else {
3331-
vm->unsafeIndexableHeaderSize = vm->contiguousIndexableHeaderSize;
3332-
}
3328+
/* set default unsafeIndexableHeaderSize */
3329+
vm->unsafeIndexableHeaderSize = vm->contiguousIndexableHeaderSize;
33333330
}
33343331

33353332
#if defined(J9VM_ENV_DATA64)
@@ -3356,7 +3353,6 @@ setIndexableObjectHeaderSizeWithoutDataAddress(J9JavaVM* vm)
33563353
vm->contiguousIndexableHeaderSize = sizeof(J9IndexableObjectContiguousFull);
33573354
vm->discontiguousIndexableHeaderSize = sizeof(J9IndexableObjectDiscontiguousFull);
33583355
}
3359-
vm->unsafeIndexableHeaderSize = vm->contiguousIndexableHeaderSize;
33603356
}
33613357

33623358
#if defined(OMR_GC_CONCURRENT_SCAVENGER)

0 commit comments

Comments
 (0)