Skip to content

Conversation

@matias9927
Copy link
Contributor

@matias9927 matias9927 commented May 3, 2023

The set of functions in constantpool.hpp used for grabbing references at a certain index have cached and uncached variants which have different meanings for the index they take as an argument. In the implementation of these functions, the uncached boolean is checks alongside whether or not the cache has been created, but this is redundant since, if the cache has been created, the bytecode operands have been rewritten. This change replaces some of the calls with the uncached variant which expects a constant pool index as input so that the "cached" calls can take in rewritten indices. Verified with tier1-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-8307306: Change some ConstantPool::name_ref_at calls to uncached_name_ref_at

Reviewers

Contributors

  • Ioi Lam <iklam@openjdk.org>

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 13786

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

Using diff file

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

Webrev

Link to Webrev Comment

@matias9927
Copy link
Contributor Author

/contributor add @iklam

@bridgekeeper
Copy link

bridgekeeper bot commented May 3, 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 May 3, 2023

@matias9927
Contributor Ioi Lam <iklam@openjdk.org> successfully added.

@openjdk
Copy link

openjdk bot commented May 3, 2023

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

  • hotspot

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 hotspot hotspot-dev@openjdk.org label May 3, 2023
@matias9927 matias9927 marked this pull request as ready for review May 3, 2023 20:41
@openjdk openjdk bot added the rfr Pull request is ready for review label May 3, 2023
@mlbridge
Copy link

mlbridge bot commented May 3, 2023

Webrevs

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.

This is a good cleanup!

@openjdk
Copy link

openjdk bot commented May 4, 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:

8307306: Change some ConstantPool::name_ref_at calls to uncached_name_ref_at

Co-authored-by: Ioi Lam <iklam@openjdk.org>
Reviewed-by: coleenp, fparain

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

  • 5ca0b08: 8307133: Open source some JTable jtreg tests
  • 2adb3b4: 8306943: Open source several dnd AWT tests
  • dc4096c: 8304937: BufferedFieldBuilder.Model missing writeTo(DirectClassBuilder)
  • 29233e0: 8307448: Test RedefineSharedClassJFR fail due to wrong assumption
  • 408cec5: 8306929: Avoid CleanClassLoaderDataMetaspaces safepoints when previous versions are shared
  • cecf817: 8307181: MemoryLayout.structLayout uses undocumented strict alignment constraints
  • 3f1927a: 8307346: Add missing gc+phases logging for ObjectCount(AfterGC) JFR event collection code
  • e206d57: 8307362: Remove test com/sun/jdi/JdbLastErrorTest.java
  • 82a8e91: 8306489: Open source AWT List related tests
  • 465bdd9: 8307091: A few client tests intermittently throw ConcurrentModificationException
  • ... and 60 more: https://git.openjdk.org/jdk/compare/da9efee1c25f76f80fee9065680e7d75d03c7178...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 May 4, 2023
@matias9927
Copy link
Contributor Author

Thank you for the reviews @coleenp and @fparain
/integrate

@openjdk
Copy link

openjdk bot commented May 5, 2023

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

  • 3f6a354: 8305169: java/security/cert/CertPathValidator/OCSP/GetAndPostTests.java -- test server didn't start in timely manner
  • f143bf7: 8305084: Remove the removal warnings for finalize() from test/hotspot/jtreg/serviceability/dcmd/gc/FinalizerInfoTest.java and RunFinalizationTest.java
  • 746f8d1: 8305714: Add an extra test for JDK-8292755
  • 1a1ce66: 8305080: Suppress the 'removal' warning for finalize() from test/hotspot/jtreg/compiler/jvmci/common/testcases that used in compiler/jvmci/compilerToVM/ tests
  • 3b430b9: 8250596: Update remaining manpage references from "OS X" to "macOS"
  • 948f3b3: 8301493: Replace NULL with nullptr in cpu/aarch64
  • f94f957: 8307331: Correctly update line maps when class redefine rewrites bytecodes
  • 302bc2f: 8307421: Fix comment in g1CollectionSetChooser.hpp after JDK-8306836
  • e19cf26: 8307196: Dangling pointer warning for MetadataAllocationRequest
  • 1b143ba: 8307378: Allow collectors to provide specific values for GC notifications' actions
  • ... and 76 more: https://git.openjdk.org/jdk/compare/da9efee1c25f76f80fee9065680e7d75d03c7178...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 5, 2023

@matias9927 Pushed as commit 6fe959c.

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

Development

Successfully merging this pull request may close these issues.

3 participants