Skip to content

Conversation

@davleopo
Copy link
Contributor

@davleopo davleopo commented Jun 21, 2023

Fix JVMCI handling of null dynamic constants and dynamic constant errors.

For null dynamic constants, the JVMCI code was checking for Universe::the_null_sentinel but ConstantPool::resolve_possibly_cached_constant_at returns nullptr for null constants.

In the case of errors thrown by a bootstrap method, ConstantPool::resolve_possibly_cached_constant_at already propagates the BootstrapMethodError so there's no need to check for tag.is_dynamic_constant_in_error().


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-8310425: [JVMCI] compiler/runtime/TestConstantDynamic: lookupConstant returned an object of incorrect type: null (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14582

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 21, 2023

👋 Welcome back davleopo! 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 Jun 21, 2023

@davleopo 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 Jun 21, 2023
@davleopo davleopo changed the title 8310425: [JVMCI] fix jvmci support for null DynamicConstant and DynamicConstant in error. 8310425: [JVMCI] compiler/runtime/TestConstantDynamic: lookupConstant returned an object of incorrect type: null Jun 21, 2023
@davleopo davleopo changed the title 8310425: [JVMCI] compiler/runtime/TestConstantDynamic: lookupConstant returned an object of incorrect type: null JDK-8310425: [JVMCI] compiler/runtime/TestConstantDynamic: lookupConstant returned an object of incorrect type: null Jun 21, 2023
@davleopo davleopo marked this pull request as ready for review June 22, 2023 07:47
@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 22, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 22, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Jun 26, 2023

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

8310425: [JVMCI] compiler/runtime/TestConstantDynamic: lookupConstant returned an object of incorrect type: null

Reviewed-by: dnsimon, 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 72 new commits pushed to the master branch:

  • 73d7aa1: 8301489: C1: ShortLoopOptimizer might lift instructions before their inputs
  • 990e3a7: 8308899: Introduce Classfile context and improve Classfile options
  • 79c056e: 8006421: GraphicsConfiguration of a frame is changed when the frame is moved to another screen
  • 45b581b: 8309583: AArch64: Optimize firstTrue() when amount of elements < 8
  • 87e6fab: 8310873: Re-enable locked_create_entry symbol check in runtime/NMT/CheckForProperDetailStackTrace.java for RISC-V
  • 39fa4e6: 8310489: New test runtime/ClassInitErrors/TestStackOverflowDuringInit.java failed
  • 46add3f: 8310909: java.io.InvalidObjectException has redundant @since tag
  • 8f5b677: 8310908: Non-standard @since tag in com.sun.java.accessibility.util.package-info
  • a197ee7: 8310838: Correct range notations in MethodTypeDesc specification
  • 7c6a28f: 8310922: java/lang/Class/forName/ForNameNames.java fails after being added by JDK-8310242
  • ... and 62 more: https://git.openjdk.org/jdk/compare/01623f6a5724d3eb250c48656be0aaf28df11750...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@dougxc, @tkrodriguez) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 26, 2023
@davleopo
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 27, 2023
@openjdk
Copy link

openjdk bot commented Jun 27, 2023

@davleopo
Your change (at version 7ad3fea) is now ready to be sponsored by a Committer.

@dougxc
Copy link
Member

dougxc commented Jun 27, 2023

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 27, 2023

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

  • 73d7aa1: 8301489: C1: ShortLoopOptimizer might lift instructions before their inputs
  • 990e3a7: 8308899: Introduce Classfile context and improve Classfile options
  • 79c056e: 8006421: GraphicsConfiguration of a frame is changed when the frame is moved to another screen
  • 45b581b: 8309583: AArch64: Optimize firstTrue() when amount of elements < 8
  • 87e6fab: 8310873: Re-enable locked_create_entry symbol check in runtime/NMT/CheckForProperDetailStackTrace.java for RISC-V
  • 39fa4e6: 8310489: New test runtime/ClassInitErrors/TestStackOverflowDuringInit.java failed
  • 46add3f: 8310909: java.io.InvalidObjectException has redundant @since tag
  • 8f5b677: 8310908: Non-standard @since tag in com.sun.java.accessibility.util.package-info
  • a197ee7: 8310838: Correct range notations in MethodTypeDesc specification
  • 7c6a28f: 8310922: java/lang/Class/forName/ForNameNames.java fails after being added by JDK-8310242
  • ... and 62 more: https://git.openjdk.org/jdk/compare/01623f6a5724d3eb250c48656be0aaf28df11750...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 27, 2023

@dougxc @davleopo Pushed as commit 1587836.

💡 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

Development

Successfully merging this pull request may close these issues.

3 participants