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

8315637: JDK-8314249 broke libgraal #15575

Closed

Conversation

iklam
Copy link
Member

@iklam iklam commented Sep 5, 2023

Please review this change in JVMCI. The actual functional change is essentially the same as the patch provided by @dougxc in JDK-8315637 -- convert the rawIndex to cpci only if the bytecode is INVOKE{VIRTUAL,SPECIAL,STATIC,INTERFACE}.

The rest of the changes is to rename the parameters from rawIndex to which, so we know the correct type of index is passed. I also added a test case.

(This code should be much simpler after JDK-8301993 is complete: we won't have cpci anymore and all which can be replaced with rawInex).


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/15575/head:pull/15575
$ git checkout pull/15575

Update a local copy of the PR:
$ git checkout pull/15575
$ git pull https://git.openjdk.org/jdk.git pull/15575/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15575

View PR using the GUI difftool:
$ git pr show -t 15575

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/15575.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 5, 2023

👋 Welcome back iklam! A progress list of the required criteria for merging this PR into master 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 bot commented Sep 5, 2023

@iklam The following labels will be automatically applied to this pull request:

  • graal
  • hotspot-compiler

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added graal graal-dev@openjdk.org hotspot-compiler hotspot-compiler-dev@openjdk.org labels Sep 5, 2023
@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 6, 2023
@mlbridge
Copy link

mlbridge bot commented Sep 6, 2023

Webrevs

@dougxc
Copy link
Member

dougxc commented Sep 6, 2023

Thanks for the extra cleanup and tests.

@openjdk
Copy link

openjdk bot commented Sep 6, 2023

@iklam 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 details.

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

8315637: JDK-8314249 broke libgraal

Reviewed-by: dnsimon, matsaave

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 15 new commits pushed to the master branch:

  • 86a18f5: 8314604: j.text.DecimalFormat behavior regarding patterns is not clear
  • bd47781: 8315554: C1: Replace "cmp reg, 0" with "test reg, reg" on x86
  • 25e85db: 8307468: CDS Lambda Proxy classes are regenerated in dynamic dump
  • 024133b: 8311964: Some jtreg tests failing on x86 with error 'unrecognized VM options' (C2 flags)
  • 62a953f: 8315689: G1: Remove unused init_hash_seed
  • cfc1489: 8315579: SPARC64 builds are broken after JDK-8304913
  • f6c203e: 8314949: linux PPC64 Big Endian: Implementation of Foreign Function & Memory API
  • a01b3fb: 8288660: JavaDoc should be more helpful if it doesn't recognize a tag
  • ba1a463: 8315377: C2: assert(u->find_out_with(Op_AddP) == nullptr) failed: more than 2 chained AddP nodes?
  • a258fc4: 8315648: Add test for JDK-8309979 changes
  • ... and 5 more: https://git.openjdk.org/jdk/compare/1f4cdb327f46085d3134d1d1164fccac35904566...master

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 master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Sep 6, 2023
Copy link
Contributor

@matias9927 matias9927 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks for this change! I have one small question, but otherwise approved.

* @param opcode the opcode of the instruction for which the lookup is being performed
* @return name as {@link String}
*/
private String getNameOf(int rawIndex, int opcode) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This method, and getSignatureOf() seem to be unused but is it possible that they could have use in the future?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These were private methods that had a single caller. All they did was to forward the call to CompilerToVM, so I removed them so that I didn't need to worry about renaming their parameters.

In the future, after we get rid of which and cpci, maybe we can refactor the code to have better organization, and possibly bring back these methods.

@iklam
Copy link
Member Author

iklam commented Sep 7, 2023

Thanks @dougxc and @matias9927 for the review. The new code passed tiers 1 and 2. I also successfully built libgraal with this patch.
/integrate

@openjdk
Copy link

openjdk bot commented Sep 7, 2023

Going to push as commit 0c865a7.
Since your change was applied there have been 33 commits pushed to the master branch:

  • 683672c: 8292692: Move MethodCounters inline functions out of method.hpp
  • 9bf3dee: 8314831: NMT tests ignore vm flags
  • b74805d: 8315863: [GHA] Update checkout action to use v4
  • 1cae0f5: 8315220: Event NativeLibraryLoad breaks invariant by taking a stacktrace when thread is in state _thread_in_native
  • 8f7e29b: 8313422: test/langtools/tools/javac 144 test classes uses com.sun.tools.classfile library
  • 8557205: 8312569: RISC-V: Missing intrinsics for Math.ceil, floor, rint
  • 2fd870a: 8315444: Convert test/jdk/tools to Classfile API
  • 81f8c57: 8314632: Intra-case dominance check fails in the presence of a guard
  • b408a82: 8314260: Unable to load system libraries on Windows when using a SecurityManager
  • 726c9c9: 8315735: VerifyError when switch statement used with synchronized block
  • ... and 23 more: https://git.openjdk.org/jdk/compare/1f4cdb327f46085d3134d1d1164fccac35904566...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Sep 7, 2023
@openjdk openjdk bot closed this Sep 7, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 7, 2023
@openjdk
Copy link

openjdk bot commented Sep 7, 2023

@iklam Pushed as commit 0c865a7.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
graal graal-dev@openjdk.org hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
3 participants