[GR-30301] Backports for 21.1

PullRequest: truffleruby/2530

Author: eregon

.gitattributes

@@ -1,7 +1,3 @@
-# Merge options
-
-/CHANGELOG.md merge=union
-
 # Rules for GitHub's Linguist language-classification system. We're abusing the
 # 'vendored' attribute to exclude files as a lot of this isn't really vendored,
 # and a whole lot of actually vendored code isn't listed! What we want to do is

CHANGELOG.md

@@ -22,6 +22,8 @@ Bug fixes:
 * 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).
+* Set errinfo when `rb_protect` captures a Ruby exception (#2245).
+* Fixed handling of multiple optional arguments and keywords when passed a positional `Hash` (#2302).
 
 Compatibility:
 

lib/patches/rubygems/ext/builder.rb

@@ -0,0 +1,19 @@
+require 'rubygems/ext/builder'
+
+# nokogiri 1.11.2 defaults to --disable-static, so this is noop on recent nokogiri.
+# This fixes a compilation issue on older macOS for older nokogiri releases (GR-30240).
+# About 2x faster to build than without --disable-static for older nokogiri releases on macOS.
+# Also gives more flexibility to control what is run natively and on Sulong.
+module Truffle::NokogiriDefaultBuildsArgs
+  def initialize(*args)
+    super
+
+    if @spec.name == 'nokogiri' and @build_args.empty?
+      @build_args = ['--disable-static']
+    end
+  end
+end
+
+class Gem::Ext::Builder
+  prepend Truffle::NokogiriDefaultBuildsArgs
+end

lib/truffle/truffle/cext.rb

@@ -992,6 +992,7 @@ def rb_protect(function, arg, write_status, status)
     unless Primitive.object_equal(nil, e)
       store = (Thread.current[:__stored_exceptions__] ||= [])
       pos = store.push(e).size
+      Primitive.thread_set_exception(extract_ruby_exception(e))
     end
 
     Truffle::Interop.execute_without_conversion(write_status, status, pos)

spec/ruby/language/method_spec.rb

@@ -1758,6 +1758,17 @@ def m(a: nil); a; end
       end
     end
   end
+
+  it "assigns the last Hash to the last optional argument if the Hash contains non-Symbol keys and is not passed as keywords" do
+    def m(a = nil, b = {}, v: false)
+      [a, b, v]
+    end
+
+    h = { "key" => "value" }
+    m(:a, h).should == [:a, h, false]
+    m(:a, h, v: true).should == [:a, h, true]
+    m(v: true).should == [nil, {}, true]
+  end
 end
 
 describe "A method call with a space between method name and parentheses" do

spec/ruby/optional/capi/ext/kernel_spec.c

@@ -191,6 +191,14 @@ static VALUE kernel_spec_rb_protect_yield(VALUE self, VALUE obj, VALUE ary) {
   return res;
 }
 
+static VALUE kernel_spec_rb_protect_errinfo(VALUE self, VALUE obj, VALUE ary) {
+  int status = 0;
+  VALUE res = rb_protect(rb_yield, obj, &status);
+  rb_ary_store(ary, 0, INT2NUM(23));
+  rb_ary_store(ary, 1, res);
+  return rb_errinfo();
+}
+
 static VALUE kernel_spec_rb_protect_null_status(VALUE self, VALUE obj) {
   return rb_protect(rb_yield, obj, NULL);
 }
@@ -345,6 +353,7 @@ void Init_kernel_spec(void) {
   rb_define_method(cls, "rb_rescue", kernel_spec_rb_rescue, 4);
   rb_define_method(cls, "rb_rescue2", kernel_spec_rb_rescue2, -1);
   rb_define_method(cls, "rb_protect_yield", kernel_spec_rb_protect_yield, 2);
+  rb_define_method(cls, "rb_protect_errinfo", kernel_spec_rb_protect_errinfo, 2);
   rb_define_method(cls, "rb_protect_null_status", kernel_spec_rb_protect_null_status, 1);
   rb_define_method(cls, "rb_eval_string_protect", kernel_spec_rb_eval_string_protect, 2);
   rb_define_method(cls, "rb_catch", kernel_spec_rb_catch, 2);

spec/ruby/optional/capi/kernel_spec.rb

@@ -312,6 +312,14 @@
       @s.rb_protect_null_status(42) { |x| x + 1 }.should == 43
       @s.rb_protect_null_status(42) { |x| raise }.should == nil
     end
+
+    it "populates errinfo with the captured exception" do
+      proof = []
+      @s.rb_protect_errinfo(77, proof) { |x| raise NameError }.class.should == NameError
+      proof[0].should == 23
+      proof[1].should == nil
+    end
+
   end
 
   describe "rb_eval_string_protect" do

src/main/java/org/truffleruby/cext/CExtNodes.java

@@ -1185,6 +1185,21 @@ protected Object executeWithProtect(RubyProc block,
         }
     }
 
+    @CoreMethod(names = "extract_ruby_exception", onSingleton = true, required = 1)
+    public abstract static class ExtractRubyException extends CoreMethodArrayArgumentsNode {
+
+        @Specialization
+        protected Object executeThrow(CapturedException captured,
+                @Cached ConditionProfile rubyExceptionProfile) {
+            final Throwable e = captured.getException();
+            if (rubyExceptionProfile.profile(e instanceof RaiseException)) {
+                return ((RaiseException) e).getException();
+            } else {
+                return nil;
+            }
+        }
+    }
+
     @CoreMethod(names = "raise_exception", onSingleton = true, required = 1)
     public abstract static class RaiseExceptionNode extends CoreMethodArrayArgumentsNode {
 

src/main/java/org/truffleruby/parser/LoadArgumentsTranslator.java

@@ -105,7 +105,6 @@ private enum State {
     private int index;
     private int indexFromEnd = 1;
     private State state;
-    private boolean firstOpt = false;
 
     public LoadArgumentsTranslator(
             Node currentNode,
@@ -180,7 +179,6 @@ public RubyNode translate() {
             index = argsNode.getPreCount();
             final int optArgIndex = argsNode.getOptArgIndex();
             for (int i = 0; i < optArgCount; i++) {
-                firstOpt = i == 0;
                 sequence.add(args[optArgIndex + i].accept(this));
                 ++index;
             }
@@ -349,8 +347,7 @@ public RubyNode visitRestArgNode(RestArgParseNode node) {
         if (useArray()) {
             readNode = ArraySliceNodeGen.create(from, to, loadArray(sourceSection));
         } else {
-            boolean considerRejectedKWArgs = considerRejectedKWArgs();
-            readNode = new ReadRestArgumentNode(from, -to, hasKeywordArguments, considerRejectedKWArgs, required);
+            readNode = new ReadRestArgumentNode(from, -to, hasKeywordArguments, considerRejectedKWArgs(), required);
         }
 
         final FrameSlot slot = methodBodyTranslator.getEnvironment().getFrameDescriptor().findFrameSlot(node.getName());
@@ -440,11 +437,10 @@ private RubyNode translateLocalAssignment(SourceIndexLength sourcePosition, Stri
                         minimum += 1;
                     }
 
-                    final boolean considerRejectedKWArgs = firstOpt && considerRejectedKWArgs();
                     readNode = new ReadOptionalArgumentNode(
                             index,
                             minimum,
-                            considerRejectedKWArgs,
+                            considerRejectedKWArgs(),
                             argsNode.hasKwargs(),
                             required,
                             defaultValue);