Reduce diff to upstream

Author: eregon

lib/mri/drb/drb.rb

@@ -1571,25 +1571,21 @@ def perform
           info = Thread.current['DRb']
           if @block
             @result = Thread.new do
-            begin # TruffleRuby bare ensure
               Thread.current['DRb'] = info
               prev_safe_level = $SAFE
               $SAFE = @safe_level
               perform_with_block
             ensure
               $SAFE = prev_safe_level
-            end
             end.value
           else
             @result = Thread.new do
-            begin # TruffleRuby bare ensure
               Thread.current['DRb'] = info
               prev_safe_level = $SAFE
               $SAFE = @safe_level
               perform_without_block
             ensure
               $SAFE = prev_safe_level
-            end
             end.value
           end
         else

lib/mri/erb.rb

@@ -891,13 +891,11 @@ def run(b=new_toplevel)
   def result(b=new_toplevel)
     if @safe_level
       proc do
-      begin # TruffleRuby for ensure
         prev_safe_level = $SAFE
         $SAFE = @safe_level
         eval(@src, b, (@filename || '(erb)'), @lineno)
       ensure
         $SAFE = prev_safe_level
-      end
       end.call
     else
       eval(@src, b, (@filename || '(erb)'), @lineno)

test/mri/tests/lib/envutil.rb

@@ -12,17 +12,6 @@
 rescue LoadError
 end
 
-class Integer
-  if defined?(::TruffleRuby)
-    FIXNUM_MIN = Truffle::Platform::LONG_MIN
-    FIXNUM_MAX = Truffle::Platform::LONG_MAX
-  else
-    require "rbconfig/sizeof"
-    FIXNUM_MIN = -(1 << (8 * RbConfig::SIZEOF['long'] - 2))
-    FIXNUM_MAX = (1 << (8 * RbConfig::SIZEOF['long'] - 2)) - 1
-  end
-end
-
 module EnvUtil
   def rubybin
     if ruby = ENV["RUBY"]

test/mri/tests/ripper/test_lexer.rb

@@ -95,4 +95,4 @@ def test_slice
     assert_equal "string\#{nil}\n",
       Ripper.slice(%(<<HERE\nstring\#{nil}\nHERE), "heredoc_beg .*? nl $(.*?) heredoc_end", 1)
   end
-end if ripper_test
+end

test/mri/tests/ruby/test_array.rb

@@ -2,6 +2,7 @@
 # frozen_string_literal: false
 require 'test/unit'
 require "delegate"
+require "rbconfig/sizeof"
 
 class TestArray < Test::Unit::TestCase
   def setup
@@ -3050,8 +3051,8 @@ def test_dig
     assert_raise(TypeError) {h.dig(1, 0)}
   end
 
-  FIXNUM_MIN = Integer::FIXNUM_MIN
-  FIXNUM_MAX = Integer::FIXNUM_MAX
+  FIXNUM_MIN = RbConfig::LIMITS['FIXNUM_MIN']
+  FIXNUM_MAX = RbConfig::LIMITS['FIXNUM_MAX']
 
   def assert_typed_equal(e, v, cls, msg=nil)
     assert_kind_of(cls, v, msg)

test/mri/tests/ruby/test_exception.rb

@@ -1150,7 +1150,6 @@ def test_warning_warn_circular_require_backtrace
     warning = nil
     path = nil
     Tempfile.create(%w[circular .rb]) do |t|
-    begin # TruffleRuby extra begin for ensure
       path = File.realpath(t.path)
       basename = File.basename(path)
       t.puts "require '#{basename}'"
@@ -1161,7 +1160,6 @@ def test_warning_warn_circular_require_backtrace
       $LOAD_PATH.pop
       $LOADED_FEATURES.delete(t)
     end
-    end
     assert_equal(1, warning.size)
     assert_match(/circular require/, warning.first)
     assert_match(/^\tfrom #{Regexp.escape(path)}:1:/, warning.first)

test/mri/tests/ruby/test_io.rb

@@ -2542,13 +2542,11 @@ def capture.write(str)
 
     capture.clear
     assert_warning(/[.#]write is outdated/) do
-    begin # TruffleRuby extra begin for ensure
       stdout, $stdout = $stdout, capture
       puts "hey"
     ensure
       $stdout = stdout
     end
-    end
     assert_equal("hey\n", capture)
   end
 

test/mri/tests/ruby/test_require.rb

@@ -110,13 +110,11 @@ def self.ospath_encoding(path)
       nil
     else
       proc do |require_path|
-      begin # TruffleRuby extra begin for ensure
         $SAFE = 1
         require(require_path)
       ensure
         $SAFE = 0
       end
-      end
     end
 
   def prepare_require_path(dir, encoding)

test/mri/tests/rubygems/test_gem_installer.rb

@@ -1554,114 +1554,6 @@ def spec.validate(*args); end
     end
   end
 
-  def test_pre_install_checks_malicious_name_before_eval
-    spec = util_spec "malicious\n::Object.const_set(:FROM_EVAL, true)#", '1'
-    def spec.full_name # so the spec is buildable
-      "malicious-1"
-    end
-    def spec.validate(*args); end
-
-    util_build_gem spec
-
-    gem = File.join(@gemhome, 'cache', spec.file_name)
-
-    use_ui @ui do
-      @installer = Gem::Installer.at gem
-      e = assert_raises Gem::InstallError do
-        @installer.pre_install_checks
-      end
-      assert_equal "#<Gem::Specification name=malicious\n::Object.const_set(:FROM_EVAL, true)# version=1> has an invalid name", e.message
-    end
-    refute defined?(::Object::FROM_EVAL)
-  end
-
-  def test_pre_install_checks_malicious_require_paths_before_eval
-    spec = util_spec "malicious", '1'
-    def spec.full_name # so the spec is buildable
-      "malicious-1"
-    end
-    def spec.validate(*args); end
-    spec.require_paths = ["malicious\n``"]
-
-    util_build_gem spec
-
-    gem = File.join(@gemhome, 'cache', spec.file_name)
-
-    use_ui @ui do
-      @installer = Gem::Installer.at gem
-      e = assert_raises Gem::InstallError do
-        @installer.pre_install_checks
-      end
-      assert_equal "#<Gem::Specification name=malicious version=1> has an invalid require_paths", e.message
-    end
-  end
-
-  def test_pre_install_checks_malicious_extensions_before_eval
-    skip "mswin environment disallow to create file contained the carriage return code." if Gem.win_platform?
-
-    spec = util_spec "malicious", '1'
-    def spec.full_name # so the spec is buildable
-      "malicious-1"
-    end
-    def spec.validate(*args); end
-    spec.extensions = ["malicious\n``"]
-
-    util_build_gem spec
-
-    gem = File.join(@gemhome, 'cache', spec.file_name)
-
-    use_ui @ui do
-      @installer = Gem::Installer.at gem
-      e = assert_raises Gem::InstallError do
-        @installer.pre_install_checks
-      end
-      assert_equal "#<Gem::Specification name=malicious version=1> has an invalid extensions", e.message
-    end
-  end
-
-  def test_pre_install_checks_malicious_specification_version_before_eval
-    spec = util_spec "malicious", '1'
-    def spec.full_name # so the spec is buildable
-      "malicious-1"
-    end
-    def spec.validate(*args); end
-    spec.specification_version = "malicious\n``"
-
-    util_build_gem spec
-
-    gem = File.join(@gemhome, 'cache', spec.file_name)
-
-    use_ui @ui do
-      @installer = Gem::Installer.at gem
-      e = assert_raises Gem::InstallError do
-        @installer.pre_install_checks
-      end
-      assert_equal "#<Gem::Specification name=malicious version=1> has an invalid specification_version", e.message
-    end
-  end
-
-  def test_pre_install_checks_malicious_dependencies_before_eval
-    spec = util_spec "malicious", '1'
-    def spec.full_name # so the spec is buildable
-      "malicious-1"
-    end
-    def spec.validate(*args); end
-    spec.add_dependency "b\nfoo", '> 5'
-
-    util_build_gem spec
-
-    gem = File.join(@gemhome, 'cache', spec.file_name)
-
-    use_ui @ui do
-      @installer = Gem::Installer.at gem
-      @installer.ignore_dependencies = true
-      e = assert_raises Gem::InstallError do
-        @installer.pre_install_checks
-      end
-      assert_equal "#<Gem::Specification name=malicious version=1> has an invalid dependencies", e.message
-    end
-  end
-
   def test_shebang
     util_make_exec @spec, "#!/usr/bin/ruby"