Skip to content
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.

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

8253511: [lworld] ClassFileParser does not handle field type mismatch #195

Closed
wants to merge 3 commits into from

Conversation

@fparain
Copy link
Collaborator

@fparain fparain commented Sep 23, 2020

Please review this change with replaces an assert with the throwing of an IncompatibleClassChangeError when a pre-loaded class is not an inline type. This case was correctly handled for static fields, but not for non-static fields.

Tested with Mach5, tiers 1 to 3.

Thank you,

Fred


Progress

  • Change must not contain extraneous whitespace

Issue

  • JDK-8253511: [lworld] ClassFileParser does not handle field type mismatch

Reviewers

Download

$ git fetch https://git.openjdk.java.net/valhalla pull/195/head:pull/195
$ git checkout pull/195

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 23, 2020

👋 Welcome back fparain! A progress list of the required criteria for merging this PR into lworld will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

@openjdk openjdk bot commented Sep 23, 2020

@fparain This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for more details.

After integration, the commit message for the final commit will be:

8253511: [lworld] ClassFileParser does not handle field type mismatch

Reviewed-by: hseigel

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 1 new commit pushed to the lworld branch:

  • 9fc3d54: 8253181: [lworld] Javac fails to properly handle inline class files with inner classes

Please see this link for an up-to-date comparison between the source branch of this pull request and the lworld branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the lworld branch, type /integrate in a new comment.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 23, 2020

Webrevs

Copy link
Member

@hseigel hseigel left a comment

The changes look good! You could add code to the test's exception handler that looks at err.getMessage() to check that ICE got thrown for the expected reason.

@fparain
Copy link
Collaborator Author

@fparain fparain commented Sep 23, 2020

Harold,

Thank you for the review, I've updated the test, checking that the error message is the expected one.

Fred

Copy link
Member

@hseigel hseigel left a comment

Looks good! Thanks!

@fparain
Copy link
Collaborator Author

@fparain fparain commented Sep 23, 2020

/integrate

@openjdk openjdk bot closed this Sep 23, 2020
@openjdk openjdk bot added integrated and removed ready labels Sep 23, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Sep 23, 2020

@fparain Since your change was applied there has been 1 commit pushed to the lworld branch:

  • 9fc3d54: 8253181: [lworld] Javac fails to properly handle inline class files with inner classes

Your commit was automatically rebased without conflicts.

Pushed as commit 4a26a17.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@openjdk openjdk bot removed the rfr label Sep 23, 2020
@fparain fparain deleted the field_mismatch branch Oct 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants