Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use assertion with message for object allocation sanity checks #18419

Merged
merged 1 commit into from
Nov 9, 2023
Merged

Use assertion with message for object allocation sanity checks #18419

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 26 additions & 4 deletions runtime/gc_modron_startup/mgcalloc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,13 @@ J9AllocateObjectNoGC(J9VMThread *vmThread, J9Class *clazz, uintptr_t allocateFla
objectPtr = OMR_GC_AllocateObject(vmThread->omrVMThread, &mixedOAM);
if (NULL != objectPtr) {
uintptr_t allocatedBytes = env->getExtensions()->objectModel.getConsumedSizeInBytesWithHeader(objectPtr);
Assert_MM_true(allocatedBytes == mixedOAM.getAllocateDescription()->getContiguousBytes());

/* Do sanity check: size of actually allocated Mixed object should match requested */
uintptr_t actuallyAllocatedBytes = mixedOAM.getAllocateDescription()->getContiguousBytes();
Assert_GC_true_with_message4(env, allocatedBytes == actuallyAllocatedBytes,
"Mixed object allocation sanity failure: object %p, requested %zu bytes, but read %zu, MM_MixedObjectAllocationModel %p\n",
objectPtr, allocatedBytes, actuallyAllocatedBytes, mixedOAM);

if (LN_HAS_LOCKWORD(vmThread, objectPtr)) {
j9objectmonitor_t initialLockword = VM_ObjectMonitor::getInitialLockword(vmThread->javaVM, clazz);
if (0 != initialLockword) {
Expand Down Expand Up @@ -355,7 +361,12 @@ J9AllocateIndexableObjectNoGC(J9VMThread *vmThread, J9Class *clazz, uint32_t num
objectPtr = OMR_GC_AllocateObject(vmThread->omrVMThread, &indexableOAM);
if (NULL != objectPtr) {
uintptr_t allocatedBytes = env->getExtensions()->objectModel.getConsumedSizeInBytesWithHeader(objectPtr);
Assert_MM_true(allocatedBytes == indexableOAM.getAllocateDescription()->getContiguousBytes());

/* Do sanity check: size of actually allocated Indexable object should match requested */
uintptr_t actuallyAllocatedBytes = indexableOAM.getAllocateDescription()->getContiguousBytes();
Assert_GC_true_with_message4(env, allocatedBytes == actuallyAllocatedBytes,
"Indexable object allocation sanity failure: object %p, requested %zu bytes, but read %zu, MM_IndexableObjectAllocationModel %p\n",
objectPtr, allocatedBytes, actuallyAllocatedBytes, indexableOAM);
}
env->_isInNoGCAllocationCall = false;
}
Expand Down Expand Up @@ -416,7 +427,13 @@ J9AllocateObject(J9VMThread *vmThread, J9Class *clazz, uintptr_t allocateFlags)
objectPtr = OMR_GC_AllocateObject(vmThread->omrVMThread, &mixedOAM);
if (NULL != objectPtr) {
uintptr_t allocatedBytes = env->getExtensions()->objectModel.getConsumedSizeInBytesWithHeader(objectPtr);
Assert_MM_true(allocatedBytes == mixedOAM.getAllocateDescription()->getContiguousBytes());

/* Do sanity check: size of actually allocated Mixed object should match requested */
uintptr_t actuallyAllocatedBytes = mixedOAM.getAllocateDescription()->getContiguousBytes();
Assert_GC_true_with_message4(env, allocatedBytes == actuallyAllocatedBytes,
"Mixed object allocation sanity failure: object %p, requested %zu bytes, but read %zu, MM_MixedObjectAllocationModel %p\n",
objectPtr, allocatedBytes, actuallyAllocatedBytes, mixedOAM);

if (LN_HAS_LOCKWORD(vmThread, objectPtr)) {
j9objectmonitor_t initialLockword = VM_ObjectMonitor::getInitialLockword(vmThread->javaVM, clazz);
if (0 != initialLockword) {
Expand Down Expand Up @@ -578,7 +595,12 @@ J9AllocateIndexableObject(J9VMThread *vmThread, J9Class *clazz, uint32_t numberO
objectPtr = OMR_GC_AllocateObject(vmThread->omrVMThread, &indexableOAM);
if (NULL != objectPtr) {
uintptr_t allocatedBytes = env->getExtensions()->objectModel.getConsumedSizeInBytesWithHeader(objectPtr);
Assert_MM_true(allocatedBytes == indexableOAM.getAllocateDescription()->getContiguousBytes());

/* Do sanity check: size of actually allocated Indexable object should match requested */
uintptr_t actuallyAllocatedBytes = indexableOAM.getAllocateDescription()->getContiguousBytes();
Assert_GC_true_with_message4(env, allocatedBytes == actuallyAllocatedBytes,
"Indexable object allocation sanity failure: object %p, requested %zu bytes, but read %zu, MM_IndexableObjectAllocationModel %p\n",
objectPtr, allocatedBytes, actuallyAllocatedBytes, indexableOAM);
}
}

Expand Down