Skip to content

Conversation

@coleenp
Copy link
Contributor

@coleenp coleenp commented Feb 9, 2023

Please review this small change to hold the refcount of a super class name while calling handle_parallel_super_load. Contrary to what I wrote in JDK-8298061, the refcount in the Placeholder table should never go to one. I can reproduce this with btree012 occasionally, so this fixes this too.

The include in placeholders.hpp is required to make the gtest compiled since placeholders header file has Symbol::maybe_increment_refcount and decrement calls.

Tested with the graal test that failed, and tier1-7.


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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12491

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 9, 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 Feb 9, 2023
@openjdk
Copy link

openjdk bot commented Feb 9, 2023

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

  • hotspot-runtime

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-runtime hotspot-runtime-dev@openjdk.org label Feb 9, 2023
@mlbridge
Copy link

mlbridge bot commented Feb 9, 2023

Webrevs

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.

Functional change seems fine. I can't say I can follow the test in detail.

Thanks.

@openjdk
Copy link

openjdk bot commented Feb 10, 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:

8278965: crash in SymbolTable::do_lookup

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

  • 4539899: 8301480: Replace NULL with nullptr in os/posix
  • 1428db7: 8301224: Replace NULL with nullptr in share/gc/shared/
  • c25b4f4: 8301578: Perform output outside synchronization in Module.class
  • 5830c03: 8302004: InlineTree should consult replay file in release build
  • c8ace48: 8301072: Replace NULL with nullptr in share/oops/
  • 1c7b09b: 8302069: javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java update
  • 837d464: 8302125: Make G1 full gc abort the VM after failing VerifyDuringGC verification
  • 723433d: 8302117: IgnoreUnrecognizedVMOptions flag causes failure in ArchiveHeapTestClass
  • e245620: 8293198: [vectorapi] Improve the implementation of VectorMask.indexInRange()
  • b814cfc: 8178806: Better exception logging in crypto code
  • ... and 27 more: https://git.openjdk.org/jdk/compare/873558ee80d741469ade030c732091bead431c46...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 Feb 10, 2023
Copy link
Contributor

@fparain fparain left a comment

Choose a reason for hiding this comment

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

Looks like a reasonable fix for the issue described in the CR.

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.

@coleenp
Copy link
Contributor Author

coleenp commented Feb 10, 2023

Thank you David, Fred and Ioi!
/integrate

@openjdk
Copy link

openjdk bot commented Feb 10, 2023

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

  • 4539899: 8301480: Replace NULL with nullptr in os/posix
  • 1428db7: 8301224: Replace NULL with nullptr in share/gc/shared/
  • c25b4f4: 8301578: Perform output outside synchronization in Module.class
  • 5830c03: 8302004: InlineTree should consult replay file in release build
  • c8ace48: 8301072: Replace NULL with nullptr in share/oops/
  • 1c7b09b: 8302069: javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java update
  • 837d464: 8302125: Make G1 full gc abort the VM after failing VerifyDuringGC verification
  • 723433d: 8302117: IgnoreUnrecognizedVMOptions flag causes failure in ArchiveHeapTestClass
  • e245620: 8293198: [vectorapi] Improve the implementation of VectorMask.indexInRange()
  • b814cfc: 8178806: Better exception logging in crypto code
  • ... and 27 more: https://git.openjdk.org/jdk/compare/873558ee80d741469ade030c732091bead431c46...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 10, 2023

@coleenp Pushed as commit 582b943.

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

@coleenp coleenp deleted the supername branch February 10, 2023 18:35
@JohnTortugo
Copy link
Contributor

/backport jdk17u-dev

@openjdk
Copy link

openjdk bot commented Sep 15, 2025

@JohnTortugo Could not automatically backport 582b9434 to openjdk/jdk17u-dev due to conflicts in the following files:

  • src/hotspot/share/classfile/placeholders.hpp
  • src/hotspot/share/classfile/systemDictionary.cpp

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk17u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk17u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-JohnTortugo-582b9434-master

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git 582b943439488a0f43482b67c0bc0d4975bf4023

# Backport the commit
$ git cherry-pick --no-commit 582b943439488a0f43482b67c0bc0d4975bf4023
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 582b943439488a0f43482b67c0bc0d4975bf4023'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk17u-dev with the title Backport 582b943439488a0f43482b67c0bc0d4975bf4023.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 582b9434 from the openjdk/jdk repository.

The commit being backported was authored by Coleen Phillimore on 10 Feb 2023 and was reviewed by David Holmes, Frederic Parain and Ioi Lam.

Thanks!

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

Development

Successfully merging this pull request may close these issues.

5 participants