Prevent backtrace generation for SystemCallError when initializing

bjfish · bjfish · commit 19c0a0c95ab8 · 2019-12-18T09:19:08.000-06:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -41,6 +41,7 @@ Bug fixes:
 * Make `String#concat` work with no or multiple arguments (#1519).
 * Make `Array#concat` work with no or multiple arguments (#1519).
 * Fixed BigDecimal coerce initial argument using `to_str` (#1826).
+* Fixed issue with `SystemCallError.new` setting a backtrace.
 
 Compatibility:
 
diff --git a/spec/ruby/core/exception/system_call_error_spec.rb b/spec/ruby/core/exception/system_call_error_spec.rb
@@ -128,3 +128,9 @@ def initialize
     SystemCallError.new("XXX").message.should =~ /XXX/
   end
 end
+
+describe "SystemCallError#backtrace" do
+  it "is nil if not raised" do
+    SystemCallError.new("message", 42).backtrace.should == nil
+  end
+end
diff --git a/src/main/java/org/truffleruby/cext/CExtNodes.java b/src/main/java/org/truffleruby/cext/CExtNodes.java
@@ -65,6 +65,7 @@
 import org.truffleruby.language.RubyRootNode;
 import org.truffleruby.language.Visibility;
 import org.truffleruby.language.arguments.RubyArguments;
+import org.truffleruby.language.backtrace.Backtrace;
 import org.truffleruby.language.constants.GetConstantNode;
 import org.truffleruby.language.constants.LookupConstantNode;
 import org.truffleruby.language.control.BreakException;
@@ -926,14 +927,16 @@ public abstract static class RbSysErrFail extends CoreMethodArrayArgumentsNode {
 
         @Specialization(guards = "isNil(message)")
         protected Object rbSysErrFailNoMessage(int errno, DynamicObject message) {
-            throw new RaiseException(getContext(), coreExceptions().errnoError(errno, "", this));
+            final Backtrace backtrace = getContext().getCallStack().getBacktrace(this);
+            throw new RaiseException(getContext(), coreExceptions().errnoError(errno, "", backtrace));
         }
 
         @Specialization(guards = "isRubyString(message)")
         protected Object rbSysErrFail(int errno, DynamicObject message) {
+            final Backtrace backtrace = getContext().getCallStack().getBacktrace(this);
             throw new RaiseException(
                     getContext(),
-                    coreExceptions().errnoError(errno, StringOperations.getString(message), this));
+                    coreExceptions().errnoError(errno, StringOperations.getString(message), backtrace));
         }
 
     }
diff --git a/src/main/java/org/truffleruby/core/exception/CoreExceptions.java b/src/main/java/org/truffleruby/core/exception/CoreExceptions.java
@@ -352,27 +352,30 @@ public DynamicObject mathDomainError(String method, Node currentNode) {
                 StringUtils.format("Numerical argument is out of domain - \"%s\"", method),
                 UTF8Encoding.INSTANCE);
         DynamicObject errorMessage = StringOperations.createString(context, rope);
-        return ExceptionOperations.createSystemCallError(
-                context,
-                exceptionClass,
-                errorMessage,
-                currentNode,
-                context.getCoreLibrary().getErrnoValue("EDOM"));
+        final Backtrace backtrace = context.getCallStack().getBacktrace(currentNode);
+        return ExceptionOperations
+                .createSystemCallError(
+                        context,
+                        exceptionClass,
+                        errorMessage,
+                        context.getCoreLibrary().getErrnoValue("EDOM"),
+                        backtrace);
     }
 
     @TruffleBoundary
-    public DynamicObject errnoError(int errno, String extraMessage, Node currentNode) {
+    public DynamicObject errnoError(int errno, String extraMessage, Backtrace backtrace) {
         final String errnoName = context.getCoreLibrary().getErrnoName(errno);
         if (errnoName == null) {
-            return systemCallError(StringUtils.format("Unknown Error (%s)%s", errno, extraMessage), errno, currentNode);
+            return systemCallError(StringUtils.format("Unknown Error (%s)%s", errno, extraMessage), errno, backtrace);
         }
 
         final DynamicObject errnoClass = context.getCoreLibrary().getErrnoClass(errnoName);
         final String fullMessage = ErrnoDescriptions.getDescription(errnoName) + extraMessage;
         final DynamicObject errorMessage = StringOperations
                 .createString(context, StringOperations.encodeRope(fullMessage, UTF8Encoding.INSTANCE));
 
-        return ExceptionOperations.createSystemCallError(context, errnoClass, errorMessage, currentNode, errno);
+        return ExceptionOperations
+                .createSystemCallError(context, errnoClass, errorMessage, errno, backtrace);
     }
 
     // IndexError
@@ -1081,7 +1084,7 @@ public DynamicObject securityError(String message, Node currentNode) {
     // SystemCallError
 
     @TruffleBoundary
-    public DynamicObject systemCallError(String message, int errno, Node currentNode) {
+    public DynamicObject systemCallError(String message, int errno, Backtrace backtrace) {
         DynamicObject exceptionClass = context.getCoreLibrary().getSystemCallErrorClass();
         DynamicObject errorMessage;
         if (message == null) {
@@ -1090,7 +1093,8 @@ public DynamicObject systemCallError(String message, int errno, Node currentNode
             errorMessage = StringOperations
                     .createString(context, StringOperations.encodeRope(message, UTF8Encoding.INSTANCE));
         }
-        return ExceptionOperations.createSystemCallError(context, exceptionClass, errorMessage, currentNode, errno);
+        return ExceptionOperations
+                .createSystemCallError(context, exceptionClass, errorMessage, errno, backtrace);
     }
 
     // FFI::NullPointerError
diff --git a/src/main/java/org/truffleruby/core/exception/ExceptionNodes.java b/src/main/java/org/truffleruby/core/exception/ExceptionNodes.java
@@ -257,7 +257,7 @@ public static abstract class ExceptionErrnoErrorPrimitiveNode extends PrimitiveA
         @TruffleBoundary
         @Specialization
         protected DynamicObject exceptionErrnoError(DynamicObject message, int errno) {
-            return coreExceptions().errnoError(errno, StringOperations.getString(message), this);
+            return coreExceptions().errnoError(errno, StringOperations.getString(message), null);
         }
 
     }
diff --git a/src/main/java/org/truffleruby/core/exception/ExceptionOperations.java b/src/main/java/org/truffleruby/core/exception/ExceptionOperations.java
@@ -69,12 +69,6 @@ public static DynamicObject createRubyException(RubyContext context, DynamicObje
         return createRubyException(context, rubyClass, message, backtrace);
     }
 
-    public static DynamicObject createSystemCallError(RubyContext context, DynamicObject rubyClass, Object message,
-            Node node, int errno) {
-        final Backtrace backtrace = context.getCallStack().getBacktrace(node);
-        return createSystemCallError(context, rubyClass, message, errno, backtrace);
-    }
-
     // because the factory is not constant
     @TruffleBoundary
     public static DynamicObject createRubyException(RubyContext context, DynamicObject rubyClass, Object message,
@@ -88,7 +82,8 @@ public static DynamicObject createRubyException(RubyContext context, DynamicObje
 
     // because the factory is not constant
     @TruffleBoundary
-    private static DynamicObject createSystemCallError(RubyContext context, DynamicObject rubyClass, Object message,
+    public static DynamicObject createSystemCallError(RubyContext context, DynamicObject rubyClass,
+            Object message,
             int errno, Backtrace backtrace) {
         final DynamicObject cause = ThreadGetExceptionNode.getLastException(context);
         context.getCoreExceptions().showExceptionIfDebug(rubyClass, message, backtrace);
diff --git a/src/main/java/org/truffleruby/core/time/RubyDateFormatter.java b/src/main/java/org/truffleruby/core/time/RubyDateFormatter.java
@@ -63,6 +63,7 @@
 import org.truffleruby.core.rope.RopeOperations;
 import org.truffleruby.core.string.StringOperations;
 import org.truffleruby.language.RubyGuards;
+import org.truffleruby.language.backtrace.Backtrace;
 import org.truffleruby.language.control.RaiseException;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -522,12 +523,13 @@ public static RopeBuilder formatToRopeBuilder(List<Token> compiledPattern, Zoned
             try {
                 output = formatter.format(output, value, type);
             } catch (IndexOutOfBoundsException ioobe) {
+                final Backtrace backtrace = context.getCallStack().getBacktrace(currentNode);
                 throw new RaiseException(
                         context,
                         context.getCoreExceptions().errnoError(
                                 context.getCoreLibrary().getErrnoValue("ERANGE"),
                                 "strftime",
-                                currentNode));
+                                backtrace));
             }
 
             // reset formatter

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ public static abstract class ExceptionErrnoErrorPrimitiveNode extends PrimitiveA`
`257`	`257`	`@TruffleBoundary`
`258`	`258`	`@Specialization`
`259`	`259`	`protected DynamicObject exceptionErrnoError(DynamicObject message, int errno) {`
`260`		`- return coreExceptions().errnoError(errno, StringOperations.getString(message), this);`
	`260`	`+ return coreExceptions().errnoError(errno, StringOperations.getString(message), null);`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`}`