[GR-18163] Fix rb_rescue2() to stop when seeing the (VALUE)0 argument

PullRequest: truffleruby/2125

Author: eregon

CHANGELOG.md

@@ -41,6 +41,7 @@ Bug fixes:
 * Fixed `SystemStackError` sometimes replaced by an internal Java `NoClassDefFoundError` on JVM (#1743).
 * Fixed constant/identifier detection in lexer for non-ASCII encodings (#2079, #2102, @ivoanjo).
 * Fixed parsing of `--jvm` as an application argument (#2108).
+* Fix `rb_rescue2` to ignore the end marker `(VALUE)0` (#2127, #2130).
 
 Compatibility:
 

spec/ruby/optional/capi/kernel_spec.rb

@@ -396,12 +396,20 @@ def proc_caller
       proc = -> x { x }
       arg_error_proc = -> *_ { raise ArgumentError, '' }
       run_error_proc = -> *_ { raise RuntimeError, '' }
-      type_error_proc = -> *_ { raise TypeError, '' }
+      type_error_proc = -> *_ { raise Exception, 'custom error' }
       @s.rb_rescue2(arg_error_proc, :no_exc, proc, :exc, ArgumentError, RuntimeError).should == :exc
       @s.rb_rescue2(run_error_proc, :no_exc, proc, :exc, ArgumentError, RuntimeError).should == :exc
       -> {
         @s.rb_rescue2(type_error_proc, :no_exc, proc, :exc, ArgumentError, RuntimeError)
-      }.should raise_error(TypeError)
+      }.should raise_error(Exception, 'custom error')
+    end
+
+    ruby_bug "#17305", ""..."2.7" do
+      it "raises TypeError if one of the passed exceptions is not a Module" do
+        -> {
+          @s.rb_rescue2(-> *_ { raise RuntimeError, "foo" }, :no_exc, -> x { x }, :exc, Object.new, 42)
+        }.should raise_error(TypeError, /class or module required/)
+      end
     end
   end
 

src/main/c/cext/exception.c

@@ -85,6 +85,10 @@ VALUE rb_rescue2(VALUE (*b_proc)(ANYARGS), VALUE data1, VALUE (*r_proc)(ANYARGS)
   // arguments using the polyglot api.
   for (;n < total; n++) {
     VALUE arg = polyglot_get_arg(n);
+    if (arg == (VALUE)0) {
+      break;
+    }
+
     rb_ary_push(rescued, arg);
   }
   return cext_rb_rescue2(b_proc, data1, r_proc, data2, rb_tr_unwrap(rescued));