Kernel#raise must accept extra kwargs for compatibility

Author: eregon

spec/ruby/shared/kernel/raise.rb

@@ -29,11 +29,41 @@ 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}
+
+    -> { @object.raise(data_error, {data: 42}) }.should raise_error(data_error) do |ex|
+      ex.data.should == {data: 42}
+    end
+  end
+
+  # https://bugs.ruby-lang.org/issues/8257#note-36
+  it "allows extra keyword arguments for compatibility" 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 "does not allow message and extra keyword arguments" do
+    data_error = Class.new(StandardError) do
+      attr_reader :data
+      def initialize(data)
+        @data = data
+      end
+    end
+
+    -> { @object.raise(data_error, {a: 1}, b: 2) }.should raise_error(StandardError) do |e|
+      [TypeError, ArgumentError].should.include?(e.class)
+    end
+
+    -> { @object.raise(data_error, {a: 1}, [], b: 2) }.should raise_error(ArgumentError)
+  end
+
   it "raises RuntimeError if no exception class is given" do
     -> { @object.raise }.should raise_error(RuntimeError, "")
   end

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

@@ -670,14 +670,22 @@ def warn(*messages, uplevel: undefined, category: nil)
   end
   module_function :warn
 
-  def raise(exc = undefined, msg = undefined, ctx = nil, cause: undefined)
+  def raise(exc = undefined, msg = undefined, ctx = nil, cause: undefined, **kwargs)
     cause_given = !Primitive.undefined?(cause)
     cause = cause_given ? cause : $!
 
     if Primitive.undefined?(exc) and cause
       raise ArgumentError, 'only cause is given with no arguments' if cause_given
       exc = cause
     else
+      unless kwargs.empty?
+        if Primitive.undefined?(msg)
+          msg = kwargs
+        else
+          raise ArgumentError, 'cannot give both message and extra keyword arguments'
+        end
+      end
+
       exc = Truffle::ExceptionOperations.build_exception_for_raise(exc, msg)
 
       exc.set_backtrace(ctx) if ctx