Make eval(code, binding) use (eval) as __FILE__ and 1 as __LINE__

This removes the warning that was added in
3802fb92ff8c83eed3e867db20f72c53932f542d, and switches the behavior
so that the eval does not use the binding's __FILE__ and __LINE__
implicitly.

Fixes [Bug #4352]

2 files changed, 7 insertions, 4 deletions

diff --git a/test/ruby/test_eval.rb b/test/ruby/test_eval.rb
index 3d6116edbc..b1cb562175 100644
--- a/test/ruby/test_eval.rb
+++ b/test/ruby/test_eval.rb
@@ -470,9 +470,12 @@ class TestEval < Test::Unit::TestCase
   end
 
   def test_eval_location_binding
-    assert_warning(/__FILE__ in eval/) do
-      assert_equal(__FILE__, eval("__FILE__", binding))
-    end
+    assert_equal(['(eval)', 1], eval("[__FILE__, __LINE__]", nil))
+    assert_equal(['(eval)', 1], eval("[__FILE__, __LINE__]", binding))
+    assert_equal(['foo', 1], eval("[__FILE__, __LINE__]", nil, 'foo'))
+    assert_equal(['foo', 1], eval("[__FILE__, __LINE__]", binding, 'foo'))
+    assert_equal(['foo', 2], eval("[__FILE__, __LINE__]", nil, 'foo', 2))
+    assert_equal(['foo', 2], eval("[__FILE__, __LINE__]", binding, 'foo', 2))
   end
 
   def test_fstring_instance_eval
diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb
index bb506f1258..207be5099b 100644
--- a/test/ruby/test_method.rb
+++ b/test/ruby/test_method.rb
@@ -790,7 +790,7 @@ class TestMethod < Test::Unit::TestCase
     assert_instance_of String, __dir__
     assert_equal(File.dirname(File.realpath(__FILE__)), __dir__)
     bug8436 = '[ruby-core:55123] [Bug #8436]'
-    assert_equal(__dir__, eval("__dir__", binding), bug8436)
+    assert_equal(__dir__, eval("__dir__", binding, *binding.source_location), bug8436)
     bug8662 = '[ruby-core:56099] [Bug #8662]'
     assert_equal("arbitrary", eval("__dir__", binding, "arbitrary/file.rb"), bug8662)
     assert_equal("arbitrary", Object.new.instance_eval("__dir__", "arbitrary/file.rb"), bug8662)