Skip to content

Don't override error codes from bytecode verification #22849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −3
Open

Don't override error codes from bytecode verification #22849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions runtime/bcverify/rtverify.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -2498,7 +2498,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
Expand Down Expand Up @@ -2552,7 +2552,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;
}
}
Expand Down
1 change: 1 addition & 0 deletions runtime/oti/j9consts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,7 @@ extern "C" {
#if defined(J9VM_OPT_VALHALLA_STRICT_FIELDS)
#define BCV_ERR_STRICT_FIELDS_UNASSIGNED -37
#endif /* defined(J9VM_OPT_VALHALLA_STRICT_FIELDS) */
#define BCV_ERR_NOT_THROWABLE -38

#define J9_GC_OBJ_HEAP_HOLE 0x1
#define J9_GC_MULTI_SLOT_HOLE 0x1
Expand Down