[GR-29304] [GR-30676] Do not check hasPendingSideEffectingActions() in runPendingSafepointActions()

PullRequest: truffleruby/2724

Author: eregon

src/main/java/org/truffleruby/core/exception/ExceptionOperations.java

@@ -89,17 +89,18 @@ private static String messageFieldToString(RubyException exception) {
 
     @TruffleBoundary
     public static String messageToString(RubyException exception) {
+        Object messageObject = null;
         try {
-            final Object messageObject = RubyContext.send(exception, "message");
-
-            final RubyStringLibrary libString = RubyStringLibrary.getUncached();
-            if (libString.isRubyString(messageObject)) {
-                return libString.getJavaString(messageObject);
-            }
+            messageObject = RubyContext.send(exception, "message");
         } catch (Throwable e) {
             // Fall back to the internal message field
         }
-        return messageFieldToString(exception);
+        final RubyStringLibrary libString = RubyStringLibrary.getUncached();
+        if (messageObject != null && libString.isRubyString(messageObject)) {
+            return libString.getJavaString(messageObject);
+        } else {
+            return messageFieldToString(exception);
+        }
     }
 
     public static RubyException createRubyException(RubyContext context, RubyClass rubyClass, Object message,

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

@@ -341,7 +341,7 @@ protected Object handleInterrupt(RubyThread self, RubySymbol timing, RubyProc bl
             try {
                 if (newInterruptMode == InterruptMode.IMMEDIATE) {
                     beforeProfile.enter();
-                    runPendingSafepointActions(safepoint, "before");
+                    runPendingSafepointActions("before");
                 }
 
                 return callBlock(block);
@@ -351,20 +351,17 @@ protected Object handleInterrupt(RubyThread self, RubySymbol timing, RubyProc bl
 
                 if (oldInterruptMode != InterruptMode.NEVER) {
                     afterProfile.enter();
-                    runPendingSafepointActions(safepoint, "after");
+                    runPendingSafepointActions("after");
                 }
             }
         }
 
         @TruffleBoundary
-        private void runPendingSafepointActions(TruffleSafepoint safepoint, String when) {
-            if (safepoint.hasPendingSideEffectingActions()) {
-                if (getContext().getOptions().LOG_PENDING_INTERRUPTS) {
-                    RubyLanguage.LOGGER
-                            .info("Running pending interrupts " + when + " Thread.handle_interrupt");
-                }
-                TruffleSafepoint.pollHere(this);
+        private void runPendingSafepointActions(String when) {
+            if (getContext().getOptions().LOG_PENDING_INTERRUPTS) {
+                RubyLanguage.LOGGER.info("Running pending interrupts " + when + " Thread.handle_interrupt");
             }
+            TruffleSafepoint.pollHere(this);
         }
 
         private InterruptMode symbolToInterruptMode(RubyLanguage language, RubySymbol symbol) {

src/main/java/org/truffleruby/debug/TruffleDebugNodes.java

@@ -103,8 +103,16 @@ public abstract static class DebugPrintNode extends CoreMethodArrayArgumentsNode
 
         @TruffleBoundary
         @Specialization
-        protected Object debugPrint(Object string) {
-            System.err.println(string.toString());
+        protected Object debugPrint(Object string,
+                @CachedLibrary(limit = "2") RubyStringLibrary strings) {
+            final String javaString;
+            if (strings.isRubyString(string)) {
+                javaString = strings.getJavaString(string);
+            } else {
+                javaString = string.toString();
+            }
+
+            System.err.println(javaString);
             return nil;
         }