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

8297757: VarHandles.getStaticFieldFromBaseAndOffset should get the receiver type from VarHandle #12100

Closed
wants to merge 2 commits into from

Conversation

mlchung
Copy link
Member

@mlchung mlchung commented Jan 19, 2023

VarHandles.getStaticFieldFromBaseAndOffset maps a base/offset/fieldType to a static Field. It's fragile to assume that the location of a static field returned by Unsafe.staticFieldBase is a Class object. This changes the VarHandle implementation for static fields (i.e. FieldStaticReadOnly and FieldStaticReadWrite classes) to include the receiver type in addition to the base and offset.


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-8297757: VarHandles.getStaticFieldFromBaseAndOffset should get the receiver type from VarHandle

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12100

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 19, 2023

👋 Welcome back mchung! 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 19, 2023
@openjdk
Copy link

openjdk bot commented Jan 19, 2023

@mlchung 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 Jan 19, 2023
@mlbridge
Copy link

mlbridge bot commented Jan 19, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Jan 19, 2023

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

8297757: VarHandles.getStaticFieldFromBaseAndOffset should get the receiver type from VarHandle

Reviewed-by: psandoz, alanb

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

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 19, 2023
@mlchung
Copy link
Member Author

mlchung commented Jan 20, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jan 20, 2023

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

  • e803855: 8299863: URLFromURITest.java should import org.junit.jupiter.api.Test
  • 92d8326: 8299827: Add resolved IP address in connection exception for sockets
  • c6d5600: 8038146: Clarify Map.Entry's connection to the underlying map
  • b2d3622: 8299896: Reduce enum values of HtmlLinkInfo.Kind
  • 623ba5b: 8300653: G1EvacInfo should use common naming scheme for collection set
  • 97c611d: 8289748: C2 compiled code crashes with SIGFPE with -XX:+StressLCM and -XX:+StressGCM
  • 4562b40: 8300682: InstanceKlassMiscStatus is a bad name
  • 26410c1: 8281213: Unsafe uses of long and size_t in MemReporterBase::diff_in_current_scale
  • eca6479: 8300087: Replace NULL with nullptr in share/cds/
  • 49d60fe: 8300172: java/net/httpclient/MappingResponseSubscriber.java failed with java.net.ConnectException
  • ... and 12 more: https://git.openjdk.org/jdk/compare/d85243f02b34d03bd7af63a5bcbc73f500f720df...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 20, 2023

@mlchung Pushed as commit facd415.

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

@mlchung mlchung deleted the JDK-8297757 branch January 24, 2023 18:13
@gilles-duboscq
Copy link
Member

Thank you for this fix @mlchung!

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
4 participants