Disable the flag check on method without stackmaps #5736
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Reviewer: @DanHeidinga FYI: @pshipton |
|
Jenkins test sanity,extended xlinux jdk8 |
|
Jenkins test sanity zlinux jdk11 |
|
Jenkins test extended xlinux jdk8 |
DanHeidinga
reviewed
May 11, 2019
runtime/bcverify/rtverify.c
Outdated
| @@ -307,7 +307,7 @@ matchStack(J9BytecodeVerificationData * verifyData, J9BranchTargetStack *liveSta | |||
|
|
|||
| /* Jazz103: 120689 */ | |||
| /* Target stack frame flag needs to be subset of ours. See JVM sepc 4.10.1.4 */ | |||
| if (liveStack->uninitializedThis && !targetStack->uninitializedThis) { | |||
| if (!verifyData->createdStackMap && liveStack->uninitializedThis && !targetStack->uninitializedThis) { | |||
There was a problem hiding this comment.
This should have a comment in the code explaining why it's not applicable to the createdStackMap case.
The code may end up looking cleaner if written in this form once the comment is added:
/* Long comment describing
* why this check isn't applicable to
* createdstackMaps
*/
if (!verifyData->createdStackMap) {
/* Target stack frame flag needs to be subset of ours. See JVM sepc 4.10.1.4 */
if (liveStack->uninitializedThis && !targetStack->uninitializedThis) {
.....
}
}
There was a problem hiding this comment.
Already updated the code & comment against the suggestion above.
ChengJin01
force-pushed
the
bcv_error_init_flag_check
branch
from
056d75c
to
190dbc6
Compare
The change is to disable the check on the uninitializedThis flag on old version classfiles (< 51) as such check is only applied to classfiles with stackmaps which was introduced since Java 7(class version is 51). Fix: eclipse-openj9#5676 Signed-off-by: Cheng Jin <jincheng@ca.ibm.com>
ChengJin01
force-pushed
the
bcv_error_init_flag_check
branch
from
190dbc6
to
151ebcf
Compare
DanHeidinga
added
the
backport:candidate
|
Jenkins test extended xlinux jdk8 |
|
Jenkins test sanity zlinux jdk11 |
|
@ChengJin01 Can you cherrypick this commit into a PR against the |
|
Already created the PR against |
|
PR for the 0.14.2 release: #5740 |
pshipton
removed
the
backport:candidate
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The change is to disable the check on the uninitializedThis
flag on old version classfiles (< 51) as such check is only
applied to classfiles with stackmaps which was introduced
since Java 7(class version is 51).
Fix: #5676
Signed-off-by: Cheng Jin jincheng@ca.ibm.com