[GR-37530] [GR-37755] Backports for 22.1 batch 1

PullRequest: truffleruby/3284

Author: eregon

CHANGELOG.md

@@ -20,6 +20,12 @@ Bug fixes:
 * Fix `Random#rand` not returning random floats when given float ranges (#2612, @bjfish).
 * Fix `Array#sample` for `[]` when called without `n` and a `Random` is given (#2612, @bjfish).
 * Fix `Module#const_get` to raise a `NameError` when nested modules do not exist (#2610, @bjfish).
+* Ensure native `VALUE`s returned from C are unwrapped before the objects can be collected (@aardvark179).
+* Fix `Enumerator::Lazy#with_index` to start with new index for multiple enumerations (@bjfish).
+* Fix `rb_id2name` to ensure the native string will have the same lifetime as the id (#2630, @aardvark179).
+* Fix `MatchData#[]` exception when passing a length argument larger than the number of match values (#2636, @nirvdrum).
+* Fix `MatchData#[]` exception when supplying a large negative index along with a length argument (@nirvdrum).
+* Fix `Integer#fdiv` and `Rational#to_f` for large `Integer` values (#2631, @bjfish).
 
 Compatibility:
 
@@ -48,6 +54,8 @@ Compatibility:
 * Update `Dir.foreach` to accept an `encoding` parameter (#2627, @bjfish).
 * Update `IO.readlines` to ignore negative limit parameters (#2625 , @bjfish).
 * Update `Math.sqrt` to raise a `Math::DomainError` for negative numbers (#2621, @bjfish).
+* Update `Enumerable#inject` to raise an `ArgumentError` if no block or symbol are given (#2626, @bjfish).
+* Fix `Marshal.dump` to raise an error when an object has singleton methods (@bjfish).
 
 Performance:
 
@@ -58,7 +66,7 @@ Performance:
 * Reduce memory footprint by tracking `VALUE`s created during C extension init separately (@aardvark179).
 * Rewrote `ArrayEachIteratorNode` to optimize performance for a constant-sized array and reduce specializations to 1 general case (#2587, @MattAlp)
 * Reduce conversion of `VALUE`s to native handle during common operations in C extensions (@aardvark179).
-* Improved performance of regex boolean matches (e.g., `Regexp#match?`) by avoiding match data allocation in TRegex (#2558, @nirvdrum).
+* Improved performance of regex boolean matches (e.g., `Regexp#match?`) by avoiding match data allocation in TRegex (#2588, @nirvdrum).
 * Remove overhead when getting using `RDATA_PTR` (@aardvark179).
 * Additional copy operations have been reduced when performing IO (#2536, @aardvark179).
 

bench/micro/dispatch/dispatch-mono-splat.rb

@@ -1,5 +1,5 @@
 class Callee
-  def call(arg1 = nil, arg2 = nil, arg3 = nil, arg4 = nil)
+  def call(arg1 = nil, arg2 = nil, arg3 = nil)
     :foo
   end
 end

ci.jsonnet

@@ -150,7 +150,7 @@ local part_definitions = {
       environment+: { path+:: ["$NODE/bin"] },
     },
 
-    sqlite331: { packages+: { sqlite: ">=3.31" } },
+    sqlite331: { packages+: { sqlite: "==3.31.0" } },
 
     no_multi_tier: {
       environment+: {
@@ -453,7 +453,8 @@ local part_definitions = {
     micro: { benchmarks+:: ["micro"] },
     other_extra: { benchmarks+:: ["savina"] },
     other: { benchmarks+:: ["image-demo", "optcarrot", "synthetic", "rubykon", "liquid"] },
-    warmup: {
+
+    warmup: $.use.sqlite331 + {
       benchmarks+:: [
         ["--fork-count-file", "mx.truffleruby/warmup-fork-counts.json", "ruby-warmup:*"],
       ],

lib/cext/ABI_check.txt

@@ -1 +1 @@
-6
+7

lib/cext/ABI_version.txt

@@ -1 +1 @@
-22.1.0
+22.1.1

lib/truffle/truffle/cext.rb

@@ -975,14 +975,13 @@ def rb_path_to_class(path)
 
   def rb_proc_new(function, value)
     Proc.new do |*args, &block|
-      Primitive.cext_unwrap(
-          Primitive.call_with_c_mutex_and_frame(function, [
-              Primitive.cext_wrap(args.first), # yieldarg
-              Primitive.cext_wrap(value), # procarg,
-              args.size, # argc
-              Truffle::CExt.RARRAY_PTR(args), # argv
-              Primitive.cext_wrap(block), # blockarg
-          ], Primitive.caller_special_variables_if_available, nil))
+      Primitive.call_with_c_mutex_and_frame_and_unwrap(function, [
+        Primitive.cext_wrap(args.first), # yieldarg
+        Primitive.cext_wrap(value), # procarg,
+        args.size, # argc
+        Truffle::CExt.RARRAY_PTR(args), # argv
+        Primitive.cext_wrap(block), # blockarg
+      ], Primitive.caller_special_variables_if_available, nil)
     end
   end
 
@@ -1062,7 +1061,7 @@ def rb_ivar_lookup(object, name, default_value)
   end
 
   def rb_cvar_defined(cls, id)
-    id_s = id.to_s
+    id_s = id.name
     if id_s.start_with?('@@') || !id_s.start_with?('@')
       cls.class_variable_defined?(id)
     else
@@ -1127,7 +1126,7 @@ def rb_special_const_p(object)
   end
 
   def rb_id2str(sym)
-    sym.to_s
+    sym.name
   end
 
   def rb_const_defined?(mod, name)
@@ -1227,7 +1226,7 @@ def rb_enumeratorize(obj, meth, args)
   def rb_enumeratorize_with_size(obj, meth, args, size_fn)
     return rb_enumeratorize(obj, meth, args) if size_fn.nil?
     enum = obj.to_enum(meth, *args) do
-      Primitive.cext_unwrap(Primitive.call_with_c_mutex_and_frame(size_fn, [Primitive.cext_wrap(obj), Primitive.cext_wrap(args), Primitive.cext_wrap(enum)], Primitive.caller_special_variables_if_available, nil))
+      Primitive.call_with_c_mutex_and_frame_and_unwrap(size_fn, [Primitive.cext_wrap(obj), Primitive.cext_wrap(args), Primitive.cext_wrap(enum)], Primitive.caller_special_variables_if_available, nil)
     end
     enum
   end
@@ -1242,7 +1241,7 @@ def rb_newobj_of(ruby_class)
 
   def rb_define_alloc_func(ruby_class, function)
     ruby_class.singleton_class.define_method(:__allocate__) do
-      Primitive.cext_unwrap(Primitive.call_with_c_mutex_and_frame(function, [Primitive.cext_wrap(self)], Primitive.caller_special_variables_if_available, nil))
+      Primitive.call_with_c_mutex_and_frame_and_unwrap(function, [Primitive.cext_wrap(self)], Primitive.caller_special_variables_if_available, nil)
     end
     class << ruby_class
       private :__allocate__
@@ -1667,13 +1666,13 @@ def rb_thread_call_without_gvl(function, data1, unblock, data2)
   def rb_iterate(iteration, iterated_object, callback, callback_arg)
     block = rb_block_proc
     wrapped_callback = proc do |block_arg|
-      Primitive.cext_unwrap(Primitive.call_with_c_mutex_and_frame(callback, [
+      Primitive.call_with_c_mutex_and_frame_and_unwrap(callback, [
         Primitive.cext_wrap(block_arg),
         Primitive.cext_wrap(callback_arg),
         0, # argc
         nil, # argv
         nil, # blockarg
-      ], Primitive.cext_special_variables_from_stack, block))
+      ], Primitive.cext_special_variables_from_stack, block)
     end
     Primitive.cext_unwrap(
       Primitive.call_with_c_mutex_and_frame(iteration, [Primitive.cext_wrap(iterated_object)], Primitive.cext_special_variables_from_stack, wrapped_callback))
@@ -1761,7 +1760,7 @@ def rb_gv_set(name, value)
   end
 
   def rb_gv_get(name)
-    name = "$#{name}" unless name.to_s.start_with?('$')
+    name = "$#{name}" unless name.start_with?('$')
     if name == '$~'
       rb_backref_get
     else
@@ -1785,7 +1784,7 @@ def rb_define_hooked_variable(name, gvar, getter, setter)
     id = name.to_sym
 
     getter_proc = -> {
-      Primitive.cext_unwrap(Primitive.call_with_c_mutex_and_frame(getter, [Primitive.cext_wrap(id), gvar, Primitive.cext_wrap(nil)], Primitive.caller_special_variables_if_available, nil))
+      Primitive.call_with_c_mutex_and_frame_and_unwrap(getter, [Primitive.cext_wrap(id), gvar, Primitive.cext_wrap(nil)], Primitive.caller_special_variables_if_available, nil)
     }
 
     setter_proc = -> value {
@@ -1910,14 +1909,13 @@ def rb_fiber_current
 
   def rb_fiber_new(function, value)
     Fiber.new do |*args|
-      Primitive.cext_unwrap(
-        Primitive.call_with_c_mutex_and_frame(function, [
-          Primitive.cext_wrap(args.first), # yieldarg
-          nil, # procarg,
-          0, # argc
-          nil, # argv
-          nil, # blockarg
-        ], nil, nil))
+      Primitive.call_with_c_mutex_and_frame_and_unwrap(function, [
+        Primitive.cext_wrap(args.first), # yieldarg
+        nil, # procarg,
+        0, # argc
+        nil, # argv
+        nil, # blockarg
+      ], nil, nil)
     end
   end
 

lib/truffle/truffle/cext_ruby.rb

@@ -38,7 +38,7 @@ def rb_define_method(mod, name, function, argc)
       # We must set block argument if given here so that the
       # `rb_block_*` functions will be able to find it by walking the
       # stack.
-      res = Primitive.cext_unwrap(Primitive.call_with_c_mutex_and_frame(function, args, Primitive.caller_special_variables_if_available, block))
+      res = Primitive.call_with_c_mutex_and_frame_and_unwrap(function, args, Primitive.caller_special_variables_if_available, block)
       Primitive.thread_set_exception(exc)
       res
     end

spec/mspec/lib/mspec/expectations/expectations.rb

@@ -32,4 +32,8 @@ def self.fail_predicate(receiver, predicate, args, block, result, expectation)
     result_to_s = MSpec.format(result)
     raise SpecExpectationNotMetError, "Expected #{receiver_to_s}#{predicate_to_s}#{args_to_s}\n#{expectation} but was #{result_to_s}"
   end
+
+  def self.fail_single_arg_predicate(receiver, predicate, arg, result, expectation)
+    fail_predicate(receiver, predicate, [arg], nil, result, expectation)
+  end
 end

spec/mspec/lib/mspec/matchers/base.rb

@@ -16,15 +16,24 @@ def initialize(actual)
   end
 
   def ==(expected)
-    method_missing(:==, expected)
+    result = @actual == expected
+    unless result
+      ::SpecExpectation.fail_single_arg_predicate(@actual, :==, expected, result, "to be truthy")
+    end
   end
 
   def !=(expected)
-    method_missing(:!=, expected)
+    result = @actual != expected
+    unless result
+      ::SpecExpectation.fail_single_arg_predicate(@actual, :!=, expected, result, "to be truthy")
+    end
   end
 
   def equal?(expected)
-    method_missing(:equal?, expected)
+    result = @actual.equal?(expected)
+    unless result
+      ::SpecExpectation.fail_single_arg_predicate(@actual, :equal?, expected, result, "to be truthy")
+    end
   end
 
   def method_missing(name, *args, &block)
@@ -41,15 +50,24 @@ def initialize(actual)
   end
 
   def ==(expected)
-    method_missing(:==, expected)
+    result = @actual == expected
+    if result
+      ::SpecExpectation.fail_single_arg_predicate(@actual, :==, expected, result, "to be falsy")
+    end
   end
 
   def !=(expected)
-    method_missing(:!=, expected)
+    result = @actual != expected
+    if result
+      ::SpecExpectation.fail_single_arg_predicate(@actual, :!=, expected, result, "to be falsy")
+    end
   end
 
   def equal?(expected)
-    method_missing(:equal?, expected)
+    result = @actual.equal?(expected)
+    if result
+      ::SpecExpectation.fail_single_arg_predicate(@actual, :equal?, expected, result, "to be falsy")
+    end
   end
 
   def method_missing(name, *args, &block)

spec/ruby/core/enumerable/shared/inject.rb

@@ -17,7 +17,8 @@
   end
 
   it "ignores the block if two arguments" do
-    EnumerableSpecs::Numerous.new(1, 2, 3).send(@method, 10, :-){ raise "we never get here"}.should == 4
+    EnumerableSpecs::Numerous.new(1, 2, 3).send(@method, 10, :-) { raise "we never get here"}.should == 4
+    [].send(@method, 3, :+) { raise "we never get here"}.should == 3
   end
 
   it "can take a symbol argument" do
@@ -66,4 +67,11 @@
   it "returns nil when fails(legacy rubycon)" do
     EnumerableSpecs::EachDefiner.new().send(@method) {|acc,x| 999 }.should == nil
   end
+
+  ruby_bug '#18635', ''...'3.2' do
+    it "raises an ArgumentError when no parameters or block is given" do
+      -> { [1,2].send(@method) }.should raise_error(ArgumentError)
+      -> { {one: 1, two: 2}.send(@method) }.should raise_error(ArgumentError)
+    end
+  end
 end