Move astore exception table comparison before the instruction

According to JVMS 4.10.1.4 the state of a stack map frame is
the incoming state of an instruction. Since astore can change
local variable types perform the comparison before updating the
state.

Check the state for each astore so no type changes are missed.

Signed-off-by: Theresa Mammarella <[email protected]>

Author: theresa-m

runtime/bcverify/rtverify.c

@@ -456,7 +456,6 @@ verifyBytecodes (J9BytecodeVerificationData * verifyData)
 	I_32 offset32;
 	UDATA argCount;
 	UDATA checkIfInsideException = romMethod->modifiers & J9AccMethodHasExceptionInfo;
-	UDATA tempStoreChange;
 	J9ExceptionInfo *exceptionInfo = J9_EXCEPTION_DATA_FROM_ROM_METHOD(romMethod);
 	J9ExceptionHandler *handler;
 	J9UTF8 *catchName;
@@ -809,8 +808,6 @@ verifyBytecodes (J9BytecodeVerificationData * verifyData)
 				goto _inconsistentStack;
 			}
 
-			tempStoreChange = FALSE;
-
 			if (type != type1) {
 				if ((type1 != BCV_GENERIC_OBJECT) || (type & BCV_TAG_BASE_TYPE_OR_TOP)) {
 					inconsistentStack = TRUE;
@@ -823,21 +820,7 @@ verifyBytecodes (J9BytecodeVerificationData * verifyData)
 				}
 			}
 
-			/* because of pre-index local clearing - the order here matters */
-			if (type1 & BCV_WIDE_TYPE_MASK) {
-				tempStoreChange = (temps[index + 1] != BCV_BASE_TYPE_TOP);
-				STORE_TEMP((index + 1), BCV_BASE_TYPE_TOP);
-			}
-			tempStoreChange |= (type != temps[index]);
-			STORE_TEMP(index, type);
-
-			if (checkIfInsideException && tempStoreChange) {
-				/* If we've stored a value into an arg/local, and it's of a different type than was
-				 * originally there, we need to ensure that we are still compatible with all our
-				 * exception handlers.
-				 * 
-				 * For all exception handlers covering this instruction
-				 */
+			if (checkIfInsideException) {
 				handler = J9EXCEPTIONINFO_HANDLERS(exceptionInfo);
 				SAVE_STACKTOP(liveStack, stackTop);
 
@@ -880,6 +863,16 @@ verifyBytecodes (J9BytecodeVerificationData * verifyData)
 				liveStack->stackElements[liveStack->stackBaseIndex] = originalStackZeroEntry;
 				stackTop = originalStackTop;
 			}
+
+			/* Wait to set local variable types until after exception handler
+			 * stack map frame verification. According to spec 4.10.1.4
+			 * the incoming type state should be compared.
+			 * Because of pre-index local clearing - the order here matters.
+			 */
+			if (type1 & BCV_WIDE_TYPE_MASK) {
+				STORE_TEMP((index + 1), BCV_BASE_TYPE_TOP);
+			}
+			STORE_TEMP(index, type);
 			break;
 
 		case RTV_ARRAY_STORE: