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

8296967: [JVMCI] rationalize relationship between getCodeSize and getCode in ResolvedJavaMethod #11147

Closed
wants to merge 1 commit into from

Conversation

dougxc
Copy link
Member

@dougxc dougxc commented Nov 14, 2022

When ResolvedJavaMethod.getCodeSize() returns a value > 0, ResolvedJavaMethod.getCode() will return null if the declaring class is not linked, contrary to the intuition of most JVMCI API users.
This PR rationalizes the API such that:

ResolvedJavaMethod m = ...;
ResolvedJavaType c = m.getDeclaringClass();

assert (m.getCodeSize() >  0) == (m.getCode() != null);  // m is a non-abstract, non-native method whose declaring class is linked in the current runtime
assert (m.getCodeSize() == 0) == (m.getCode() == null);  // m is an abstract or native method
assert c.isLinked()           == (m.getCodeSize() >= 0); // m's code size will always be >= 0 if its declaring class is linked in the current runtime 

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

  • JDK-8296967: [JVMCI] rationalize relationship between getCodeSize and getCode in ResolvedJavaMethod

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11147

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

Using diff file

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

…false for concrete methods in unlinked classes (GR-41977)
@bridgekeeper
Copy link

bridgekeeper bot commented Nov 14, 2022

👋 Welcome back dnsimon! 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 openjdk bot added the rfr Pull request is ready for review label Nov 14, 2022
@openjdk
Copy link

openjdk bot commented Nov 14, 2022

@dougxc The following label will be automatically applied to this pull request:

  • hotspot-compiler

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

@openjdk openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Nov 14, 2022
@mlbridge
Copy link

mlbridge bot commented Nov 14, 2022

Webrevs

@dougxc dougxc changed the title 8296967: JVMCI] rationalize relationship between getCodeSize and getCode in ResolvedJavaMethod 8296967: [JVMCI] rationalize relationship between getCodeSize and getCode in ResolvedJavaMethod Nov 15, 2022
@openjdk
Copy link

openjdk bot commented Nov 16, 2022

@dougxc 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:

8296967: [JVMCI] rationalize relationship between getCodeSize and getCode in ResolvedJavaMethod

Reviewed-by: never

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

  • 8c26d02: 8295315: [REDO] 8276687 Remove support for JDK 1.4.1 PerfData shared memory files
  • 8752bb4: 8296818: Enhance JMH tests java/security/Signatures.java
  • b97fc93: 7132279: (ch) SeekableByteChannel operation may throw Non{Readable,Writable}ChannelException
  • 39dda24: 8157173: [macosx] java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java fails
  • 51f690d: 8297134: Add a @sealedGraph tag to InetAddress
  • 3eb6d0e: 8291991: Adjust the "shared class paths mismatch" message if class path logging is enabled
  • eac26f4: 8296709: WARNING: JNI call made without checking exceptions
  • 4946737: 8297047: IGV: graphContent not set when opening a new tab
  • 8b1ff9e: 8297132: BACKOUT JDK-8296889: Race condition when cancelling a request
  • e72b0ac: 8296429: Remove os::supports_sse
  • ... and 37 more: https://git.openjdk.org/jdk/compare/3eb789af74231d37796a5670ffab935cabbf3b09...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 Nov 16, 2022
@dougxc
Copy link
Member Author

dougxc commented Nov 16, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Nov 16, 2022

Going to push as commit 37848a9.
Since your change was applied there have been 52 commits pushed to the master branch:

  • b3ef337: 8296960: [JVMCI] list HotSpotConstantPool.loadReferencedType to ConstantPool
  • f0474b8: 8283238: make/scripts/compare.sh should show the diff when classlist does not match
  • 04a4d34: 8297006: JFR: AbstractEventStream should not hold thread instance
  • 5db1b58: 8296961: [JVMCI] Access to j.l.r.Method/Constructor/Field for ResolvedJavaMethod/ResolvedJavaField
  • 4ce4f38: 8296958: [JVMCI] add API for retrieving ConstantValue attributes
  • 8c26d02: 8295315: [REDO] 8276687 Remove support for JDK 1.4.1 PerfData shared memory files
  • 8752bb4: 8296818: Enhance JMH tests java/security/Signatures.java
  • b97fc93: 7132279: (ch) SeekableByteChannel operation may throw Non{Readable,Writable}ChannelException
  • 39dda24: 8157173: [macosx] java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java fails
  • 51f690d: 8297134: Add a @sealedGraph tag to InetAddress
  • ... and 42 more: https://git.openjdk.org/jdk/compare/3eb789af74231d37796a5670ffab935cabbf3b09...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 16, 2022

@dougxc Pushed as commit 37848a9.

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

@dougxc dougxc deleted the JDK-8296967 branch May 23, 2023 07:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
2 participants