JDK-8286666: JEP 429: Implementation of Scoped Values (Incubator) #10952

theRealAph · 2022-11-02T16:23:34Z

JEP 429 implementation.

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
Change requires a CSR request to be approved

Issues

JDK-8286666: JEP 429: Implementation of Scoped Values (Incubator)
JDK-8286667: Implementation of Scoped values (Incubator) (CSR)

Reviewers

Paul Sandoz (@PaulSandoz - Reviewer) ⚠️ Review applies to 30f150e1
Dean Long (@dean-long - Reviewer) ⚠️ Review applies to 37441eeb
Alan Bateman (@AlanBateman - Reviewer) ⚠️ Review applies to dcae81b4
Maurizio Cimadamore (@mcimadamore - Reviewer) ⚠️ Review applies to dcae81b4

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10952

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

Using diff file

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

bridgekeeper · 2022-11-02T16:24:37Z

👋 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 · 2022-11-02T16:28:27Z

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

build
core-libs
hotspot
security

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.

src/jdk.incubator.concurrent/share/classes/jdk/incubator/concurrent/ScopedValue.java

ExE-Boss · 2022-11-03T11:50:17Z

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

            task.run();
+            Reference.reachabilityFence(bindings);


This should probably be in a try‑finally block:

Suggested change

task.run();

Reference.reachabilityFence(bindings);

try {

task.run();

} finally {

Reference.reachabilityFence(bindings);

}

I wonder. The pattern I'm using here is based on AccessController.executePrivileged, which doesn't have the finally clause. Perhaps I should add one here anyway.

I hope it doesn't matter. There is an example in the reachabilityFence javadocs where it does not use finally. For it to matter, I think the compiler would need to inline through run() and prove that it can throw an exception, but I don't think that's how the JIT compilers currently implement reachabilityFence. I suppose a finally shouldn't hurt, however.

src/jdk.incubator.concurrent/share/classes/jdk/incubator/concurrent/ScopedValue.java

src/java.base/share/classes/jdk/internal/vm/ScopedValueContainer.java

src/hotspot/share/prims/jvm.cpp

…er.java Co-authored-by: Dean Long <17332032+dean-long@users.noreply.github.com>

dean-long · 2022-11-30T21:47:47Z

src/hotspot/share/prims/jvm.cpp

+  // Iterate through Java frames
+  vframeStream vfst(thread);
+  for(; !vfst.at_end(); vfst.next()) {
+    int loc = 0;


Use -1 instead (see below)?

Good idea, thanks.

dean-long

I made a few minor suggestions, but overall the HotSpot changes look good. Nice job Andrew.

openjdk · 2022-12-05T12:03:32Z

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

8286666: JEP 429: Implementation of Scoped Values (Incubator)

Reviewed-by: psandoz, dlong, alanb, mcimadamore

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 1 new commit pushed to the master branch:

cd2182a: 8295724: VirtualMachineError: Out of space in CodeCache for method handle intrinsic

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.

theRealAph · 2022-12-06T21:18:01Z

/integrate delegate

openjdk · 2022-12-06T21:19:49Z

@theRealAph Integration of this pull request has been delegated and may be completed by any project committer using the /integrate pull request command.

AlanBateman · 2022-12-07T10:10:09Z

/integrate

openjdk · 2022-12-07T10:14:24Z

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

ccc69af: 8296672: Implementation of Virtual Threads (Second Preview)
5a3439d: 4677581: ColorModel.getComponentSize()-wrong conditions for ArrayIndexOutOfBoundsExceptio
27bbe7b: 8297976: Remove sun.net.ProgressMonitor and related classes
085f96c: 8295258: Add BasicType argument to AccessInternal::decorator_fixup
1c2a093: 8298147: Clang warns about pointless comparisons
8ea369a: 8298171: Missing newline in the example output of -Xlog:help
acf96c6: 8290432: C2 compilation fails with assert(node->_last_del == _last) failed: must have deleted the edge just produced
ce89673: 8297804: (tz) Update Timezone Data to 2022g
62baff5: 8298221: Problem list gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java on macosx-aarch64
16a5901: 8298214: ProblemList java/util/concurrent/forkjoin/AsyncShutdownNow.java
... and 2 more: https://git.openjdk.org/jdk/compare/2cdc0195655317cb0b04f76fd8dce5e40bf52774...master

Your commit was automatically rebased without conflicts.

openjdk · 2022-12-07T10:14:48Z

@AlanBateman Pushed as commit 221e1a4.

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

dougxc · 2023-01-31T15:28:31Z

src/hotspot/share/classfile/vmIntrinsics.hpp

+  do_intrinsic(_setScopedValueCache,      java_lang_Thread,       setScopedValueCache_name, setScopedValueCache_signature, F_SN) \
+   do_name(     setScopedValueCache_name,                        "setScopedValueCache")                                 \
+   do_signature(setScopedValueCache_signature,                   "([Ljava/lang/Object;)V")                              \
+  do_intrinsic(_findScopedValueBindings,  java_lang_Thread,       findScopedValueBindings_name, void_object_signature, F_SN) \


As far as I can tell, there is not yet an intrinsic implementation for findScopedValueBindings. Is this a placeholder for a pending implementation?

Merge scoped values from loom/JEP-429-branchpoint

c7715ad

theRealAph changed the title ~~JDK-8286666: Implementation of Scoped Values (Incubator)~~ JDK-8286666: JEP 429: Implementation of Scoped Values (Incubator) Nov 2, 2022

theRealAph marked this pull request as draft November 2, 2022 16:24

openjdk bot added the csr Pull request needs approved CSR before integration label Nov 2, 2022

openjdk bot added security security-dev@openjdk.org hotspot hotspot-dev@openjdk.org build build-dev@openjdk.org core-libs core-libs-dev@openjdk.org labels Nov 2, 2022

theRealAph commented Nov 3, 2022

View reviewed changes

src/jdk.incubator.concurrent/share/classes/jdk/incubator/concurrent/ScopedValue.java Outdated Show resolved Hide resolved

ExE-Boss reviewed Nov 3, 2022

View reviewed changes

theRealAph and others added 4 commits November 3, 2022 18:42

Push ScopedValue tests

ccf5046

Delete BuildJtregMainWrapper.gmk

015d09b

Merge from Loom repo

c967900

Move scoped value syms to symbols-unix

dadf873

dean-long reviewed Nov 4, 2022

View reviewed changes

src/java.base/share/classes/jdk/internal/vm/ScopedValueContainer.java Outdated Show resolved Hide resolved

dean-long reviewed Nov 4, 2022

View reviewed changes

src/hotspot/share/prims/jvm.cpp Outdated Show resolved Hide resolved

theRealAph and others added 12 commits November 10, 2022 17:05

Minor fixes

c9d29c4

More

52cfa85

More

a815a4c

Merge branch 'clean' into JDK-8286666

6970f2b

Reviewer feedback

1560c00

Reviewer feedback

e0457d1

Reviewer feedback

0018ce5

Rewrite ScopedValue stress test

e8dfe78

Whitespace

6f862ed

Update

e2d7674

Update src/java.base/share/classes/jdk/internal/vm/ScopedValueContain…

a5f7066

…er.java Co-authored-by: Dean Long <17332032+dean-long@users.noreply.github.com>

Rename test

3c519e2

dean-long reviewed Nov 30, 2022

View reviewed changes

dean-long approved these changes Nov 30, 2022

View reviewed changes

Feedback from reviewers

4f2716a

openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Dec 1, 2022

Feedback from reviewers

97a82b7

openjdk bot removed the csr Pull request needs approved CSR before integration label Dec 2, 2022

Merge https://github.com/openjdk/jdk into JDK-8286666

702d744

openjdk bot added ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Dec 5, 2022

Add comment

dcae81b

AlanBateman approved these changes Dec 6, 2022

View reviewed changes

openjdk bot added merge-conflict Pull request has merge conflict with target branch and removed ready Pull request is ready to be integrated labels Dec 6, 2022

mcimadamore approved these changes Dec 6, 2022

View reviewed changes

Merge from JDK mainline

46fa138

openjdk bot added ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Dec 6, 2022

openjdk bot added the delegated label Dec 6, 2022

openjdk bot added the integrated Pull request has been integrated label Dec 7, 2022

openjdk bot closed this Dec 7, 2022

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review delegated labels Dec 7, 2022

dougxc reviewed Jan 31, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

JDK-8286666: JEP 429: Implementation of Scoped Values (Incubator) #10952

JDK-8286666: JEP 429: Implementation of Scoped Values (Incubator) #10952

theRealAph commented Nov 2, 2022 •

edited by openjdk bot

Loading

bridgekeeper bot commented Nov 2, 2022

openjdk bot commented Nov 2, 2022

ExE-Boss Nov 3, 2022

theRealAph Nov 4, 2022

dean-long Nov 4, 2022

dean-long Nov 30, 2022

theRealAph Dec 1, 2022

dean-long left a comment

openjdk bot commented Dec 5, 2022 •

edited

Loading

theRealAph commented Dec 6, 2022

openjdk bot commented Dec 6, 2022

AlanBateman commented Dec 7, 2022

openjdk bot commented Dec 7, 2022

openjdk bot commented Dec 7, 2022

dougxc Jan 31, 2023

JDK-8286666: JEP 429: Implementation of Scoped Values (Incubator) #10952

JDK-8286666: JEP 429: Implementation of Scoped Values (Incubator) #10952

Conversation

theRealAph commented Nov 2, 2022 • edited by openjdk bot Loading

Progress

Issues

Reviewers

Reviewing

bridgekeeper bot commented Nov 2, 2022

openjdk bot commented Nov 2, 2022

ExE-Boss Nov 3, 2022

Choose a reason for hiding this comment

theRealAph Nov 4, 2022

Choose a reason for hiding this comment

dean-long Nov 4, 2022

Choose a reason for hiding this comment

dean-long Nov 30, 2022

Choose a reason for hiding this comment

theRealAph Dec 1, 2022

Choose a reason for hiding this comment

dean-long left a comment

Choose a reason for hiding this comment

openjdk bot commented Dec 5, 2022 • edited Loading

theRealAph commented Dec 6, 2022

openjdk bot commented Dec 6, 2022

AlanBateman commented Dec 7, 2022

openjdk bot commented Dec 7, 2022

openjdk bot commented Dec 7, 2022

dougxc Jan 31, 2023

Choose a reason for hiding this comment

theRealAph commented Nov 2, 2022 •

edited by openjdk bot

Loading

openjdk bot commented Dec 5, 2022 •

edited

Loading