Don't override error codes from bytecode verification

#13444 changes the
order of verification for exceptions and bytecodes. This resulted
in the error message "thrown object not throwable" for
exception verification to be set for bytecode verification failures.
This change does not override error codes for bytecode verification
which was being done previously.

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

Author: theresa-m

runtime/bcverify/rtverify.c

@@ -187,7 +187,7 @@ j9rtv_verifyBytecodes (J9BytecodeVerificationData *verifyData)
 
 			verifyData->errorModule = J9NLS_BCV_ERR_VERIFY_OUT_OF_MEMORY__MODULE;
 			verifyData->errorCode = J9NLS_BCV_ERR_VERIFY_OUT_OF_MEMORY__ID;
-		} else {
+		} else if (BCV_ERR_NOT_THROWABLE == result) {
 			verifyData->errorModule = J9NLS_BCV_ERR_NOT_THROWABLE__MODULE;
 			verifyData->errorCode = J9NLS_BCV_ERR_NOT_THROWABLE__ID;
 		}
@@ -2504,7 +2504,7 @@ verifyBytecodes (J9BytecodeVerificationData * verifyData)
 
 /*
  * returns BCV_SUCCESS on success
- * returns BCV_FAIL on error
+ * returns BCV_ERR_NOT_THROWABLE on error
  * returns BCV_ERR_INSUFFICIENT_MEMORY on OOM
  */
 static IDATA
@@ -2558,7 +2558,7 @@ verifyExceptions (J9BytecodeVerificationData *verifyData)
 						(UDATA) J9UTF8_LENGTH(J9ROMMETHOD_SIGNATURE(romMethod)),
 						J9UTF8_DATA(J9ROMMETHOD_SIGNATURE(romMethod)),
 						i, J9UTF8_LENGTH(catchName), J9UTF8_DATA(catchName));
-					rc = BCV_FAIL;
+					rc = BCV_ERR_NOT_THROWABLE;
 					break;
 				}
 			}

runtime/oti/j9consts.h

@@ -600,6 +600,7 @@ extern "C" {
 #define BCV_ERR_BYTECODE_ERROR							-34
 #define BCV_ERR_NEW_OJBECT_MISMATCH						-35
 #define BCV_ERR_INIT_FLAGS_MISMATCH						-36
+#define BCV_ERR_NOT_THROWABLE                           -37
 
 #define J9_GC_OBJ_HEAP_HOLE 0x1
 #define J9_GC_MULTI_SLOT_HOLE 0x1