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-8265376: Prepare for javac change to do the member translation as described in SoV #387

Closed
wants to merge 1 commit into from

Conversation

@mlchung
Copy link
Member

@mlchung mlchung commented Apr 16, 2021

This updates test/jdk/valhalla/valuetypes/QTypeDescriptorTest.java and
test/jdk/valhalla/valuetypes/Reflection.java tests to prepare for the javac
change to do the member translation as described in SoV (JDK-8244313).

It also fixes a bug in Class::referenceType to return this class if it's an
identity class. This was uncovered by this test change.


Progress

  • Change must not contain extraneous whitespace

Issue

  • JDK-8265376: Prepare for javac change to do the member translation as described in SoV

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/valhalla pull/387/head:pull/387
$ git checkout pull/387

Update a local copy of the PR:
$ git checkout pull/387
$ git pull https://git.openjdk.java.net/valhalla pull/387/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 387

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/valhalla/pull/387.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 16, 2021

👋 Welcome back mchung! 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 Apr 16, 2021

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

8265376: Prepare for javac change to do the member translation as described in SoV

Reviewed-by: rriggs

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 636 new commits pushed to the lworld branch:

  • 9e9e953: 8265748: [lworld] C2 compilation fails with "Not a Long" assert during matching
  • 55029d8: Merge jdk
  • 7146104: 8265421: java/lang/String/StringRepeat.java test is missing a memory requirement
  • b5c92ca: 8265106: IGV: Enforce en-US locale while parsing ideal graph
  • 3de0dcb: 8265483: All-caps “JAVA” in the top navigation bar
  • 739769c: 8265411: Avoid unnecessary Method::init_intrinsic_id calls
  • a22ad03: 8264983: Add gtest for JDK-8264008
  • 91b08b7: 8261779: JCK test api/javax_crypto/EncryptedPrivateKeyInfo/Ctor4.html is failing with assertion error when assertions enabled
  • 2fcd920: 8261183: Follow on to Make lists of normal filenames
  • 40ef00c: 8258457: testlibrary_tests/ctw/JarDirTest.java fails with InvalidPathException on windows
  • ... and 626 more: https://git.openjdk.java.net/valhalla/compare/301de8d1f9cdbce72a5d950cf114cedf8a66da30...lworld

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 Apr 16, 2021

Webrevs

@sadayapalam
Copy link
Collaborator

@sadayapalam sadayapalam commented Apr 16, 2021

There is some debate whether we should go ahead with integrating with #386 at all, this is being discussed (we may want to double down on the explorations for a single class file for primitive classes instead). Stay tuned. Thanks for quickly preparing the fix all the same!.

@mlchung
Copy link
Member Author

@mlchung mlchung commented Apr 16, 2021

This change is independent with the fix for JDK-8244313. JDK-8244313 will still have to update these 2 tests (uncomment the lines marked with TODO comments).

@sadayapalam
Copy link
Collaborator

@sadayapalam sadayapalam commented Apr 17, 2021

This change is independent with the fix for JDK-8244313. JDK-8244313 will still have to update these 2 tests (uncomment the lines marked with TODO comments).

I see, that is great then :) Thanks Mandy!

@mlchung
Copy link
Member Author

@mlchung mlchung commented Apr 22, 2021

/integrate

@openjdk openjdk bot closed this Apr 22, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Apr 22, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 22, 2021

@mlchung Since your change was applied there have been 636 commits pushed to the lworld branch:

  • 9e9e953: 8265748: [lworld] C2 compilation fails with "Not a Long" assert during matching
  • 55029d8: Merge jdk
  • 7146104: 8265421: java/lang/String/StringRepeat.java test is missing a memory requirement
  • b5c92ca: 8265106: IGV: Enforce en-US locale while parsing ideal graph
  • 3de0dcb: 8265483: All-caps “JAVA” in the top navigation bar
  • 739769c: 8265411: Avoid unnecessary Method::init_intrinsic_id calls
  • a22ad03: 8264983: Add gtest for JDK-8264008
  • 91b08b7: 8261779: JCK test api/javax_crypto/EncryptedPrivateKeyInfo/Ctor4.html is failing with assertion error when assertions enabled
  • 2fcd920: 8261183: Follow on to Make lists of normal filenames
  • 40ef00c: 8258457: testlibrary_tests/ctw/JarDirTest.java fails with InvalidPathException on windows
  • ... and 626 more: https://git.openjdk.java.net/valhalla/compare/301de8d1f9cdbce72a5d950cf114cedf8a66da30...lworld

Your commit was automatically rebased without conflicts.

Pushed as commit b65c2b1.

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

@mlchung mlchung deleted the JDK-8265376 branch Jun 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants