Skip to content

Commit

Permalink
Merge pull request #18434 from dmitripivkine/master
Browse files Browse the repository at this point in the history
Fixing compilation problem
  • Loading branch information
amicic committed Nov 9, 2023
2 parents 084fe2a + 6258c08 commit 94eedff
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions runtime/gc_modron_startup/mgcalloc.cpp
Expand Up @@ -119,7 +119,7 @@ J9AllocateObjectNoGC(J9VMThread *vmThread, J9Class *clazz, uintptr_t allocateFla
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);
objectPtr, allocatedBytes, actuallyAllocatedBytes, &mixedOAM);

if (LN_HAS_LOCKWORD(vmThread, objectPtr)) {
j9objectmonitor_t initialLockword = VM_ObjectMonitor::getInitialLockword(vmThread->javaVM, clazz);
Expand Down Expand Up @@ -366,7 +366,7 @@ J9AllocateIndexableObjectNoGC(J9VMThread *vmThread, J9Class *clazz, uint32_t num
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);
objectPtr, allocatedBytes, actuallyAllocatedBytes, &indexableOAM);
}
env->_isInNoGCAllocationCall = false;
}
Expand Down Expand Up @@ -432,7 +432,7 @@ J9AllocateObject(J9VMThread *vmThread, J9Class *clazz, uintptr_t allocateFlags)
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);
objectPtr, allocatedBytes, actuallyAllocatedBytes, &mixedOAM);

if (LN_HAS_LOCKWORD(vmThread, objectPtr)) {
j9objectmonitor_t initialLockword = VM_ObjectMonitor::getInitialLockword(vmThread->javaVM, clazz);
Expand Down Expand Up @@ -600,7 +600,7 @@ J9AllocateIndexableObject(J9VMThread *vmThread, J9Class *clazz, uint32_t numberO
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);
objectPtr, allocatedBytes, actuallyAllocatedBytes, &indexableOAM);
}
}

Expand Down

0 comments on commit 94eedff

Please sign in to comment.