[GR-29828] Fix Kernel#raise argument handling using *args

PullRequest: truffleruby/2497

Author: bjfish

CHANGELOG.md

@@ -21,6 +21,7 @@ Bug fixes:
 * Fix usage of `Thread.handle_interrupt` in `MonitorMixin#mon_synchronize`.
 * Fixed `TruffleRuby.synchronized` to handle guest safepoints (#2277).
 * Fix control flow bug when assigning constants using ||= (#1489).
+* Fix `Kernel#raise` argument handling for hashes (#2298).
 
 Compatibility:
 

spec/ruby/shared/kernel/raise.rb

@@ -12,6 +12,28 @@
     ScratchPad.recorded.should be_nil
   end
 
+  it "accepts an exception that implements to_hash" do
+    custom_error = Class.new(StandardError) do
+      def to_hash
+        {}
+      end
+    end
+    error = custom_error.new
+    -> { @object.raise(error) }.should raise_error(custom_error)
+  end
+
+  it "allows the message parameter to be a hash" do
+    data_error = Class.new(StandardError) do
+      attr_reader :data
+      def initialize(data)
+        @data = data
+      end
+    end
+    -> { @object.raise(data_error, {:data => 42}) }.should raise_error(data_error) do |ex|
+      ex.data.should == {:data => 42}
+    end
+  end
+
   it "raises RuntimeError if no exception class is given" do
     -> { @object.raise }.should raise_error(RuntimeError, "")
   end

spec/tags/core/fiber/raise_tags.txt

@@ -22,3 +22,5 @@ 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/ruby/truffleruby/core/kernel.rb

@@ -688,7 +688,8 @@ def warn(*messages, uplevel: undefined)
   end
   module_function :warn
 
-  def raise(exc = undefined, msg = undefined, ctx = nil, cause: undefined)
+  def raise(*args)
+    exc, msg, ctx, cause = Truffle::KernelOperations.extract_raise_args(args)
     cause_given = !Primitive.undefined?(cause)
     cause = cause_given ? cause : $!
 

src/main/ruby/truffleruby/core/truffle/kernel_operations.rb

@@ -210,6 +210,26 @@ def self.normalize_backtrace_args(omit, length)
       [omit, length]
     end
 
+    def self.extract_raise_args(args)
+      # exc = undefined, msg = undefined, ctx = nil, cause: undefined
+      cause = undefined
+      unless args.empty?
+        last_arg = args.last
+        if Primitive.object_kind_of?(last_arg, Hash) &&
+          last_arg.key?(:cause)
+          cause = last_arg.delete(:cause)
+          args.pop if last_arg.empty?
+        end
+      end
+      Truffle::Type.check_arity(args.size, 0, 3)
+      [
+        args.size >= 1 ? args[0] : undefined,
+        args.size >= 2 ? args[1] : undefined,
+        args[2],
+        cause
+      ]
+    end
+
     KERNEL_FROZEN = Kernel.instance_method(:frozen?)
     private_constant :KERNEL_FROZEN