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

8321582: yield <primitive-type>.class not parsed correctly. #17035

Closed
wants to merge 2 commits into from

Conversation

lahodaj
Copy link
Contributor

@lahodaj lahodaj commented Dec 8, 2023

Fixing the parser to accept primitive type after yield.

I didn't want to update the parts of the patch that remain, to not obstruct history, but I used the multi-label case for the new labels.


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-8321582: yield <primitive-type>.class not parsed correctly. (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17035

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 8, 2023

👋 Welcome back jlahoda! 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 Dec 8, 2023
@openjdk
Copy link

openjdk bot commented Dec 8, 2023

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

  • 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 compiler compiler-dev@openjdk.org label Dec 8, 2023
@mlbridge
Copy link

mlbridge bot commented Dec 8, 2023

Webrevs

Copy link
Contributor

@vicente-romero-oracle vicente-romero-oracle left a comment

Choose a reason for hiding this comment

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

looks sensible

@@ -140,6 +150,21 @@ private boolean yieldUnaryNotOperator(String s, boolean b) {
};
}

private Class<?> yieldPrimiteDotClass(String s) {
Copy link
Contributor

Choose a reason for hiding this comment

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

typo: Primite -> Primitive

@vicente-romero-oracle
Copy link
Contributor

do we need a CSR for this one?

@openjdk
Copy link

openjdk bot commented Dec 8, 2023

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

8321582: yield <primitive-type>.class not parsed correctly.

Reviewed-by: vromero

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

  • 92fd490: 8321176: [Screencast] make a second attempt on screencast failure
  • d13302f: 8321387: SegmentAllocator:allocateFrom(AddressLayout, MemorySegment) does not throw stated UnsupportedOperationException
  • ce10844: 8319577: x86_64 AVX2 intrinsics for Arrays.sort methods (int, float arrays)
  • 5c12a18: 8320790: Update --release 22 symbol information for JDK 22 build 27
  • 7180088: 8321429: (fc) FileChannel.lock creates a FileKey containing two long index values, they could be stored as int values
  • 0c178be: 8321206: Make Locale related system properties StaticProperty
  • 6c13a30: 8312307: Obsoleted code in hb-jdk-font.cc
  • 5e6bfc5: 8321539: Minimal build is broken by JDK-8320935
  • 2c2d4d2: 8321485: remove serviceability/attach/ConcAttachTest.java from problemlist on macosx
  • 0eb299a: 8316141: Improve CEN header validation checking
  • ... and 76 more: https://git.openjdk.org/jdk/compare/87516e29dc5015c4cab2c07c5539ad30f2768667...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 Dec 8, 2023
@lahodaj
Copy link
Contributor Author

lahodaj commented Dec 11, 2023

/backport jdk22

@openjdk
Copy link

openjdk bot commented Dec 11, 2023

@lahodaj Backport for repo openjdk/jdk22 on branch master was successfully enabled and will be performed once this pull request has been integrated. Further instructions will be provided at that time.

@lahodaj
Copy link
Contributor Author

lahodaj commented Dec 11, 2023

do we need a CSR for this one?

I don't think so - we are enhancing the set of programs that compile, improving adherence to the specification (which is unchanged).

@lahodaj
Copy link
Contributor Author

lahodaj commented Dec 11, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Dec 11, 2023

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

  • 3c6459e: 8321641: ClassFile ModuleAttribute.ModuleAttributeBuilder::moduleVersion spec contains a copy-paste error
  • 92fd490: 8321176: [Screencast] make a second attempt on screencast failure
  • d13302f: 8321387: SegmentAllocator:allocateFrom(AddressLayout, MemorySegment) does not throw stated UnsupportedOperationException
  • ce10844: 8319577: x86_64 AVX2 intrinsics for Arrays.sort methods (int, float arrays)
  • 5c12a18: 8320790: Update --release 22 symbol information for JDK 22 build 27
  • 7180088: 8321429: (fc) FileChannel.lock creates a FileKey containing two long index values, they could be stored as int values
  • 0c178be: 8321206: Make Locale related system properties StaticProperty
  • 6c13a30: 8312307: Obsoleted code in hb-jdk-font.cc
  • 5e6bfc5: 8321539: Minimal build is broken by JDK-8320935
  • 2c2d4d2: 8321485: remove serviceability/attach/ConcAttachTest.java from problemlist on macosx
  • ... and 77 more: https://git.openjdk.org/jdk/compare/87516e29dc5015c4cab2c07c5539ad30f2768667...master

Your commit was automatically rebased without conflicts.

@openjdk
Copy link

openjdk bot commented Dec 11, 2023

Creating backport for repo openjdk/jdk22 on branch master

/backport openjdk/jdk22 master

@openjdk openjdk bot added integrated Pull request has been integrated and removed backport=openjdk/jdk22:master labels Dec 11, 2023
@openjdk openjdk bot closed this Dec 11, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 11, 2023
@openjdk
Copy link

openjdk bot commented Dec 11, 2023

@lahodaj Pushed as commit ce8399f.

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

@openjdk
Copy link

openjdk bot commented Dec 11, 2023

@openjdk[bot] @lahodaj the backport was successfully created on the branch backport-lahodaj-ce8399fd in my personal fork of openjdk/jdk22. To create a pull request with this backport targeting openjdk/jdk22:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit ce8399fd from the openjdk/jdk repository.

The commit being backported was authored by Jan Lahoda on 11 Dec 2023 and was reviewed by Vicente Romero.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk22:

$ git fetch https://github.com/openjdk-bots/jdk22.git backport-lahodaj-ce8399fd:backport-lahodaj-ce8399fd
$ git checkout backport-lahodaj-ce8399fd
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk22.git backport-lahodaj-ce8399fd

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