8355022: Implement JEP 506: Scoped Values #24923

theRealAph · 2025-04-28T14:32:04Z

Propose to finalize scoped values.
The only functional change is that the orElse() method no longer accepts a null argument.

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed (2 reviews required, with at least 2 Reviewers)
Change requires CSR request JDK-8355023 to be approved

Issues

JDK-8355022: Implement JEP 506: Scoped Values (Enhancement - P4)
JDK-8355023: Implement JEP 506: Scoped Values (CSR)

Reviewers

Chen Liang (@liach - Reviewer)
Alan Bateman (@AlanBateman - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24923

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

Using diff file

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

Using Webrev

Link to Webrev Comment

bridgekeeper · 2025-04-28T14:37:04Z

👋 Welcome back aph! 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-04-28T14:38:00Z

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

8355022: Implement JEP 506: Scoped Values

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

ae7ae84: 8356016: Build fails by clang(XCode 16.3) on macOS after JDK-8347719
d6e4c5f: 8357506: [JVMCI] Consolidate eager JVMCI initialization code
9d9e41f: 8356894: Adjust CreateSymbols to properly handle the newly added @jdk.internal.RequiresIdentity
... and 13 more: https://git.openjdk.org/jdk/compare/12efc1fe3322d16f0e703b334912241d80dbaba9...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 · 2025-04-28T14:38:50Z

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

compiler
core-libs

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.

liach · 2025-04-28T15:29:27Z

Nit: is the no-arg constructor of Snapshot supposed to be private instead?

AlanBateman · 2025-04-28T15:34:56Z

@theRealAph There are test updates in the loom repo that will also need to be included in this PR. test/jdk/java/lang/ScopedValue/ScopedValueAPI.java at least.

src/java.base/share/classes/java/lang/ScopedValue.java

mlbridge · 2025-04-29T07:17:25Z

Webrevs

src/java.base/share/classes/java/lang/ScopedValue.java

AlanBateman · 2025-04-29T07:57:23Z

src/java.base/share/classes/java/lang/ScopedValue.java

         * @throws StructureViolationException if a structure violation is detected
         * @throws X if {@code op} completes with an exception
-         * @since 23
+         * @since 25


The @since on the method be dropped once Carrier is bumped to 25.

test/jdk/java/lang/ScopedValue/ScopedValueAPI.java

AlanBateman · 2025-04-30T12:48:08Z

@theRealAph Can you include the update to javax/security/auth/Subject.java as part of this?

ExE-Boss · 2025-05-02T12:03:35Z

src/java.base/share/classes/java/lang/ScopedValue.java

It occurred to me that ScopedValue.NEW_THREAD_BINDINGS can be made package‑private and used in Thread, removing duplication in Thread.NEW_THREAD_BINDINGS.

This was done this way back when ScopedValue lived under the jdk.incubator.* package tree.

I think it would be better not change that in this PR, as this PR is about making the feature permanent.

openjdk · 2025-05-02T16:58:26Z

@theRealAph this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout JDK-8355022
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

theRealAph · 2025-05-08T17:18:12Z

@theRealAph Can you include the update to javax/security/auth/Subject.java as part of this?

Fixed now.

JarvisCraft · 2025-05-08T17:47:12Z

src/java.base/share/classes/java/lang/ScopedValue.java

     * @return the value of the scoped value if bound, otherwise {@code other}
     */
    public T orElse(T other) {
+        Objects.requireNonNull(other);


Shouldn't the NPE be specified in the Javadoc?

In the class specification, right above the API notes:

* <p> Unless otherwise specified, passing a {@code null} argument to a method in this * class will cause a {@link NullPointerException} to be thrown.

liach · 2025-05-08T18:18:44Z

I noted that ThreadFlock is using scoped values but throwing StructureViolationException introduced by structured concurrency - is it considered an implementation artifact and part of structured concurrency instead?

Context: test/jdk/jdk/internal/misc/ThreadFlock/WithScopedValue.java

liach

Reviewed the Javadoc and specification updates and @enablePreview removals for the end of preview. These are all related tests that can have the directive removed, aside from the thread flock test I asked about.

liach · 2025-05-08T18:21:57Z

/reviewers 2 reviewer

openjdk · 2025-05-08T18:22:31Z

@liach
The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 2 (with at least 2 Reviewers).

AlanBateman · 2025-05-08T18:37:58Z

I noted that ThreadFlock is using scoped values but throwing StructureViolationException introduced by structured concurrency - is it considered an implementation artifact and part of structured concurrency instead?

ThreadFlock supports the inheritance of scoped values into structured concurrency contexts. No changes in this PR to that construct.

AlanBateman · 2025-05-08T18:57:56Z

@theRealAph One other test that will need attention is runtime/ClassFile/ClassFileVersionTest.java.

liach · 2025-05-08T19:51:12Z

May I provide a quick patch to use an alternative mechanism to test preview class file versions for that class instead of changing that in this PR?

I have created #25128 addressing this issue.

AlanBateman · 2025-05-09T05:54:28Z

May I provide a quick patch to use an alternative mechanism to test preview class file versions for that class instead of changing that in this PR?

That would be good as it shouldn't depend on ScopedValue being a preview API class.

theRealAph · 2025-05-09T08:25:13Z

I noted that ThreadFlock is using scoped values but throwing StructureViolationException introduced by structured concurrency - is it considered an implementation artifact and part of structured concurrency instead?

Context: test/jdk/jdk/internal/misc/ThreadFlock/WithScopedValue.java

That's an interesting question that I'll leave to @AlanBateman .

AlanBateman · 2025-05-09T08:28:37Z

I'm getting a test failure in ClassFileVersionTest.java because ScopedValue is not a Preview API. Should I just fix the test to use some other Preview Class?

Chen offered to change this test to use the ClassFile API and construct the class with the preview minor number. The PR to change this test is reviewed so I think all good, nothing more to do here.

AlanBateman · 2025-05-09T08:29:52Z

That's an interesting question that I'll leave to @AlanBateman .

Nothing to do as the test uses StructureViolationException so needs to continue to be compile/run with preview features enabled.

AlanBateman · 2025-05-11T17:07:12Z

I ran tier1-6 so I think we are good and there isn't anything left to bring over from the loom repo. There are a few files that will need their copyright header updated before integration. The CSR also needs to be finalized.

liach

The latest master merge looks good.

AlanBateman

CSR is approved, I think this update is ready to integrate.

theRealAph · 2025-05-28T09:40:58Z

/integrate

openjdk · 2025-05-28T09:41:40Z

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

f02190b: 8357829: Commented out sample limit in JfrSamplerThread::task_stacktrace
1e0caed: 8357854: Parallel: Inline args of PSOldGen::initialize_performance_counters
f74fbfe: 8357449: ZGC: Multiple medium page sizes
... and 86 more: https://git.openjdk.org/jdk/compare/12efc1fe3322d16f0e703b334912241d80dbaba9...master

Your commit was automatically rebased without conflicts.

openjdk · 2025-05-28T09:41:46Z

@theRealAph Pushed as commit 4e1878c.

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

Implement JEP 506: Scoped Values

ffa3b0f

openjdk bot added core-libs [email protected] compiler [email protected] labels Apr 28, 2025

ExE-Boss reviewed Apr 28, 2025

View reviewed changes

src/java.base/share/classes/java/lang/ScopedValue.java Show resolved Hide resolved

8355720: Implement JEP 506: Scoped Values

b4d7767

theRealAph changed the title ~~Implement JEP 506: Scoped Values~~ 8355720: Implement JEP 506: Scoped Values Apr 29, 2025

openjdk bot added the rfr Pull request is ready for review label Apr 29, 2025

theRealAph changed the title ~~8355720: Implement JEP 506: Scoped Values~~ 8355022: Implement JEP 506: Scoped Values Apr 29, 2025

openjdk bot added the csr Pull request needs approved CSR before integration label Apr 29, 2025

ScopedValue::orElse() does not accept null as an argument.

00ded12

AlanBateman reviewed Apr 29, 2025

View reviewed changes

src/java.base/share/classes/java/lang/ScopedValue.java Show resolved Hide resolved

Since when?

d3f2ff1

AlanBateman reviewed Apr 29, 2025

View reviewed changes

test/jdk/java/lang/ScopedValue/ScopedValueAPI.java Show resolved Hide resolved

ExE-Boss reviewed May 2, 2025

View reviewed changes

Andrew Haley added 2 commits May 2, 2025 17:56

Remove unnecessary @enablePreview in some tests

877f393

Remove unnecessary @SInCE 25

8f62661

openjdk bot added merge-conflict Pull request has merge conflict with target branch and removed rfr Pull request is ready for review labels May 2, 2025

ScopedValue::orElse() does not accept null as an argument.

a80b034

Merge from https://github.com/openjdk/jdk

2988802

JarvisCraft reviewed May 8, 2025

View reviewed changes

liach approved these changes May 8, 2025

View reviewed changes

liach mentioned this pull request May 8, 2025

8356577: Migrate ClassFileVersionTest to be feature-agnostic #25128

Closed

3 tasks

AlanBateman approved these changes May 11, 2025

View reviewed changes

openjdk bot added the merge-conflict Pull request has merge conflict with target branch label May 15, 2025

Merge from JDK head

460d82b

openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label May 22, 2025

liach approved these changes May 22, 2025

View reviewed changes

openjdk bot removed the csr Pull request needs approved CSR before integration label May 22, 2025

AlanBateman approved these changes May 23, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label May 23, 2025

openjdk bot added the integrated Pull request has been integrated label May 28, 2025

openjdk bot closed this May 28, 2025

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 28, 2025

graalvmbot mentioned this pull request Jun 10, 2025

[GR-65610] Update labsjdk to 25+26-jvmci-b01 oracle/graal#11374

Merged

8355022: Implement JEP 506: Scoped Values #24923

8355022: Implement JEP 506: Scoped Values #24923

Uh oh!

Conversation

theRealAph commented Apr 28, 2025 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issues

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Apr 28, 2025

Uh oh!

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

Uh oh!

Uh oh!

openjdk bot commented Apr 28, 2025

Uh oh!

liach commented Apr 28, 2025

Uh oh!

AlanBateman commented Apr 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

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

Uh oh!

Webrevs

Uh oh!

Uh oh!

AlanBateman Apr 29, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

AlanBateman commented Apr 30, 2025

Uh oh!

ExE-Boss May 2, 2025

Choose a reason for hiding this comment

Uh oh!

AlanBateman May 2, 2025

Choose a reason for hiding this comment

Uh oh!

openjdk bot commented May 2, 2025

Uh oh!

theRealAph commented May 8, 2025

Uh oh!

JarvisCraft May 8, 2025

Choose a reason for hiding this comment

Uh oh!

liach May 8, 2025

Choose a reason for hiding this comment

Uh oh!

liach commented May 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

liach left a comment

Choose a reason for hiding this comment

Uh oh!

liach commented May 8, 2025

Uh oh!

openjdk bot commented May 8, 2025

Uh oh!

AlanBateman commented May 8, 2025

Uh oh!

AlanBateman commented May 8, 2025

Uh oh!

liach commented May 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

AlanBateman commented May 9, 2025

Uh oh!

theRealAph commented May 9, 2025

Uh oh!

AlanBateman commented May 9, 2025

Uh oh!

AlanBateman commented May 9, 2025

Uh oh!

AlanBateman commented May 11, 2025

Uh oh!

liach left a comment

Choose a reason for hiding this comment

theRealAph commented Apr 28, 2025 •

edited by openjdk bot

Loading

openjdk bot commented Apr 28, 2025 •

edited

Loading

AlanBateman commented Apr 28, 2025 •

edited

Loading

mlbridge bot commented Apr 29, 2025 •

edited

Loading

liach commented May 8, 2025 •

edited

Loading

liach commented May 8, 2025 •

edited

Loading