[GR-59720] Remove DummyNode, TruffleSafepoint.poll() now accepts null for such cases

PullRequest: truffleruby/4470

Author: eregon

src/main/java/org/truffleruby/builtins/CoreMethodNodeManager.java

@@ -20,7 +20,6 @@
 import org.truffleruby.annotations.CoreModule;
 import org.truffleruby.language.methods.CachedLazyCallTargetSupplier;
 import org.truffleruby.core.CoreLibrary;
-import org.truffleruby.core.DummyNode;
 import org.truffleruby.core.array.ArrayUtils;
 import org.truffleruby.core.inlined.AlwaysInlinedMethodNode;
 import org.truffleruby.core.klass.RubyClass;
@@ -256,7 +255,7 @@ private static void addMethod(
             String[] names,
             Arity arity,
             Visibility visibility) {
-        TruffleSafepoint.poll(DummyNode.INSTANCE);
+        TruffleSafepoint.poll(null);
 
         for (String name : names) {
             final SharedMethodInfo sharedMethodInfo = makeSharedMethodInfo(

src/main/java/org/truffleruby/core/DummyNode.java

@@ -117,9 +117,9 @@ private void createProcessingThread(ReferenceProcessingService<?, ?> service) {
             final String sharingReason = "creating " + THREAD_NAME + " thread for " +
                     service.getClass().getSimpleName();
 
-            threadManager.initialize(newThread, DummyNode.INSTANCE, THREAD_NAME, sharingReason, () -> {
+            threadManager.initialize(newThread, null, THREAD_NAME, sharingReason, () -> {
                 while (true) {
-                    final PhantomProcessingReference<?, ?> reference = threadManager.runUntilResult(DummyNode.INSTANCE,
+                    final PhantomProcessingReference<?, ?> reference = threadManager.runUntilResult(null,
                             () -> (PhantomProcessingReference<?, ?>) processingQueue.remove());
                     reference.service().processReference(context, language, reference);
                 }

src/main/java/org/truffleruby/core/ReferenceProcessingService.java

@@ -309,7 +309,7 @@ boolean watchSignalProc(Object signalString, boolean isRubyDefaultHandler, RubyP
 
             return registerHandler(signalName, signal -> {
                 var rootThread = context.getThreadManager().getRootThread();
-                context.getSafepointManager().pauseRubyThreadAndExecute(DummyNode.INSTANCE,
+                context.getSafepointManager().pauseRubyThreadAndExecute(null,
                         callProcSafepointAction(proc, signal, rootThread));
             }, isRubyDefaultHandler);
         }

src/main/java/org/truffleruby/core/VMPrimitiveNodes.java

@@ -19,7 +19,6 @@
 import com.oracle.truffle.api.TruffleSafepoint;
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
-import org.truffleruby.core.DummyNode;
 import org.truffleruby.core.basicobject.BasicObjectNodes.ObjectIDNode;
 import org.truffleruby.core.exception.ExceptionOperations;
 import org.truffleruby.core.exception.RubyException;
@@ -371,7 +370,7 @@ public void killOtherFibers(RubyThread thread) {
         final TruffleSafepoint safepoint = TruffleSafepoint.getCurrent();
         boolean allowSideEffects = safepoint.setAllowSideEffects(false);
         try {
-            context.getThreadManager().leaveAndEnter(DummyNode.INSTANCE, Interrupter.THREAD_INTERRUPT, (unused) -> {
+            context.getThreadManager().leaveAndEnter(null, Interrupter.THREAD_INTERRUPT, (unused) -> {
                 doKillOtherFibers(thread);
                 return BlockingAction.SUCCESS;
             }, null);

src/main/java/org/truffleruby/core/fiber/FiberManager.java

@@ -32,7 +32,6 @@
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.annotations.SuppressFBWarnings;
 import org.truffleruby.collections.ConcurrentWeakSet;
-import org.truffleruby.core.DummyNode;
 import org.truffleruby.core.InterruptMode;
 import org.truffleruby.core.basicobject.BasicObjectNodes.ObjectIDNode;
 import org.truffleruby.core.exception.RubyException;
@@ -618,7 +617,7 @@ public void killAndWaitOtherThreads() {
         // Wait and join all Java threads we created
         for (Thread thread : rubyManagedThreads) {
             if (thread != Thread.currentThread()) {
-                runUntilResultKeepStatus(DummyNode.INSTANCE, t -> {
+                runUntilResultKeepStatus(null, t -> {
                     t.join();
                     return BlockingAction.SUCCESS;
                 }, thread);
@@ -634,8 +633,7 @@ private void doKillOtherThreads() {
         SafepointPredicate predicate = (context, thread, action) -> Thread.currentThread() != initiatingJavaThread &&
                 language.getCurrentFiber() == thread.getCurrentFiber();
 
-        context.getSafepointManager().pauseAllThreadsAndExecute(
-                DummyNode.INSTANCE,
+        context.getSafepointManager().pauseAllThreadsAndExecute(null,
                 new SafepointAction("kill other threads for shutdown", predicate, true, true) {
                     @Override
                     public void run(RubyThread rubyThread, Node currentNode) {

src/main/java/org/truffleruby/core/thread/ThreadManager.java

@@ -17,7 +17,6 @@
 import org.prism.AbstractNodeVisitor;
 import org.prism.Nodes;
 import org.truffleruby.RubyLanguage;
-import org.truffleruby.core.DummyNode;
 import org.truffleruby.core.array.ArrayUtils;
 import org.truffleruby.core.encoding.RubyEncoding;
 import org.truffleruby.core.encoding.TStringUtils;
@@ -202,7 +201,7 @@ protected final void assignPositionOnly(Nodes.Node[] nodes, RubyNode rubyNode) {
 
     protected final void copyNewlineFlag(Nodes.Node yarpNode, RubyNode rubyNode) {
         if (yarpNode.hasNewLineFlag()) {
-            TruffleSafepoint.poll(DummyNode.INSTANCE);
+            TruffleSafepoint.poll(currentNode);
 
             if (parseEnvironment.isCoverageEnabled()) {
                 rubyNode.unsafeSetIsCoverageLine();

src/main/java/org/truffleruby/parser/YARPBaseTranslator.java

@@ -49,7 +49,6 @@
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.annotations.Split;
 import org.truffleruby.core.CoreLibrary;
-import org.truffleruby.core.DummyNode;
 import org.truffleruby.core.binding.BindingNodes;
 import org.truffleruby.core.binding.SetBindingFrameForEvalNode;
 import org.truffleruby.core.encoding.Encodings;
@@ -343,7 +342,7 @@ private String getMethodName(ParserContext parserContext, MaterializedFrame pare
     public static ParseResult parseToYARPAST(RubySource rubySource, String sourcePath, byte[] sourceBytes,
             List<List<String>> localsInScopes, boolean frozenStringLiteral, Options cliOptions,
             ParserContext parserContext) {
-        TruffleSafepoint.poll(DummyNode.INSTANCE);
+        TruffleSafepoint.poll(null);
 
         final byte[] filepath = sourcePath.getBytes(Encodings.FILESYSTEM_CHARSET);
         int line = rubySource.getLineOffset() + 1;