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

8298177: Various java.lang.invoke cleanups #11540

Closed
wants to merge 5 commits into from

Conversation

cl4es
Copy link
Member

@cl4es cl4es commented Dec 6, 2022

Various code cleanups around java.lang.invoke code. Started out with dead code removal in jli.MemberName, then piled on to fix a set of minor inefficiencies (excessive vararg array allocations, unnecessary defensive cloning of parameter arrays etc).


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

Issues

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11540

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 6, 2022

👋 Welcome back redestad! 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 6, 2022
@openjdk
Copy link

openjdk bot commented Dec 6, 2022

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

  • core-libs

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 core-libs core-libs-dev@openjdk.org label Dec 6, 2022
@mlbridge
Copy link

mlbridge bot commented Dec 6, 2022

Webrevs

@@ -607,7 +575,7 @@ public MemberName(Method m, boolean wantSpecial) {
}
throw new LinkageError(m.toString());
}
assert(isResolved() && this.clazz != null);
assert(isResolved());
Copy link
Member

Choose a reason for hiding this comment

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

I don't see why this can be removed. Can you explain?

Copy link
Member Author

Choose a reason for hiding this comment

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

the if (clazz == null) block above either returns or throws an error, so intellij was marking this as always true.

Copy link
Member

Choose a reason for hiding this comment

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

Ok, I see. Thanks

@cl4es
Copy link
Member Author

cl4es commented Dec 6, 2022

/solves 8284363

@openjdk
Copy link

openjdk bot commented Dec 6, 2022

@cl4es
Adding additional issue to solves list: 8284363: Redundant imports in BoundMethodHandle.

@openjdk
Copy link

openjdk bot commented Dec 6, 2022

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

8298177: Various java.lang.invoke cleanups
8284363: Redundant imports in BoundMethodHandle

Reviewed-by: jvernee

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

  • 86270e3: 8269820: C2 PhaseIdealLoop::do_unroll get wrong opaque node
  • cf63f2e: 8298184: Incorrect record component type in record patterns
  • 58170f6: 8298035: Provide better descriptions for JIT compiler JFR events
  • bfcc238: 8297964: Jetty.java fails "assert(_no_handle_mark_nesting == 0) failed: allocating handle inside NoHandleMark"
  • 3e041eb: 8298248: Limit sscanf output width in cgroup file parsers
  • 4da8411: 8298108: Add a regression test for JDK-8297684
  • 80cbfab: 8298169: Remove unused methods in space.hpp
  • 221e1a4: 8286666: JEP 429: Implementation of Scoped Values (Incubator)
  • ccc69af: 8296672: Implementation of Virtual Threads (Second Preview)
  • 5a3439d: 4677581: ColorModel.getComponentSize()-wrong conditions for ArrayIndexOutOfBoundsExceptio
  • ... and 16 more: https://git.openjdk.org/jdk/compare/1e468320dc6e495343dbdf392cbcbda79672c7ad...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 6, 2022
@cl4es
Copy link
Member Author

cl4es commented Dec 7, 2022

Ran through tier1+2 and all java.lang.invoke tests locally without surprises

/integrate

@openjdk
Copy link

openjdk bot commented Dec 7, 2022

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

  • 6ed3683: 8297209: Serial: Refactor GenCollectedHeap::full_process_roots
  • 86270e3: 8269820: C2 PhaseIdealLoop::do_unroll get wrong opaque node
  • cf63f2e: 8298184: Incorrect record component type in record patterns
  • 58170f6: 8298035: Provide better descriptions for JIT compiler JFR events
  • bfcc238: 8297964: Jetty.java fails "assert(_no_handle_mark_nesting == 0) failed: allocating handle inside NoHandleMark"
  • 3e041eb: 8298248: Limit sscanf output width in cgroup file parsers
  • 4da8411: 8298108: Add a regression test for JDK-8297684
  • 80cbfab: 8298169: Remove unused methods in space.hpp
  • 221e1a4: 8286666: JEP 429: Implementation of Scoped Values (Incubator)
  • ccc69af: 8296672: Implementation of Virtual Threads (Second Preview)
  • ... and 17 more: https://git.openjdk.org/jdk/compare/1e468320dc6e495343dbdf392cbcbda79672c7ad...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 7, 2022

@cl4es Pushed as commit 3de7750.

💡 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
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
2 participants