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

8299274: Add elements to resolved_references consistently #11834

Closed
wants to merge 4 commits into from

Conversation

coleenp
Copy link
Contributor

@coleenp coleenp commented Jan 3, 2023

I added a resolved_references_at and set_resolved_references_at() functions to use for accesses to the resolved_references array, except for the CDS usages. This has an assert that the element is an oop and oob checks and setting elements use a CAS consistently.
These asserts seem useful for finding the bug causing https://bugs.openjdk.org/browse/JDK-8296915.
Tested with tiers1-4.


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-8299274: Add elements to resolved_references consistently

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11834

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 3, 2023

👋 Welcome back coleenp! 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 Jan 3, 2023
@openjdk
Copy link

openjdk bot commented Jan 3, 2023

@coleenp 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 Jan 3, 2023
@mlbridge
Copy link

mlbridge bot commented Jan 3, 2023

Webrevs

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.

Looks good to me.

@openjdk
Copy link

openjdk bot commented Jan 3, 2023

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

8299274: Add elements to resolved_references consistently

Reviewed-by: iklam, dholmes, rehn, 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 34 new commits pushed to the master branch:

  • 7845b0d: 8296934: Write a test to verify whether Undecorated Frame can be iconified or not
  • 4b6809b: 8299693: Change to Xcode12.4+1.1 devkit for building on macOS at Oracle
  • dfdbd0f: 8299343: Windows: Invalid thread_native_entry declaration
  • 3e2314d: 8299254: Support dealing with standard assert macro
  • a49ccb9: 8299292: Missing elements in aliased String array
  • b908388: 8298449: Unnecessary Vector usage in MetaData.ProxyPersistenceDelegate
  • be64bf8: 8299329: Assertion failure with fastdebug build when trying to use CDS without classpath
  • 8723847: 8298848: C2: clone all of (CmpP (LoadKlass (AddP down at split if
  • 1ca31d3: 8299657: sun/tools/jhsdb/SAGetoptTest.java fails after 8299470
  • e7361cb: 8299430: Cleanup: delete unnecessary semicolons in java.desktop module
  • ... and 24 more: https://git.openjdk.org/jdk/compare/ea25a561c57cba63c5581aefa21f92ffd7386244...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 Jan 3, 2023
@coleenp
Copy link
Contributor Author

coleenp commented Jan 3, 2023

Thanks, Ioi.

Copy link
Member

@dholmes-ora dholmes-ora 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 - nice simplification. Just one issue with naming.

Thanks

src/hotspot/share/oops/constantPool.cpp Outdated Show resolved Hide resolved
src/hotspot/share/oops/constantPool.cpp Outdated Show resolved Hide resolved
Copy link
Contributor

@robehn robehn left a comment

Choose a reason for hiding this comment

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

Otherwise looks good, thanks!

src/hotspot/share/oops/constantPool.cpp Outdated Show resolved Hide resolved
src/hotspot/share/oops/constantPool.cpp Outdated Show resolved Hide resolved
Copy link
Contributor

@robehn robehn left a comment

Choose a reason for hiding this comment

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

Thanks!

…lass_at but I don't like this name as much as having resolved_references (plural) in the name.
@coleenp
Copy link
Contributor Author

coleenp commented Jan 5, 2023

Thanks for reviewing, Ioi. singular resolved_reference looks better to me today than it did yesterday.

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

@dholmes-ora are you holding out until I change the name to something I don't agree with ?

No I was waiting to see if anyone else had an opinion on it. :)

Thanks for making the change.

@coleenp
Copy link
Contributor Author

coleenp commented Jan 6, 2023

Thanks for reviewing, Ioi, Fred, Robbin and David.
/integrate

@openjdk
Copy link

openjdk bot commented Jan 6, 2023

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

  • 8cc1669: 8299721: [Vector API] assert in switch-default of LibraryCallKit::arch_supports_vector_rotate is too weak to catch bugs
  • 5598acc: 8294403: [REDO] make test should report only on executed tests
  • 88f0ea7: 8299726: [cleanup] Some code cleanup in opto/compile.hpp
  • 0234f81: 8298447: Unnecessary Vector usage in DocPrintJob implementations
  • cc4936a: 8298720: Insufficient error handling when CodeBuffer is exhausted
  • b5b7948: 8298240: Replace the usage of ImageLayoutException by the CMMException
  • 99be740: 8299306: Test "javax/swing/JFileChooser/FileSystemView/CustomFSVLinkTest.java" fails on Windows 10 x64 because there are some buttons did not display button name
  • 775da84: 8299412: JNI call of getAccessibleActionCount on a wrong thread
  • 7845b0d: 8296934: Write a test to verify whether Undecorated Frame can be iconified or not
  • 4b6809b: 8299693: Change to Xcode12.4+1.1 devkit for building on macOS at Oracle
  • ... and 32 more: https://git.openjdk.org/jdk/compare/ea25a561c57cba63c5581aefa21f92ffd7386244...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 6, 2023

@coleenp Pushed as commit 1e99729.

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

@coleenp coleenp deleted the resolved-references branch January 6, 2023 14:05
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
5 participants