[GR-35563] Backports for 22.0 batch 2

PullRequest: truffleruby/3108

Author: eregon

CHANGELOG.md

@@ -2,54 +2,55 @@
 
 New features:
 
-* Updated to Ruby 3.0.2 (#2453).
+* Updated to Ruby 3.0.2 (#2453, @eregon).
 
 Bug fixes:
 
-* Fix `File.utime` to use nanoseconds (#2448).
-* Capture the intercepted feature path during patching to reuse during patch require (#2441).
-* Update `Module#constants` to filter invalid constant identifiers (#2452).
-* Fixed `-0.0 <=> 0.0` and `-0.0 <=> 0` to return `0` like on CRuby (#1391).
+* Fix `File.utime` to use nanoseconds (#2448, @bjfish).
+* Capture the intercepted feature path during patching to reuse during patch require (#2441, @bjfish).
+* Update `Module#constants` to filter invalid constant identifiers (#2452, @bjfish).
+* Fixed `-0.0 <=> 0.0` and `-0.0 <=> 0` to return `0` like on CRuby (#1391, @eregon).
 * Fixed `Range#step` to return correct class with begin-less range (@ccocchi, #2516).
 * Fixed exception creation when an `Errno` is sub-classed (@bjfish, #2521).
+* Fixed `String#[]=` to use the negotiated encoding (@bjfish, #2545).
 
 Compatibility:
 
-* Implement `rb_sprintf` in our format compiler to provide consistent formatting across C standard libraries.
-* Update `defined?` to return frozen strings (#2450).
-* Use compensated summation for `{Array,Enumerable}#sum` when floating point values are included.
+* Implement `rb_sprintf` in our format compiler to provide consistent formatting across C standard libraries (@eregon).
+* Update `defined?` to return frozen strings (#2450, @bjfish).
+* Use compensated summation for `{Array,Enumerable}#sum` when floating point values are included (@eregon).
 * `Module#attr_*` methods now return an array of method names (#2498, @gogainda).
 * Fixed `Socket#(local|remote)_address` to retrieve family and type from the file descriptor (#2444, @larskanis).
-* Add `Thread.ignore_deadlock` accessor (#2453).
+* Add `Thread.ignore_deadlock` accessor (#2453, @bjfish).
 * Allow `Hash#transform_keys` to take a hash argument (@ccocchi, #2464).
-* Add `Enumerable#grep{_v}` optimization for `Regexp` (#2453).
-* Update `IO#write` to accept multiple arguments (#2501).
+* Add `Enumerable#grep{_v}` optimization for `Regexp` (#2453, @bjfish).
+* Update `IO#write` to accept multiple arguments (#2501, @bjfish).
 * Do not warn when uninitialized instance variable is accessed (#2502, @andrykonchin).
 * Remove `TRUE`, `FALSE`, and `NIL` constants like CRuby 3.0 (#2505, @andrykonchin).
 * `Symbol#to_proc` now returns a lambda like in Ruby 3 (#2508, @andrykonchin).
 * `Kernel#lambda` now warns if called without a literal block (#2500, @andrykonchin).
 * Implement Hash#except (#2463, @wildmaples).
-* Remove special `$SAFE` global and related C API methods (#2453).
+* Remove special `$SAFE` global and related C API methods (#2453, @bjfish).
 * Assigning to a numbered parameter raises `SyntaxError` (#2506, @andrykonchin).
-* Implement `--backtrace-limit` option (#2453).
-* Update `String` methods to return `String` instances when called on a subclass (#2453).
-* Update `String#encode` to support the `:fallback` option (#1391).
+* Implement `--backtrace-limit` option (#2453, @bjfish).
+* Update `String` methods to return `String` instances when called on a subclass (#2453, @bjfish).
+* Update `String#encode` to support the `:fallback` option (#1391, @aardvark179).
 * `Module#alias_method` now returns the defined alias as a symbol(#2499, @gogainda).
-* Implement `Symbol#name` (#2453).
-* Update `Module#{public, protected, private, public_class_method, private_class_method}` and top-level `private` and `public` methods to accept single array argument with a list of method names (#2453).
-* Constants deprecated by `Module#deprecate_constant` only warn if `Warning[:deprecated]` is `true`.
+* Implement `Symbol#name` (#2453, @bjfish).
+* Update `Module#{public, protected, private, public_class_method, private_class_method}` and top-level `private` and `public` methods to accept single array argument with a list of method names (#2453, @bjfish).
+* Constants deprecated by `Module#deprecate_constant` only warn if `Warning[:deprecated]` is `true` (@eregon).
 * All Array methods now return Array instances and not subclasses (#2510, @Strech).
-* Integer#zero? overrides Numeric#zero? for optimization (#2453).
-* Default `Kernel#eval` source file and line to `(eval):1` like CRuby 3 (#2453).
-* Add `GC.auto_compact` accessors for compatibility (#2453).
+* Integer#zero? overrides Numeric#zero? for optimization (#2453, @bjfish).
+* Default `Kernel#eval` source file and line to `(eval):1` like CRuby 3 (#2453, @aardvark179).
+* Add `GC.auto_compact` accessors for compatibility (#2453, @bjfish).
 * Update accessing a class variable from the top-level scope to be a `RuntimeError` (#2453, @bjfish).
-* Update interpolated strings to not be frozen (#2453).
+* Update interpolated strings to not be frozen (#2453, @bjfish).
 * Add `WERRORFLAG` to `RbConfig` (#2519, @bjfish).
 * Update `MatchData` methods to return `String` instances when called on a subclass (#2453, @bjfish).
-* Implement `Proc#{==,eql?}` (#2453).
+* Implement `Proc#{==,eql?}` (#2453, @bjfish).
 * Implement all `StringScanner` methods (#2520, @eregon).
 * Handle `Kernel#clone(freeze: true)` (#2512, @andrykonchin).
-* Relax `Fiber#transfer` limitations (#2453).
+* Relax `Fiber#transfer` limitations (#2453, @bjfish).
 * Implement `Fiber#blocking?` like CRuby 3 (#2453, @aardvark179).
 * Sort by default for `Dir.{glob,[]}` and add `sort:` keyword argument (#2523, @Strech).
 * Implement `rb_str_locktmp` and `rb_str_unlocktmp` (#2524, @bjfish).
@@ -59,13 +60,16 @@ Compatibility:
 * Add category kwarg to Kernel.warn and Warning.warn (#2533, @Strech).
 * Implement `GC.{measure_total_time, total_time}` and update `GC.stat` to update provided hash (#2535, @bjfish).
 * Implement `Array#slice` with `ArithmeticSequence` (#2526, @ccocchi).
-* Update `Hash#each` to consistently yield a 2-element array (#2453).
+* Update `Hash#each` to consistently yield a 2-element array (#2453, @bjfish).
+* Remove `Hash#{__store__, index}` methods for compatibility (#2546, @bjfish).
+* Implement more correct conversion of array elements by `Array#pack` (#2503, #2504, @aardvark179).
+* Update `String#split` to raise a `RangeError` when `limit` is larger than `int` (@bjfish).
 
 Performance:
 
-* Regexp objects are now interned in a similar way to symbols.
+* Regexp objects are now interned in a similar way to symbols (@aardvark179).
 * Improve performance of regexps using POSIX bracket expressions (e.g., `[[:lower:]]`) matching against ASCII-only strings (#2447, @nirvdrum).
-* `String#sub`, `sub!`, `gsub`, and `gsub!` have been refactored for better performance.
+* `String#sub`, `sub!`, `gsub`, and `gsub!` have been refactored for better performance (@aardvark179).
 * Don't allocate a `MatchData` object when `Regexp#match?` or `String#match?` is used (#2509, @nirvdrum).
 * Add `ENV.except` (#2507, @Strech).
 * Fully inline the `Integer#+` and `Integer#-` logic for interpreter speed (#2518, @smarr).
@@ -75,7 +79,7 @@ Performance:
 
 Changes:
 
-* TruffleRuby now requires Java 11+ and no longer supports Java 8.
+* TruffleRuby now requires Java 11+ and no longer supports Java 8 (@eregon).
 
 # 21.3.0
 

lib/truffle/truffle/openssl-prefix.rb

@@ -27,7 +27,10 @@
 
     if homebrew and prefix = search_homebrew.call(homebrew)
       # found
-    elsif Dir.exist?('/opt/local/include/openssl') # MacPorts
+    elsif Dir.exist?('/opt/local/libexec/openssl11') # MacPorts, prefer OpenSSL 1.1 as known to be compatible
+      prefix = '/opt/local/libexec/openssl11'
+    # MacPorts, try the generic version, too, but might not be compatible
+    elsif Dir.exist?('/opt/local/include/openssl')
       prefix = '/opt/local'
     end
   end

spec/ruby/core/array/pack/a_spec.rb

@@ -12,6 +12,17 @@
   it_behaves_like :array_pack_string, 'A'
   it_behaves_like :array_pack_taint, 'A'
 
+  it "calls #to_str to convert an Object to a String" do
+    obj = mock("pack A string")
+    obj.should_receive(:to_str).and_return("``abcdef")
+    [obj].pack("A*").should == "``abcdef"
+  end
+
+  it "will not implicitly convert a number to a string" do
+    -> { [0].pack('A') }.should raise_error(TypeError)
+    -> { [0].pack('a') }.should raise_error(TypeError)
+  end
+
   it "adds all the bytes to the output when passed the '*' modifier" do
     ["abc"].pack("A*").should == "abc"
   end

spec/ruby/core/array/pack/b_spec.rb

@@ -13,11 +13,16 @@
   it_behaves_like :array_pack_taint, 'B'
 
   it "calls #to_str to convert an Object to a String" do
-    obj = mock("pack H string")
+    obj = mock("pack B string")
     obj.should_receive(:to_str).and_return("``abcdef")
     [obj].pack("B*").should == "\x2a"
   end
 
+  it "will not implicitly convert a number to a string" do
+    -> { [0].pack('B') }.should raise_error(TypeError)
+    -> { [0].pack('b') }.should raise_error(TypeError)
+  end
+
   it "encodes one bit for each character starting with the most significant bit" do
     [ [["0"], "\x00"],
       [["1"], "\x80"]

spec/ruby/core/array/pack/h_spec.rb

@@ -18,6 +18,11 @@
     [obj].pack("H").should == "\xa0"
   end
 
+  it "will not implicitly convert a number to a string" do
+    -> { [0].pack('H') }.should raise_error(TypeError)
+    -> { [0].pack('h') }.should raise_error(TypeError)
+  end
+
   it "encodes the first character as the most significant nibble when passed no count modifier" do
     ["ab"].pack("H").should == "\xa0"
   end

spec/ruby/core/array/pack/shared/float.rb

@@ -53,6 +53,14 @@
   it "encodes a negative Float outside the range of a single precision float" do
     [-1e150].pack(pack_format).should == "\x00\x00\x80\xff"
   end
+
+  it "encodes a bignum as a float" do
+    [2 ** 65].pack(pack_format).should == [(2 ** 65).to_f].pack(pack_format)
+  end
+
+  it "encodes a rational as a float" do
+    [Rational(3, 4)].pack(pack_format).should == [Rational(3, 4).to_f].pack(pack_format)
+  end
 end
 
 describe :array_pack_float_be, shared: true do

spec/ruby/core/array/pack/u_spec.rb

@@ -18,6 +18,16 @@
   it_behaves_like :array_pack_arguments, 'u'
   it_behaves_like :array_pack_taint, 'u'
 
+  it "calls #to_str to convert an Object to a String" do
+    obj = mock("pack u string")
+    obj.should_receive(:to_str).and_return("``abcdef")
+    [obj].pack("u*").should == "(8&!A8F-D968`\n"
+  end
+
+  it "will not implicitly convert a number to a string" do
+    -> { [0].pack('u') }.should raise_error(TypeError)
+  end
+
   it "encodes an empty string as an empty string" do
     [""].pack("u").should == ""
   end

spec/ruby/core/array/pack/z_spec.rb

@@ -12,6 +12,16 @@
   it_behaves_like :array_pack_string, 'Z'
   it_behaves_like :array_pack_taint, 'Z'
 
+  it "calls #to_str to convert an Object to a String" do
+    obj = mock("pack Z string")
+    obj.should_receive(:to_str).and_return("``abcdef")
+    [obj].pack("Z*").should == "``abcdef\x00"
+  end
+
+  it "will not implicitly convert a number to a string" do
+    -> { [0].pack('Z') }.should raise_error(TypeError)
+  end
+
   it "adds all the bytes and appends a NULL byte when passed the '*' modifier" do
     ["abc"].pack("Z*").should == "abc\x00"
   end

spec/ruby/core/module/include_spec.rb

@@ -532,6 +532,27 @@ def self.foo
       B.foo.should == 'n'
     end
   end
+
+  it "overrides a previous super method call" do
+    c1 = Class.new do
+      def foo
+        [:c1]
+      end
+    end
+    c2 = Class.new(c1) do
+      def foo
+        [:c2] + super
+      end
+    end
+    c2.new.foo.should == [:c2, :c1]
+    m = Module.new do
+      def foo
+        [:m1]
+      end
+    end
+    c2.include(m)
+    c2.new.foo.should == [:c2, :m1]
+  end
 end
 
 describe "Module#include?" do

spec/ruby/core/string/element_set_spec.rb

@@ -141,6 +141,12 @@
     str.encoding.should equal(Encoding::BINARY)
   end
 
+  it "updates the string to a compatible encoding" do
+    str = "  "
+    str[1] = [0xB9].pack("C*")
+    str.encoding.should == Encoding::ASCII_8BIT
+  end
+
   it "raises an Encoding::CompatibilityError if the replacement encoding is incompatible" do
     str = "あれ"
     rep = "が".encode Encoding::EUC_JP