Prevent inlining of *.runWith methods #18152
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Related: |
babsingh
reviewed
Sep 15, 2023
0xdaryl
reviewed
Sep 15, 2023
| * relies on iterating the O-slots of these methods to find the most recent ScopedValue binding. | ||
| * The scoped value binding is the first argument in runWith, and if runWith is compiled, the | ||
| * O-slot walker would rely on iterating through the O-slots until an object that is an instance | ||
| * of jdk.incubator.concurrent.ScopedValue$Snapshot is found. If we were to allow inlining of |
There was a problem hiding this comment.
Should this be an incubator package name here? For JDK21 I imagine it isn't.
There was a problem hiding this comment.
It's not in incubator package in JDK21, so I fixed the comment.
runtime/compiler/env/j9method.cpp
Outdated
| @@ -3957,6 +3958,18 @@ void TR_ResolvedJ9Method::construct() | |||
| {TR::unknownMethod} | |||
| }; | |||
|
|
|||
| static X VirtualThreadMethods [] = | |||
| { | |||
| { TR::java_lang_VirtualThread_runWith, 7, "runWith", (int16_t)-1, "*"}, | |||
There was a problem hiding this comment.
Just curious about the whitespace here. I imagine it is for alignment, but since these are the only entries in these tables it is hard to see what they are being aligned with.
Thread.findScopedValueBindings implementation relies on iterating the O-slots of these methods to find the most recent ScopedValue binding. The scoped value binding is the first argument in runWith, and if runWith is compiled, the O-slot walker would rely on iterating through the O-slots until an object that is an instance of jdk.incubator.concurrent.ScopedValue$Snapshot is found. If we were to allow inlining of runWith, this slot walking mechanism would be unreliable, such as when there are more than one runWith calls in the same caller, and iterating through the O-slots and relying on instanceof checks could then yield the wrong bindings. Signed-off-by: Nazim Bhuiyan <[email protected]>
|
Jenkins test sanity all jdk21 |
|
Jenkins test sanity plinux jdk21 |
0xdaryl
approved these changes
Sep 18, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Thread.findScopedValueBindings implementation relies on iterating the O-slots of these methods to find the most recent ScopedValue binding. The scoped value binding is the first argument in runWith, and if runWith is compiled, the O-slot walker would rely on iterating through the O-slots until an object that is an instance of
jdk.incubator.concurrent.ScopedValue$Snapshot is found. If we were to allow inlining of runWith, this slot walking mechanism would be unreliable, such as when there are more than one runWith calls in the same caller, and iterating through the O-slots and relying on instanceof checks could then yield the wrong bindings.