[GR-18163] Implement Fiber#raise

PullRequest: truffleruby/2620

Author: bjfish

CHANGELOG.md

@@ -21,6 +21,7 @@ Compatibility:
 * Decide the visibility in `Module#define_method` based on `self` and the default definee (#2334).
 * Configure `mandir` value in `RbConfig::CONFIG` and `RbConfig::MAKEFILE_CONFIG` (#2315).
 * TruffleRuby now supports the Truffle polyglot Hash interop API.
+* Implement `Fiber#raise` (#2338).
 
 Performance:
 

spec/tags/core/fiber/raise_tags.txt

@@ -1,26 +1,2 @@
-fails:Fiber#raise aborts execution
-fails:Fiber#raise raises RuntimeError if no exception class is given
-fails:Fiber#raise raises a given Exception instance
-fails:Fiber#raise raises a RuntimeError if string given
-fails:Fiber#raise passes no arguments to the constructor when given only an exception class
-fails:Fiber#raise raises a TypeError when passed a non-Exception object
-fails:Fiber#raise raises a TypeError when passed true
-fails:Fiber#raise raises a TypeError when passed false
-fails:Fiber#raise raises a TypeError when passed nil
 fails:Fiber#raise re-raises a previously rescued exception without overwriting the backtrace
-fails:Fiber#raise allows Exception, message, and backtrace parameters
-fails:Fiber#raise raises RuntimeError by default
 fails:Fiber#raise raises FiberError if Fiber is not born
-fails:Fiber#raise raises FiberError if Fiber is dead
-fails:Fiber#raise accepts error class
-fails:Fiber#raise accepts error message
-fails:Fiber#raise does not accept array of backtrace information only
-fails:Fiber#raise does not accept integer
-fails:Fiber#raise accepts error class with error message
-fails:Fiber#raise accepts error class with with error message and backtrace information
-fails:Fiber#raise does not accept only error message and backtrace information
-fails:Fiber#raise raises a FiberError if invoked from a different Thread
-fails:Fiber#raise kills Fiber
-fails:Fiber#raise raises a FiberError if invoked on a transferring Fiber
-fails:Fiber#raise accepts an exception that implements to_hash
-fails:Fiber#raise allows the message parameter to be a hash

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

@@ -22,6 +22,7 @@
 import org.truffleruby.core.basicobject.BasicObjectNodes.ObjectIDNode;
 import org.truffleruby.core.basicobject.RubyBasicObject;
 import org.truffleruby.core.exception.ExceptionOperations;
+import org.truffleruby.core.exception.RubyException;
 import org.truffleruby.core.klass.RubyClass;
 import org.truffleruby.core.proc.ProcOperations;
 import org.truffleruby.core.thread.RubyThread;
@@ -266,9 +267,13 @@ private Object[] handleMessage(RubyFiber fiber, FiberMessage message) {
         } else if (message instanceof FiberResumeMessage) {
             final FiberResumeMessage resumeMessage = (FiberResumeMessage) message;
             assert context.getThreadManager().getCurrentThread() == resumeMessage.getSendingFiber().rubyThread;
-            if (resumeMessage.getOperation() == FiberOperation.RESUME) {
+            if (resumeMessage.getOperation() == FiberOperation.RESUME ||
+                    resumeMessage.getOperation() == FiberOperation.RAISE) {
                 fiber.lastResumedByFiber = resumeMessage.getSendingFiber();
             }
+            if (resumeMessage.getOperation() == FiberOperation.RAISE) {
+                throw new RaiseException(context, (RubyException) resumeMessage.getArgs()[0]);
+            }
             return resumeMessage.getArgs();
         } else {
             throw CompilerDirectives.shouldNotReachHere();

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

@@ -20,6 +20,7 @@
 import org.truffleruby.core.array.RubyArray;
 import org.truffleruby.core.cast.SingleValueCastNode;
 import org.truffleruby.core.cast.SingleValueCastNodeGen;
+import org.truffleruby.core.exception.RubyException;
 import org.truffleruby.core.fiber.FiberNodesFactory.FiberTransferNodeFactory;
 import org.truffleruby.core.klass.RubyClass;
 import org.truffleruby.core.proc.RubyProc;
@@ -149,13 +150,19 @@ protected Object resume(RubyFiber fiber, Object[] args,
 
     }
 
-    @CoreMethod(names = "resume", rest = true)
-    public abstract static class ResumeNode extends CoreMethodArrayArgumentsNode {
+
+    public abstract static class FiberResumeNode extends CoreMethodArrayArgumentsNode {
+
+        public static FiberResumeNode create() {
+            return FiberNodesFactory.FiberResumeNodeFactory.create(null);
+        }
+
+        public abstract Object executeResume(FiberOperation operation, RubyFiber fiber, Object[] args);
 
         @Child private FiberTransferNode fiberTransferNode = FiberTransferNodeFactory.create(null);
 
         @Specialization
-        protected Object resume(RubyFiber fiber, Object[] args,
+        protected Object resume(FiberOperation operation, RubyFiber fiber, Object[] args,
                 @Cached GetCurrentRubyThreadNode getCurrentRubyThreadNode,
                 @Cached ConditionProfile doubleResumeProfile,
                 @Cached ConditionProfile transferredProfile) {
@@ -178,7 +185,32 @@ protected Object resume(RubyFiber fiber, Object[] args,
             final RubyFiber currentFiber = fiberManager.getCurrentFiber();
 
             return fiberTransferNode
-                    .executeTransferControlTo(currentThread, currentFiber, fiber, FiberOperation.RESUME, args);
+                    .executeTransferControlTo(currentThread, currentFiber, fiber, operation, args);
+        }
+
+    }
+
+
+    @Primitive(name = "fiber_raise")
+    public abstract static class FiberRaiseNode extends PrimitiveArrayArgumentsNode {
+
+        @Child private FiberResumeNode fiberResumeNode = FiberResumeNode.create();
+
+        @Specialization
+        protected Object raise(RubyFiber fiber, RubyException exception) {
+            return fiberResumeNode.executeResume(FiberOperation.RAISE, fiber, new Object[]{ exception });
+        }
+
+    }
+
+    @CoreMethod(names = "resume", rest = true)
+    public abstract static class ResumeNode extends CoreMethodArrayArgumentsNode {
+
+        @Child private FiberResumeNode fiberResumeNode = FiberResumeNode.create();
+
+        @Specialization
+        protected Object resume(RubyFiber fiber, Object[] args) {
+            return fiberResumeNode.executeResume(FiberOperation.RESUME, fiber, args);
         }
 
     }

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

@@ -10,6 +10,7 @@
 package org.truffleruby.core.fiber;
 
 public enum FiberOperation {
+    RAISE,
     RESUME,
     TRANSFER,
     YIELD

src/main/ruby/truffleruby/core/fiber.rb

@@ -9,6 +9,13 @@
 # GNU Lesser General Public License version 2.1.
 
 class Fiber
+
+  def raise(*args)
+    exc = Truffle::ExceptionOperations.make_exception(args)
+    exc = RuntimeError.new('') unless exc
+    Primitive.fiber_raise(self, exc)
+  end
+
   def inspect
     loc = Primitive.fiber_source_location(self)
     status = Primitive.fiber_status(self)