Skip to content

[GR-61888] Fix @Uninterruptible. #10621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 4, 2025
Merged

[GR-61888] Fix @Uninterruptible. #10621

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

import static com.oracle.svm.core.graal.nodes.WriteCurrentVMThreadNode.writeCurrentVMThread;

import jdk.graal.compiler.word.Word;
import org.graalvm.nativeimage.CurrentIsolate;
import org.graalvm.nativeimage.ImageSingletons;
import org.graalvm.nativeimage.Isolate;
Expand Down Expand Up @@ -69,6 +68,7 @@
import jdk.graal.compiler.core.common.SuppressFBWarnings;
import jdk.graal.compiler.replacements.ReplacementsUtil;
import jdk.graal.compiler.replacements.nodes.AssertionNode;
import jdk.graal.compiler.word.Word;

/**
* Utility methods for the manipulation and iteration of {@link IsolateThread}s.
Expand Down Expand Up @@ -585,7 +585,7 @@ public boolean verifyIsCurrentThread(IsolateThread thread) {
return OSThreadIdTL.get(thread).equal(osThreadId);
}

@Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
@Uninterruptible(reason = "Locking without transition requires that the whole critical section is uninterruptible.")
@SuppressFBWarnings(value = "UC", justification = "FB does not know that VMMutex objects are replaced, i.e., that the lock/unlock methods do not throw an error at run time.")
public IsolateThread findIsolateThreadForCurrentOSThread(boolean inCrashHandler) {
ThreadLookup threadLookup = ImageSingletons.lookup(ThreadLookup.class);
Expand Down