Merge pull request #4947 from theresa-m/arraytype_12branch

0.13: Wrap Class.arrayTypeImpl in native frame
eclipse-openj9 · Mar 4, 2019 · a72c314 · a72c314
2 parents 4703b76 + d2c4d2e
commit a72c314
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/runtime/vm/BytecodeInterpreter.hpp b/runtime/vm/BytecodeInterpreter.hpp
@@ -2729,15 +2729,20 @@ done:;
 		J9Class *componentClazz = J9VM_J9CLASS_FROM_HEAPCLASS(_currentThread, *(j9object_t*)_sp);
 		J9Class *arrayClazz = componentClazz->arrayClass;
 		if (NULL == arrayClazz) {
+			buildInternalNativeStackFrame(REGISTER_ARGS);
+			updateVMStruct(REGISTER_ARGS);
 			arrayClazz = internalCreateArrayClass(_currentThread, 
 				(J9ROMArrayClass *) J9ROMIMAGEHEADER_FIRSTCLASS(_currentThread->javaVM->arrayROMClasses), 
 				componentClazz);
+			VMStructHasBeenUpdated(REGISTER_ARGS);
+			if (VM_VMHelpers::exceptionPending(_currentThread) || (NULL == arrayClazz)) {
+				rc = GOTO_THROW_CURRENT_EXCEPTION;
+				goto done;
+			}
+			restoreInternalNativeStackFrame(REGISTER_ARGS);
 		}
-		if (NULL == arrayClazz) {
-			rc = GOTO_THROW_CURRENT_EXCEPTION;
-		} else {
-			returnObjectFromINL(REGISTER_ARGS, J9VM_J9CLASS_TO_HEAPCLASS(arrayClazz), 1);
-		}
+		returnObjectFromINL(REGISTER_ARGS, J9VM_J9CLASS_TO_HEAPCLASS(arrayClazz), 1);
+done:
 		return rc;
 	}