Cleanup bytecode verifier

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

Author: theresa-m

runtime/bcverify/rtverify.c

@@ -470,7 +470,6 @@ verifyBytecodes (J9BytecodeVerificationData * verifyData)
 	UDATA errorTargetType = (UDATA)-1;
 	UDATA errorStackIndex = (UDATA)-1;
 	UDATA errorTempData = (UDATA)-1;
-	BOOLEAN isNextStack = FALSE;
 #if defined(J9VM_OPT_VALHALLA_STRICT_FIELDS)
 	BOOLEAN anotherInstanceInitCalled = FALSE;
 #endif /* defined(J9VM_OPT_VALHALLA_STRICT_FIELDS) */
@@ -646,8 +645,6 @@ verifyBytecodes (J9BytecodeVerificationData * verifyData)
 					((U_32)(stackBase - liveStack->stackElements) - 1) : 0;
 			goto _miscError;
 		}
-		/* Reset as the flag is only used for the current bytecode */
-		isNextStack = FALSE;
 
 		/* Format: 8bits action, 4bits type Y, 4bits type X */
 		type1 = (UDATA) J9JavaBytecodeVerificationTable[bc];
@@ -2389,7 +2386,6 @@ verifyBytecodes (J9BytecodeVerificationData * verifyData)
 				/* Load the next stack into the live stack */
 				SAVE_STACKTOP(liveStack, stackTop);
 				memcpy((UDATA *) liveStack, (UDATA *) currentMapData, verifyData->stackSize);
-				isNextStack = TRUE;
 				RELOAD_LIVESTACK;
 
 				/* Start with uninitialized_this flag for the current map data */

runtime/oti/bcverify.h

@@ -281,27 +281,6 @@ typedef struct J9BCVAlloc {
 		temps[ ( tempIndex - 1 ) ] = BCV_BASE_TYPE_TOP; \
 	}
 
-#define STORE_TEMP_OBJECT( tempIndex, tempType )	\
-	STORE_TEMP( tempIndex, tempType );
-
-#define STORE_TEMP_INTEGER( tempIndex ) \
-	STORE_TEMP( tempIndex, (UDATA) (BCV_BASE_TYPE_INT) );
-
-#define STORE_TEMP_FLOAT( tempIndex ) \
-	STORE_TEMP( tempIndex, (UDATA) (BCV_BASE_TYPE_FLOAT) );
-
-/* direct write of the TOP avoids the pre-index check */
-
-#define STORE_TEMP_PAIR( tempIndex, tempType )  \
-	STORE_TEMP( tempIndex, tempType ); \
-	temps[ ( tempIndex + 1 ) ] = (BCV_BASE_TYPE_TOP);
-
-#define STORE_TEMP_LONG( tempIndex )  \
-	STORE_TEMP_PAIR( tempIndex, (UDATA) (BCV_BASE_TYPE_LONG) );
-
-#define STORE_TEMP_DOUBLE( tempIndex ) \
-	STORE_TEMP_PAIR( tempIndex, (UDATA) (BCV_BASE_TYPE_DOUBLE) );
-
 #define RELOAD_LIVESTACK \
 	stackBase =  &(liveStack->stackElements[liveStack->stackBaseIndex]); \
 	stackTop = &(liveStack->stackElements[liveStack->stackTopIndex]); \