[GR-14460] Update to Ruby 2.6.2

chrisseaton · chrisseaton · commit ed796f795153 · 2019-03-13T18:34:31.000-07:00
PullRequest: truffleruby/701
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.6.1
+2.6.2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # 1.0 RC 14
 
-Updated to Ruby 2.6.1, with the RubyGems 3.0.3 security patch.
+Updated to Ruby 2.6.2.
 
 Bug fixes:
 
diff --git a/doc/contributor/updating-ruby.md b/doc/contributor/updating-ruby.md
@@ -35,14 +35,14 @@ old patches using the old reference branch.
 
 ```
 tool/import-mri-files.sh
-git diff vNN this-branch | git apply -3
+git diff vNN master | git apply -3
 ```
 
 You'll usually get some conflicts to work out.
 
 ## Make other changes
 
-* Update `versions.json`
+* Update `versions.json` and `.ruby-version`
 * Copy and paste `-h` and `--help` output to `RubyLauncher`
 * Copy and paste the TruffleRuby `--help` output to `doc/user/options.md`
 * Update `doc/user/compatibility.md`
diff --git a/doc/user/compatibility.md b/doc/user/compatibility.md
@@ -1,7 +1,7 @@
 # Compatibility
 
 TruffleRuby aims to be fully compatible with the standard implementation of
-Ruby, MRI, version 2.6.1, revision 66950.
+Ruby, MRI, version 2.6.2, revision 67232.
 
 Any incompatibility with MRI is considered a bug, except for rare cases detailed below.
 If you find an incompatibility with MRI, please [report](https://github.com/oracle/truffleruby/issues) it to us.
diff --git a/lib/mri/bundler/shared_helpers.rb b/lib/mri/bundler/shared_helpers.rb
@@ -340,7 +340,7 @@ def set_rubyopt
 
     def set_rubylib
       rubylib = (ENV["RUBYLIB"] || "").split(File::PATH_SEPARATOR)
-      rubylib.unshift bundler_ruby_lib
+      rubylib.unshift bundler_ruby_lib unless RbConfig::CONFIG["rubylibdir"] == bundler_ruby_lib
       Bundler::SharedHelpers.set_env "RUBYLIB", rubylib.uniq.join(File::PATH_SEPARATOR)
     end
 
diff --git a/lib/mri/fileutils.rb b/lib/mri/fileutils.rb
@@ -695,7 +695,7 @@ def remove_entry_secure(path, force = false)
         f.chown euid, -1
         f.chmod 0700
       }
-    rescue EISDIR # JRuby in non-native mode can't open files as dirs
+    rescue Errno::EISDIR # JRuby in non-native mode can't open files as dirs
       File.lstat(dot_file).tap {|fstat|
         unless fu_stat_identical_entry?(st, fstat)
           # symlink (TOC-to-TOU attack?)
diff --git a/lib/mri/unicode_normalize/tables.rb b/lib/mri/unicode_normalize/tables.rb
diff --git a/test/mri/excludes/OpenSSL/TestEngine.rb b/test/mri/excludes/OpenSSL/TestEngine.rb
@@ -3,3 +3,4 @@
 exclude :test_openssl_engine_by_id_string, "needs investigation"
 exclude :test_openssl_engine_digest_sha1, "needs investigation"
 exclude :test_openssl_engine_id_name_inspect, "needs investigation"
+exclude :test_openssl_engine_cipher_rc4, "needs investigation"
diff --git a/test/mri/excludes/TestBeginEndBlock.rb b/test/mri/excludes/TestBeginEndBlock.rb
@@ -7,3 +7,4 @@
 exclude :test_raise_in_at_exit, "needs investigation"
 exclude :test_rescue_at_exit, "needs investigation"
 exclude :test_callcc_at_exit, "needs investigation"
+exclude :test_internal_errinfo_at_exit, "needs investigation"
diff --git a/test/mri/excludes/TestInteger.rb b/test/mri/excludes/TestInteger.rb
@@ -11,3 +11,4 @@
 exclude :test_square_root, "needs investigation"
 exclude :test_Integer_with_exception_keyword, "needs investigation"
 exclude :test_pow, "needs investigation"
+exclude :test_positive_pow, "needs investigation"
diff --git a/test/mri/excludes/Test_Integer.rb b/test/mri/excludes/Test_Integer.rb
@@ -1 +1,2 @@
 exclude :test_fixnum_range, "needs investigation"
+exclude :test_positive_pow, "needs investigation"
diff --git a/test/mri/tests/cext-c/integer/core_ext.c b/test/mri/tests/cext-c/integer/core_ext.c
@@ -20,10 +20,17 @@ rb_int_to_bignum(VALUE x)
     return x;
 }
 
+static VALUE
+positive_pow(VALUE x, VALUE y)
+{
+    return rb_int_positive_pow(NUM2LONG(x), NUM2ULONG(y));
+}
+
 void
 Init_core_ext(VALUE klass)
 {
     rb_define_method(rb_cInteger, "bignum?", int_bignum_p, 0);
     rb_define_method(rb_cInteger, "fixnum?", int_fixnum_p, 0);
     rb_define_method(rb_cInteger, "to_bignum", rb_int_to_bignum, 0);
+    rb_define_method(rb_cInteger, "positive_pow", positive_pow, 1);
 }
diff --git a/test/mri/tests/cext-ruby/integer/test_integer.rb b/test/mri/tests/cext-ruby/integer/test_integer.rb
@@ -13,4 +13,15 @@ def test_fixnum_range
     assert_fixnum(FIXNUM_MAX)
     assert_bignum(FIXNUM_MAX+1)
   end
+
+  def test_positive_pow
+    assert_separately(%w[-rc/integer], "#{<<~"begin;"}\n#{<<~'end;'}", timeout: 3)
+    begin;
+      assert_equal(1, 1.positive_pow(1))
+      assert_equal(0, 0.positive_pow(1))
+      assert_equal(3, 3.positive_pow(1))
+      assert_equal(-3, -3.positive_pow(1))
+      assert_equal(9, -3.positive_pow(2))
+    end;
+  end
 end
diff --git a/test/mri/tests/cext-ruby/test_scan_args.rb b/test/mri/tests/cext-ruby/test_scan_args.rb
@@ -102,7 +102,7 @@ def test_opt_hash
     assert_equal([0, nil, {b: 1}], Bug::ScanArgs.opt_hash(b: 1))
     assert_equal([1, "a", {b: 1}], Bug::ScanArgs.opt_hash("a", b: 1))
     assert_raise(ArgumentError) {Bug::ScanArgs.opt_hash("a", "b")}
-    assert_raise(ArgumentError) {Bug::ScanArgs.opt_hash("a"=>0, b: 1)}
+    assert_equal([1, {"a"=>0}, {b: 1}], Bug::ScanArgs.opt_hash("a"=>0, b: 1))
   end
 
   def test_lead_opt_hash
@@ -112,15 +112,15 @@ def test_lead_opt_hash
     assert_equal([2, "a", "b", {c: 1}], Bug::ScanArgs.lead_opt_hash("a", "b", c: 1))
     assert_equal([1, {c: 1}, nil, nil], Bug::ScanArgs.lead_opt_hash(c: 1))
     assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_hash("a", "b", "c")}
-    assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_hash("a", "b"=>0, c: 1)}
+    assert_equal([2, "a", {"b"=>0}, {c: 1}], Bug::ScanArgs.lead_opt_hash("a", "b"=>0, c: 1))
   end
 
   def test_var_hash
     assert_equal([0, [], nil], Bug::ScanArgs.var_hash())
     assert_equal([1, ["a"], nil], Bug::ScanArgs.var_hash("a"))
     assert_equal([1, ["a"], {b: 1}], Bug::ScanArgs.var_hash("a", b: 1))
     assert_equal([0, [], {b: 1}], Bug::ScanArgs.var_hash(b: 1))
-    assert_raise(ArgumentError) {Bug::ScanArgs.var_hash("a"=>0, b: 1)}
+    assert_equal([1, [{"a"=>0}], {b: 1}], Bug::ScanArgs.var_hash("a"=>0, b: 1))
   end
 
   def test_lead_var_hash
@@ -131,7 +131,7 @@ def test_lead_var_hash
     assert_equal([1, "a", [], {c: 1}], Bug::ScanArgs.lead_var_hash("a", c: 1))
     assert_equal([1, {c: 1}, [], nil], Bug::ScanArgs.lead_var_hash(c: 1))
     assert_equal([3, "a", ["b", "c"], nil], Bug::ScanArgs.lead_var_hash("a", "b", "c"))
-    assert_raise(ArgumentError) {Bug::ScanArgs.lead_var_hash("a", "b"=>0, c: 1)}
+    assert_equal([2, "a", [{"b"=>0}], {c: 1}], Bug::ScanArgs.lead_var_hash("a", "b"=>0, c: 1))
   end
 
   def test_opt_var_hash
@@ -142,7 +142,7 @@ def test_opt_var_hash
     assert_equal([1, "a", [], {c: 1}], Bug::ScanArgs.opt_var_hash("a", c: 1))
     assert_equal([0, nil, [], {c: 1}], Bug::ScanArgs.opt_var_hash(c: 1))
     assert_equal([3, "a", ["b", "c"], nil], Bug::ScanArgs.opt_var_hash("a", "b", "c"))
-    assert_raise(ArgumentError) {Bug::ScanArgs.opt_var_hash("a", "b"=>0, c: 1)}
+    assert_equal([2, "a", [{"b"=>0}], {c: 1}], Bug::ScanArgs.opt_var_hash("a", "b"=>0, c: 1))
   end
 
   def test_lead_opt_var_hash
@@ -154,7 +154,7 @@ def test_lead_opt_var_hash
     assert_equal([1, {c: 1}, nil, [], nil], Bug::ScanArgs.lead_opt_var_hash(c: 1))
     assert_equal([3, "a", "b", ["c"], nil], Bug::ScanArgs.lead_opt_var_hash("a", "b", "c"))
     assert_equal([3, "a", "b", ["c"], {d: 1}], Bug::ScanArgs.lead_opt_var_hash("a", "b", "c", d: 1))
-    assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_var_hash("a", "b", "c"=>0, d: 1)}
+    assert_equal([3, "a", "b", [{"c"=>0}], {d: 1}], Bug::ScanArgs.lead_opt_var_hash("a", "b", "c"=>0, d: 1))
   end
 
   def test_opt_trail_hash
@@ -165,7 +165,7 @@ def test_opt_trail_hash
     assert_equal([2, "a", "b", {c: 1}], Bug::ScanArgs.opt_trail_hash("a", "b", c: 1))
     assert_equal([1, nil, {c: 1}, nil], Bug::ScanArgs.opt_trail_hash(c: 1))
     assert_raise(ArgumentError) {Bug::ScanArgs.opt_trail_hash("a", "b", "c")}
-    assert_raise(ArgumentError) {Bug::ScanArgs.opt_trail_hash("a", "b"=>0, c: 1)}
+    assert_equal([2, "a", {"b"=>0}, {c: 1}], Bug::ScanArgs.opt_trail_hash("a", "b"=>0, c: 1))
   end
 
   def test_lead_opt_trail_hash
@@ -178,7 +178,7 @@ def test_lead_opt_trail_hash
     assert_equal([3, "a", "b", "c", nil], Bug::ScanArgs.lead_opt_trail_hash("a", "b", "c"))
     assert_equal([3, "a", "b", "c", {c: 1}], Bug::ScanArgs.lead_opt_trail_hash("a", "b", "c", c: 1))
     assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_trail_hash("a", "b", "c", "d")}
-    assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_trail_hash("a", "b", "c"=>0, c: 1)}
+    assert_equal([3, "a", "b", {"c"=>0}, {c: 1}], Bug::ScanArgs.lead_opt_trail_hash("a", "b", "c"=>0, c: 1))
   end
 
   def test_var_trail_hash
@@ -190,7 +190,7 @@ def test_var_trail_hash
     assert_equal([1, [], {c: 1}, nil], Bug::ScanArgs.var_trail_hash(c: 1))
     assert_equal([3, ["a", "b"], "c", nil], Bug::ScanArgs.var_trail_hash("a", "b", "c"))
     assert_equal([3, ["a", "b"], "c", {c: 1}], Bug::ScanArgs.var_trail_hash("a", "b", "c", c: 1))
-    assert_raise(ArgumentError) {Bug::ScanArgs.var_trail_hash("a", "b", "c"=>0, c: 1)}
+    assert_equal([3, ["a", "b"], {"c"=>0}, {c: 1}], Bug::ScanArgs.var_trail_hash("a", "b", "c"=>0, c: 1))
   end
 
   def test_lead_var_trail_hash
@@ -202,7 +202,7 @@ def test_lead_var_trail_hash
     assert_equal([2, "a", [], "b", {c: 1}], Bug::ScanArgs.lead_var_trail_hash("a", "b", c: 1))
     assert_equal([3, "a", ["b"], "c", nil], Bug::ScanArgs.lead_var_trail_hash("a", "b", "c"))
     assert_equal([3, "a", ["b"], "c", {c: 1}], Bug::ScanArgs.lead_var_trail_hash("a", "b", "c", c: 1))
-    assert_raise(ArgumentError) {Bug::ScanArgs.lead_var_trail_hash("a", "b", c: 1, "c"=>0)}
+    assert_equal([3, "a", ["b"], {"c"=>0}, {c: 1}], Bug::ScanArgs.lead_var_trail_hash("a", "b", c: 1, "c"=>0))
   end
 
   def test_opt_var_trail_hash
@@ -214,7 +214,7 @@ def test_opt_var_trail_hash
     assert_equal([2, "a", [], "b", {c: 1}], Bug::ScanArgs.opt_var_trail_hash("a", "b", c: 1))
     assert_equal([3, "a", ["b"], "c", nil], Bug::ScanArgs.opt_var_trail_hash("a", "b", "c"))
     assert_equal([3, "a", ["b"], "c", {c: 1}], Bug::ScanArgs.opt_var_trail_hash("a", "b", "c", c: 1))
-    assert_raise(ArgumentError) {Bug::ScanArgs.opt_var_trail_hash("a", "b", "c"=>0, c: 1)}
+    assert_equal([3, "a", ["b"], {"c"=>0}, {c: 1}], Bug::ScanArgs.opt_var_trail_hash("a", "b", "c"=>0, c: 1))
   end
 
   def test_lead_opt_var_trail_hash
@@ -226,6 +226,6 @@ def test_lead_opt_var_trail_hash
     assert_equal([3, "a", "b", [], "c", nil], Bug::ScanArgs.lead_opt_var_trail_hash("a", "b", "c"))
     assert_equal([3, "a", "b", [], "c", {c: 1}], Bug::ScanArgs.lead_opt_var_trail_hash("a", "b", "c", c: 1))
     assert_equal([4, "a", "b", ["c"], "d", nil], Bug::ScanArgs.lead_opt_var_trail_hash("a", "b", "c", "d"))
-    assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_var_trail_hash("a", "b", "c", "d"=>0, c: 1)}
+    assert_equal([4, "a", "b", ["c"], {"d"=>0}, {c: 1}], Bug::ScanArgs.lead_opt_var_trail_hash("a", "b", "c", "d"=>0, c: 1))
   end
 end
diff --git a/test/mri/tests/fileutils/test_fileutils.rb b/test/mri/tests/fileutils/test_fileutils.rb
@@ -740,6 +740,15 @@ def test_remove_entry_secure
     remove_entry_secure 'tmp/tmpdir/c', true
     assert_file_not_exist 'tmp/tmpdir/a'
     assert_file_not_exist 'tmp/tmpdir/c'
+
+    File.chmod(01777, 'tmp/tmpdir')
+    if File.sticky?('tmp/tmpdir')
+      Dir.mkdir 'tmp/tmpdir/d', 0
+      assert_raise(Errno::EACCES) {remove_entry_secure 'tmp/tmpdir/d'}
+      File.chmod 0777, 'tmp/tmpdir/d'
+      Dir.rmdir 'tmp/tmpdir/d'
+    end
+
     Dir.rmdir 'tmp/tmpdir'
   end
 
diff --git a/test/mri/tests/ripper/test_scanner_events.rb b/test/mri/tests/ripper/test_scanner_events.rb
@@ -886,6 +886,13 @@ def test_ignored_nl
                  scan('ignored_nl', "1;\r\n")
   end
 
+  def test_ignored_sp
+    assert_equal [],
+                 scan('ignored_sp', "<<~EOS\nheredoc\nEOS")
+    assert_equal ["  "],
+                 scan('ignored_sp', "<<~EOS\n  heredoc\nEOS")
+  end
+
   def test___end__
     assert_equal [],
                  scan('__end__', "")
diff --git a/test/mri/tests/ruby/test_beginendblock.rb b/test/mri/tests/ruby/test_beginendblock.rb
@@ -154,4 +154,26 @@ def test_errinfo_at_exit
       end
     end;
   end
+
+  if defined?(fork)
+    def test_internal_errinfo_at_exit
+      # TODO: use other than break-in-fork to throw an internal
+      # error info.
+      error, pid, status = IO.pipe do |r, w|
+        pid = fork do
+          r.close
+          STDERR.reopen(w)
+          at_exit do
+            $!.class
+          end
+          break
+        end
+        w.close
+        [r.read, *Process.wait2(pid)]
+      end
+      assert_not_predicate(status, :success?)
+      assert_not_predicate(status, :signaled?)
+      assert_match(/unexpected break/, error)
+    end
+  end
 end
diff --git a/test/mri/tests/ruby/test_io.rb b/test/mri/tests/ruby/test_io.rb
@@ -233,6 +233,19 @@ def test_gets_chomp_default_rs
       assert_nil r.gets
       r.close
     end)
+
+    (0..3).each do |i|
+      pipe(proc do |w|
+        w.write("a" * ((4096 << i) - 4), "\r\n" "a\r\n")
+        w.close
+      end,
+      proc do |r|
+        r.gets
+        assert_equal "a", r.gets(chomp: true)
+        assert_nil r.gets
+        r.close
+      end)
+    end
   end
 
   def test_gets_chomp_rs_nil
diff --git a/test/mri/tests/ruby/test_m17n.rb b/test/mri/tests/ruby/test_m17n.rb
@@ -269,6 +269,13 @@ def test_utf_without_bom_asciionly
     assert_empty(encs, bug10598)
   end
 
+  def test_utf_without_bom_valid
+    encs = [Encoding::UTF_16, Encoding::UTF_32].find_all {|enc|
+      !(+"abcd").encode!(enc).force_encoding(enc).valid_encoding?
+    }
+    assert_empty(encs)
+  end
+
   def test_object_utf16_32_inspect
     EnvUtil.suppress_warning do
       begin
diff --git a/test/mri/tests/rubygems/test_gem_installer.rb b/test/mri/tests/rubygems/test_gem_installer.rb
diff --git a/versions.json b/versions.json

Original file line number	Diff line number	Diff line change
`@@ -695,7 +695,7 @@ def remove_entry_secure(path, force = false)`
`695`	`695`	`f.chown euid, -1`
`696`	`696`	`f.chmod 0700`
`697`	`697`	`}`
`698`		`- rescue EISDIR # JRuby in non-native mode can't open files as dirs`
	`698`	`+ rescue Errno::EISDIR # JRuby in non-native mode can't open files as dirs`
`699`	`699`	`File.lstat(dot_file).tap {\|fstat\|`
`700`	`700`	`unless fu_stat_identical_entry?(st, fstat)`
`701`	`701`	`# symlink (TOC-to-TOU attack?)`