Skip to content

Conversation

@reinrich
Copy link
Member

@reinrich reinrich commented Sep 29, 2022

Hi,

this small fix copies the initialization of nmethod::_consts_offset from the nmethod constructor for c1/c2 compiled nmethods to the constructor for native nmethods.

Manual testing:

  • I built commit 86097e2 and reproduced the issue on x86_64 as described in the JBS-bug
  • Then I build commit 5ce7741 and found that I could not reproduce the issue. I also verified that on PPC64 the constants section of the continuation enter intrinsic is printed now (-XX:+PrintAssembly).

The fix passed our CI testing: most JCK and JTREG test, also in Xcomp mode, SPECjvm2008, SPECjbb2015, Renaissance Suite and SAP specific tests with fastdebug and release builds on the standard platforms plus PPC64.

Thanks, Richard.


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-8294514: Wrong initialization of nmethod::_consts_offset for native nmethods

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10482

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 29, 2022

👋 Welcome back rrich! 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 Sep 29, 2022

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

  • hotspot-compiler

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-compiler hotspot-compiler-dev@openjdk.org label Sep 29, 2022
@reinrich reinrich marked this pull request as ready for review September 29, 2022 11:02
@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 29, 2022
@mlbridge
Copy link

mlbridge bot commented Sep 29, 2022

Webrevs

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

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

Good.

@openjdk
Copy link

openjdk bot commented Sep 29, 2022

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

8294514: Wrong initialization of nmethod::_consts_offset for native nmethods

Reviewed-by: kvn, dlong

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

  • 88062ee: 8293969: breakup the long signature in SystemDictionaryShared::is_supported_invokedynamic
  • aeef3ec: 8294198: Implement isFinite intrinsic for RISC-V
  • 5f6ad92: 8294547: HotSpotAgent.setupVM() should include "cause" exception when throwing DebuggerException
  • 545ded1: 8294548: Problem list SA core file tests on macosx-x64 due to JDK-8294316
  • 29c70f1: 8294595: Add javax/swing/plaf/aqua/CustomComboBoxFocusTest.java to problem list
  • 5d48da4: 8294370: Fix allocation bug in java_lang_Thread::async_get_stack_trace()
  • ce85cac: 8065554: MatchResult should provide values of named-capturing groups
  • 1decdce: 8294492: RISC-V: Use li instead of patchable movptr at non-patchable callsites
  • 8491fd5: 8294551: Put java/io/BufferedInputStream/TransferTo.java on problem list
  • 6f8f28e: 8294160: misc crash dump improvements
  • ... and 33 more: https://git.openjdk.org/jdk/compare/1abf971b93222f422c0026cee944a6db214f955a...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 Sep 29, 2022
@reinrich
Copy link
Member Author

reinrich commented Oct 5, 2022

Thanks for the reviews @vnkozlov and @dean-long

/integrate

@openjdk
Copy link

openjdk bot commented Oct 5, 2022

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

  • 953ce8d: 8293701: jdeps InverseDepsAnalyzer runs into NoSuchElementException: No value present
  • be82cff: 8294748: Cleanup unneeded references to hg
  • 43dbf58: 8186765: Speed up test sun/net/www/protocol/https/HttpsClient/ProxyAuthTest.java
  • 755958e: 8294376: Minimize disabled warnings in java.base
  • 1dafbe3: 8294539: Augment discussion of equivalence relations on floating-point values
  • b2e86a6: 8294255: Add link to DEFAULT_WAIT_TIME in javadoc for SunToolKit.realsSync
  • b22a38d: 8292309: Fix java/awt/PrintJob/ConstrainedPrintingTest/ConstrainedPrintingTest.java test
  • 121d4a5: 8293579: tools/jpackage/share/jdk/jpackage/tests/UnicodeArgsTest.java fails on Japanese Windows platform
  • 1166a8a: 8292214: Memory leak in getAllConfigs of awt_GraphicsEnv.c:386
  • 3644e26: 8294673: JFR: Add SecurityProviderService#threshold to TestActiveSettingEvent.java
  • ... and 96 more: https://git.openjdk.org/jdk/compare/1abf971b93222f422c0026cee944a6db214f955a...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 5, 2022

@reinrich Pushed as commit b4e74ae.

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

@reinrich reinrich deleted the 8294514_Wrong_initialization_of_nmethod___consts_offset_for_native_nmethods branch October 31, 2022 07:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants