Update

Signed-off-by: lhu <[email protected]>

Author: LinHu2016

runtime/gc_base/IndexableObjectAllocationModel.cpp

@@ -388,6 +388,8 @@ MM_IndexableObjectAllocationModel::getSparseAddressAndDecommitLeaves(MM_Environm
 			reservedAddressLow = envBase->_objectAllocationInterface->allocateArrayletLeaf(
 					envBase, &_allocateDescription, _allocateDescription.getMemorySpace(), true);
 
+			_allocateDescription.setSharedReserved(false);
+
 			/* If reservedRegion allocation failed set the result to NULL and return. */
 			if (NULL == reservedAddressLow) {
 				Trc_MM_allocateAndConnectNonContiguousArraylet_leafFailure(envBase->getLanguageVMThread());

runtime/gc_vlhgc/AllocationContextBalanced.cpp

@@ -391,7 +391,10 @@ MM_AllocationContextBalanced::lockedAllocateArrayletLeaf(MM_EnvironmentBase *env
 		 * In future, allocations should remember (somewhere in Off-heap meta structures) how many regions came from each AC
 		 * \and release exact same number back to each AC.
 		 */
-		MM_AllocationContextTarok *context = this;
+		MM_AllocationContextTarok *context = freeRegionForArrayletLeaf->_allocateData._owningContext;
+		if (NULL != freeRegionForArrayletLeaf->_allocateData._originalOwningContext) {
+			context = freeRegionForArrayletLeaf->_allocateData._originalOwningContext;
+		}
 		if (allocateDescription->getSharedReserved()) {
 			context = (MM_AllocationContextTarok *)env->getCommonAllocationContext();
 		}

runtime/gc_vlhgc/CopyForwardScheme.cpp

@@ -4183,6 +4183,7 @@ class MM_CopyForwardSchemeRootClearer : public MM_RootScanner
 				MM_AllocationContextBalanced *context = NULL;
 				for (uintptr_t index = 0; index < reservedRegionCount; index++) {
 					context = (MM_AllocationContextBalanced *) largeObjectVirtualMemory->getAllocationContextForAddress(dataAddr, index);
+					Assert_MM_true(NULL != context);
 					context->recycleReservedRegionsForVirtualLargeObjectHeap(env, 1);
 				}
 

runtime/gc_vlhgc/GlobalMarkingScheme.cpp

@@ -1437,6 +1437,7 @@ class MM_GlobalMarkingSchemeRootClearer : public MM_RootScanner
 				MM_AllocationContextBalanced *context = NULL;
 				for (uintptr_t index = 0; index < reservedRegionCount; index++) {
 					context = (MM_AllocationContextBalanced *) largeObjectVirtualMemory->getAllocationContextForAddress(dataAddr, index);
+					Assert_MM_true(NULL != context);
 					context->recycleReservedRegionsForVirtualLargeObjectHeap(env, 1);
 				}