Fixed status and output when SystemExit is subclassed and raised

Author: bjfish

CHANGELOG.md

@@ -21,6 +21,7 @@ Bug fixes:
 * Fixed parsing of `--jvm` as an application argument (#2108).
 * Fix `rb_rescue2` to ignore the end marker `(VALUE)0` (#2127, #2130).
 * Fix `String#{chomp, chomp!}` issue with invalid encoded strings (#2133).
+* Fix status and output when SystemExit is subclassed and raised (#2128)
 
 Compatibility:
 

spec/ruby/core/exception/system_exit_spec.rb

@@ -0,0 +1,17 @@
+require_relative '../../spec_helper'
+
+describe "SystemExit" do
+  it "sets the exit status and exits silently when raised" do
+    code = 'raise SystemExit.new(7)'
+    result = ruby_exe(code, args: "2>&1")
+    result.should == ""
+    $?.exitstatus.should == 7
+  end
+
+  it "sets the exit status and exits silently when raised when subclassed" do
+    code = 'class CustomExit < SystemExit; end; raise CustomExit.new(8)'
+    result = ruby_exe(code, args: "2>&1")
+    result.should == ""
+    $?.exitstatus.should == 8
+  end
+end

spec/tags/core/exception/system_exit_tags.txt

@@ -0,0 +1,2 @@
+slow:SystemExit sets the exit status and exits silently when raised
+slow:SystemExit sets the exit status and exits silently when raised when subclassed

src/main/java/org/truffleruby/core/kernel/AtExitManager.java

@@ -16,13 +16,13 @@
 
 import org.truffleruby.RubyContext;
 import org.truffleruby.core.exception.RubyException;
-import org.truffleruby.core.klass.RubyClass;
 import org.truffleruby.core.proc.ProcOperations;
 import org.truffleruby.core.proc.RubyProc;
 import org.truffleruby.language.control.ExitException;
 import org.truffleruby.language.control.RaiseException;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import org.truffleruby.language.objects.IsANode;
 
 public class AtExitManager {
 
@@ -83,9 +83,9 @@ public List<RubyProc> getHandlers() {
     }
 
     public static boolean isSilentException(RubyContext context, RubyException rubyException) {
-        final RubyClass logicalClass = rubyException.getLogicalClass();
-        return logicalClass == context.getCoreLibrary().systemExitClass ||
-                logicalClass == context.getCoreLibrary().signalExceptionClass;
+        final IsANode isANode = IsANode.getUncached();
+        return isANode.executeIsA(rubyException, context.getCoreLibrary().systemExitClass) ||
+                isANode.executeIsA(rubyException, context.getCoreLibrary().signalExceptionClass);
     }
 
     private static void handleAtExitException(RubyContext context, RubyException rubyException) {

src/main/java/org/truffleruby/language/exceptions/TopLevelRaiseHandler.java

@@ -20,6 +20,7 @@
 import org.truffleruby.language.dispatch.DispatchNode;
 
 import com.oracle.truffle.api.CompilerDirectives;
+import org.truffleruby.language.objects.IsANodeGen;
 
 public class TopLevelRaiseHandler extends RubyContextNode {
 
@@ -66,7 +67,7 @@ public int execute(Runnable body) {
     }
 
     private int statusFromException(RubyException exception) {
-        if (exception.getLogicalClass() == coreLibrary().systemExitClass) {
+        if (IsANodeGen.getUncached().executeIsA(exception, coreLibrary().systemExitClass)) {
             final Object status = DynamicObjectLibrary.getUncached().getOrDefault(exception, "@status", null);
             return IntegerCastNodeGen.getUncached().executeCastInt(status);
         } else {

src/main/java/org/truffleruby/language/objects/IsANode.java

@@ -28,6 +28,10 @@ public static IsANode create() {
         return IsANodeGen.create();
     }
 
+    public static IsANode getUncached() {
+        return IsANodeGen.getUncached();
+    }
+
     public abstract boolean executeIsA(Object self, RubyModule module);
 
     @Specialization(