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

8309673: Refactor ref_at methods in SA ConstantPool #14385

Conversation

matias9927
Copy link
Contributor

@matias9927 matias9927 commented Jun 8, 2023

The accessor methods in constantpool.cpp were previously cleaned up to allow for different types of indices to be used, distinguishing them by the bytecode. This patch adds the same changes to the hotspot serviceability agent code. Verified with tier 1-5 tests.


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-8309673: Refactor ref_at methods in SA ConstantPool (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14385

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 8, 2023

👋 Welcome back matsaave! 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 8, 2023

@matias9927 The following labels will be automatically applied to this pull request:

  • hotspot-gc
  • serviceability

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 serviceability serviceability-dev@openjdk.org hotspot-gc hotspot-gc-dev@openjdk.org labels Jun 8, 2023
@matias9927 matias9927 marked this pull request as ready for review June 8, 2023 21:55
@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 8, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 8, 2023

Webrevs

@coleenp
Copy link
Contributor

coleenp commented Jun 9, 2023

/abel remove hotspot-gc
/label add hotspot-runtime

@openjdk
Copy link

openjdk bot commented Jun 9, 2023

@coleenp Unknown command abel - for a list of valid commands use /help.

@openjdk openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Jun 9, 2023
@openjdk
Copy link

openjdk bot commented Jun 9, 2023

@coleenp
The hotspot-runtime label was successfully added.

@coleenp
Copy link
Contributor

coleenp commented Jun 9, 2023

/label remove hotspot-gc

@openjdk openjdk bot removed the hotspot-gc hotspot-gc-dev@openjdk.org label Jun 9, 2023
@openjdk
Copy link

openjdk bot commented Jun 9, 2023

@coleenp
The hotspot-gc label was successfully removed.

Copy link
Contributor

@coleenp coleenp left a comment

Choose a reason for hiding this comment

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

Looks good.

switch(code) {
case Bytecodes._invokedynamic:
int poolIndex = getCache().getIndyEntryAt(index).getConstantPoolIndex();
return poolIndex = invokeDynamicNameAndTypeRefIndexAt(poolIndex);
Copy link
Contributor

Choose a reason for hiding this comment

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

probably don't need another assignment to poolIndex in the return statement.

@openjdk
Copy link

openjdk bot commented Jun 9, 2023

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

8309673: Refactor ref_at methods in SA ConstantPool

Reviewed-by: coleenp, fparain, iklam

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

  • 7a970b2: 8309310: Update --release 21 symbol information for JDK 21 build 26
  • 84184f9: 8232839: JDI AfterThreadDeathTest.java failed due to "FAILED: Did not get expected IllegalThreadStateException on a StepRequest.enable()"
  • 679a6d8: 8309303: jdk/internal/misc/VM/RuntimeArguments test ignores jdk/internal/vm/options
  • 6cd370e: 8305645: System Tray icons get corrupted when Windows primary monitor changes
  • a48bcf3: 8308336: Test java/net/HttpURLConnection/HttpURLConnectionExpectContinueTest.java failed: java.net.BindException: Address already in use
  • c052756: 8282797: CompileCommand parsing errors should exit VM
  • dc842e8: 8309665: Simplify Arrays.copyOf/-Range methods
  • 3070856: 8309702: Exclude java/lang/ScopedValue/StressStackOverflow.java from JTREG_TEST_THREAD_FACTORY=Virtual runs
  • 97df6cf: 8309545: Thread.interrupted from virtual thread needlessly resets interrupt status
  • f91e9ba: 8309612: [REDO] JDK-8307153 JVMTI GetThreadState on carrier should return STATE_WAITING
  • ... and 4 more: https://git.openjdk.org/jdk/compare/0be39054a631f282acc7ea05b2d98878a2b250bf...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 Jun 9, 2023
Copy link
Member

@iklam iklam left a comment

Choose a reason for hiding this comment

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

LGTM. I would suggest changing "Serviceability" in the title to "SA"

@matias9927 matias9927 changed the title 8309673: Refactor ref_at methods in Serviceability ConstantPool 8309673: Refactor ref_at methods in SA ConstantPool Jun 9, 2023
@matias9927
Copy link
Contributor Author

Thank you for the reviews @coleenp, @fparain, and @iklam !
/integrate

@openjdk
Copy link

openjdk bot commented Jun 9, 2023

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

  • 7a970b2: 8309310: Update --release 21 symbol information for JDK 21 build 26
  • 84184f9: 8232839: JDI AfterThreadDeathTest.java failed due to "FAILED: Did not get expected IllegalThreadStateException on a StepRequest.enable()"
  • 679a6d8: 8309303: jdk/internal/misc/VM/RuntimeArguments test ignores jdk/internal/vm/options
  • 6cd370e: 8305645: System Tray icons get corrupted when Windows primary monitor changes
  • a48bcf3: 8308336: Test java/net/HttpURLConnection/HttpURLConnectionExpectContinueTest.java failed: java.net.BindException: Address already in use
  • c052756: 8282797: CompileCommand parsing errors should exit VM
  • dc842e8: 8309665: Simplify Arrays.copyOf/-Range methods
  • 3070856: 8309702: Exclude java/lang/ScopedValue/StressStackOverflow.java from JTREG_TEST_THREAD_FACTORY=Virtual runs
  • 97df6cf: 8309545: Thread.interrupted from virtual thread needlessly resets interrupt status
  • f91e9ba: 8309612: [REDO] JDK-8307153 JVMTI GetThreadState on carrier should return STATE_WAITING
  • ... and 4 more: https://git.openjdk.org/jdk/compare/0be39054a631f282acc7ea05b2d98878a2b250bf...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 9, 2023

@matias9927 Pushed as commit 7d6f97d.

💡 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
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated serviceability serviceability-dev@openjdk.org
4 participants