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

JDK-8244314 [lworld] V.ref and V.val are supposed to be nest mates #124

Closed
wants to merge 1 commit into from

Conversation

@JimLaskey
Copy link
Member

@JimLaskey JimLaskey commented Jul 29, 2020

  • Reworked nest list to use LinkedHashSet (had unnecessary step.)
  • Only attempt to add nested members if set is non-empty.
  • If top level and an inline class don't use as host, use referenceProjection instead.
  • If top level and an inline class do add as a nest member.

Test ensures that the correct host (Point$ref) is selected and that nest members are exactly just Point$val ("Point").


Progress

  • Change must not contain extraneous whitespace

Issue

  • JDK-8244314: [lworld] V.ref and V.val are supposed to be nest mates

Reviewers

Download

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jul 29, 2020

👋 Welcome back jlaskey! A progress list of the required criteria for merging this PR into lworld will be added to the body of your pull request.

@openjdk
Copy link

@openjdk openjdk bot commented Jul 29, 2020

@JimLaskey This change now passes all automated pre-integration checks, type /integrate in a new comment to proceed. After integration, the commit message will be:

8244314: [lworld] V.ref and V.val are supposed to be nest mates

Reviewed-by: sadayapalam
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /issue command.

Since the source branch of this PR was last updated there have been 8 commits pushed to the lworld branch:

  • 72b3046: 8221323: [lworld] Javac should support class literals for projection types.
  • e40d6ba: 8250997: [lworld] Javac should not allow constructor reference expression to mention projection types
  • ae1759a: 8250234: [lworld] [lw3] jdk/valhalla/valuetypes/SubstitutabilityTest.java fails with C1
  • 6e6d0c7: 8250951: [lworld] Escape analysis fails due to oop access to flat array
  • 8895fbc: 8222784: [lworld] Remove stale compiler option: -XDallowGenericsOverValues
  • cecd9c5: 8250881: [lworld] Crash in AOT code with -XX:-EnableValhalla
  • 9feaf05: 8250823: [lworld] Various cleanups and small fixes in JIT code
  • 66005d4: rename valhalla runtime tests to 'inline'

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge lworld into your branch, and then specify the current head hash when integrating, like this: /integrate 72b3046c3e8b4c53847fe9adf2c68f8a59fe23ae.

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 (@sadayapalam) 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).

@mlbridge
Copy link

@mlbridge mlbridge bot commented Jul 29, 2020

Webrevs

Copy link
Collaborator

@sadayapalam sadayapalam left a comment

Looks good, Thanks Jim!

@JimLaskey
Copy link
Member Author

@JimLaskey JimLaskey commented Aug 4, 2020

/integrate

@openjdk openjdk bot added the sponsor label Aug 4, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Aug 4, 2020

@JimLaskey
Your change (at version 6ffde9b) is now ready to be sponsored by a Committer.

@sadayapalam
Copy link
Collaborator

@sadayapalam sadayapalam commented Aug 4, 2020

/sponsor

@openjdk openjdk bot closed this Aug 4, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Aug 4, 2020

@sadayapalam @JimLaskey The following commits have been pushed to lworld since your change was applied:

  • 72b3046: 8221323: [lworld] Javac should support class literals for projection types.
  • e40d6ba: 8250997: [lworld] Javac should not allow constructor reference expression to mention projection types
  • ae1759a: 8250234: [lworld] [lw3] jdk/valhalla/valuetypes/SubstitutabilityTest.java fails with C1
  • 6e6d0c7: 8250951: [lworld] Escape analysis fails due to oop access to flat array
  • 8895fbc: 8222784: [lworld] Remove stale compiler option: -XDallowGenericsOverValues
  • cecd9c5: 8250881: [lworld] Crash in AOT code with -XX:-EnableValhalla
  • 9feaf05: 8250823: [lworld] Various cleanups and small fixes in JIT code
  • 66005d4: rename valhalla runtime tests to 'inline'

Your commit was automatically rebased without conflicts.

Pushed as commit 5305fbd.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants