8351700: Remove code conditional on BarrierSetNMethod being null #23996

dougxc · 2025-03-11T19:29:05Z

All GCs started needing nmethod entry barriers as of loom so there's no longer any need to test for null nmethod entry barriers.

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-8351700: Remove code conditional on BarrierSetNMethod being null (Enhancement - P4)

Reviewers

Erik Österlund (@fisk - Reviewer) Review applies to b958ee43
Tom Rodriguez (@tkrodriguez - Reviewer) Review applies to b3d4721d
Aleksey Shipilev (@shipilev - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23996

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

Using diff file

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

Using Webrev

Link to Webrev Comment

bridgekeeper · 2025-03-11T19:29:57Z

👋 Welcome back dnsimon! 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 · 2025-03-11T19:30:13Z

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

8351700: Remove code conditional on BarrierSetNMethod being null

Reviewed-by: shade, eosterlund, never

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

1fe4526: 8350194: Last 2 parameters of ReturnNode::ReturnNode are swapped in the declaration
1d147cc: 8351484: Race condition in max stats in MonitorList::add
4412c07: 8351639: Improve debuggability of test/langtools/jdk/jshell/JdiHangingListenExecutionControlTest.java test
1dd9cf1: 8349099: java/awt/Headless/HeadlessMalfunctionTest.java fails on CI with Compilation error
64464ea: 8351673: Clean up a case of if (LockingMode == LM_LIGHTWEIGHT) in a legacy-only locking mode function
9a49418: 8345940: Migrate security-related resources from Java classes to properties files
e71f327: 8351045: ClassValue::remove cannot ensure computation observes up-to-date state
cef3693: 8351656: Problemlist gc/TestAllocHumongousFragment#generational

Please see this link for an up-to-date comparison between the source branch of this pull request and 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 · 2025-03-11T19:30:44Z

@dougxc The following labels will be automatically applied to this pull request:

graal
hotspot
shenandoah

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

fisk

Nice! Looks good.

mlbridge · 2025-03-11T19:41:18Z

Webrevs

tkrodriguez · 2025-03-11T19:50:18Z

src/hotspot/cpu/riscv/stubGenerator_riscv.cpp


-    BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
-    if (bs_nm != nullptr) {
-      StubRoutines::_method_entry_barrier = generate_method_entry_barrier();


Shouldn't you have kept this line?

Absolutely!

RealFYang · 2025-03-12T00:29:54Z

src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp

    // arraycopy stubs used by compilers
    generate_arraycopy_stubs();

    BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();


Drive-by comment: bs_nm seems not used any more.

shipilev

Looks fine, thanks.

dougxc · 2025-03-12T12:19:35Z

gc/TestAllocHumongousFragment.java#generational is failing on Windows: https://github.com/dougxc/jdk/actions/runs/13807682996/job/38625487569#step:9:630
I don't think it can be caused by this PR. Are you able to confirm that @shipilev ?

shipilev · 2025-03-12T12:28:26Z

gc/TestAllocHumongousFragment.java#generational is failing on Windows: https://github.com/dougxc/jdk/actions/runs/13807682996/job/38625487569#step:9:630 I don't think it can be caused by this PR. Are you able to confirm that @shipilev ?

It was problemlisted by #23982 yesterday. You can ignore it, or merge with recent master to get clean GHA runs.

dougxc · 2025-03-12T12:29:47Z

I'll ignore it. Thanks for pointing out the problem listing.

dougxc · 2025-03-12T12:30:31Z

/integrate

openjdk · 2025-03-12T12:31:38Z

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

84f87dd: 8351665: Remove unused UseNUMA in os_aix.cpp
4be502e: 8350642: Interpreter: Upgrade CountBytecodes to 64 bit on 64 bit platforms
1fe4526: 8350194: Last 2 parameters of ReturnNode::ReturnNode are swapped in the declaration
1d147cc: 8351484: Race condition in max stats in MonitorList::add
4412c07: 8351639: Improve debuggability of test/langtools/jdk/jshell/JdiHangingListenExecutionControlTest.java test
1dd9cf1: 8349099: java/awt/Headless/HeadlessMalfunctionTest.java fails on CI with Compilation error
64464ea: 8351673: Clean up a case of if (LockingMode == LM_LIGHTWEIGHT) in a legacy-only locking mode function
9a49418: 8345940: Migrate security-related resources from Java classes to properties files
e71f327: 8351045: ClassValue::remove cannot ensure computation observes up-to-date state
cef3693: 8351656: Problemlist gc/TestAllocHumongousFragment#generational

Your commit was automatically rebased without conflicts.

openjdk · 2025-03-12T12:31:45Z

@dougxc Pushed as commit 95b66d5.

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

nmethod entry barriers are no longer optional

b958ee4

openjdk bot added graal graal-dev@openjdk.org hotspot hotspot-dev@openjdk.org shenandoah shenandoah-dev@openjdk.org labels Mar 11, 2025

fisk approved these changes Mar 11, 2025

View reviewed changes

dougxc marked this pull request as ready for review March 11, 2025 19:36

openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 11, 2025

tkrodriguez reviewed Mar 11, 2025

View reviewed changes

revived accidentally deleted code

b3d4721

openjdk bot removed the ready Pull request is ready to be integrated label Mar 11, 2025

tkrodriguez approved these changes Mar 11, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Mar 11, 2025

RealFYang reviewed Mar 12, 2025

View reviewed changes

removed unused code

95da3c2

openjdk bot removed the ready Pull request is ready to be integrated label Mar 12, 2025

shipilev approved these changes Mar 12, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Mar 12, 2025

openjdk bot added the integrated Pull request has been integrated label Mar 12, 2025

openjdk bot closed this Mar 12, 2025

openjdk bot removed the ready Pull request is ready to be integrated label Mar 12, 2025

openjdk bot removed the rfr Pull request is ready for review label Mar 12, 2025

8351700: Remove code conditional on BarrierSetNMethod being null #23996

8351700: Remove code conditional on BarrierSetNMethod being null #23996

Uh oh!

Conversation

dougxc commented Mar 11, 2025 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Mar 11, 2025

Uh oh!

openjdk bot commented Mar 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented Mar 11, 2025

Uh oh!

fisk left a comment

Choose a reason for hiding this comment

Uh oh!

mlbridge bot commented Mar 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

tkrodriguez Mar 11, 2025

Choose a reason for hiding this comment

Uh oh!

dougxc Mar 11, 2025

Choose a reason for hiding this comment

Uh oh!

RealFYang Mar 12, 2025

Choose a reason for hiding this comment

Uh oh!

shipilev left a comment

Choose a reason for hiding this comment

Uh oh!

dougxc commented Mar 12, 2025

Uh oh!

shipilev commented Mar 12, 2025

Uh oh!

dougxc commented Mar 12, 2025

Uh oh!

dougxc commented Mar 12, 2025

Uh oh!

openjdk bot commented Mar 12, 2025

Uh oh!

openjdk bot commented Mar 12, 2025

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

5 participants

dougxc commented Mar 11, 2025 •

edited by openjdk bot

Loading

openjdk bot commented Mar 11, 2025 •

edited

Loading

mlbridge bot commented Mar 11, 2025 •

edited

Loading