2 files changed, 17 insertions, 0 deletions

diff --git a/proc.c b/proc.c
index 2df8fbee5e..887fcae384 100644
--- a/proc.c
+++ b/proc.c
@@ -640,6 +640,9 @@ bind_local_variable_defined_p(VALUE bindval, VALUE sym)
     const rb_env_t *env;
 
     if (!lid) return Qfalse;
+    if (rb_numparam_id_p(lid)) {
+        return Qfalse;
+    }
 
     GetBindingPtr(bindval, bind);
     env = VM_ENV_ENVVAL_PTR(vm_block_ep(&bind->block));
diff --git a/test/ruby/test_proc.rb b/test/ruby/test_proc.rb
index 2cd97ca324..d6bd8e724e 100644
--- a/test/ruby/test_proc.rb
+++ b/test/ruby/test_proc.rb
@@ -1659,29 +1659,35 @@ class TestProc < Test::Unit::TestCase
       assert_equal([], binding.local_variables)
       assert_raise(NameError) { binding.local_variable_get(:_9) }
       assert_raise(NameError) { binding.local_variable_set(:_9, 1) }
+      assert_equal(false, binding.local_variable_defined?(:_9))
       "bar".tap do
         assert_equal([], binding.local_variables)
         assert_raise(NameError) { binding.local_variable_get(:_9) }
         assert_raise(NameError) { binding.local_variable_set(:_9, 1) }
+        assert_equal(false, binding.local_variable_defined?(:_9))
       end
       assert_equal([], binding.local_variables)
       assert_raise(NameError) { binding.local_variable_get(:_9) }
       assert_raise(NameError) { binding.local_variable_set(:_9, 1) }
+      assert_equal(false, binding.local_variable_defined?(:_9))
     end
 
     "foo".tap do
       assert_equal([], binding.local_variables)
       assert_raise(NameError) { binding.local_variable_get(:_9) }
       assert_raise(NameError) { binding.local_variable_set(:_9, 1) }
+      assert_equal(false, binding.local_variable_defined?(:_9))
       "bar".tap do
         _9 and flunk
         assert_equal([], binding.local_variables)
         assert_raise(NameError) { binding.local_variable_get(:_9) }
         assert_raise(NameError) { binding.local_variable_set(:_9, 1) }
+        assert_equal(false, binding.local_variable_defined?(:_9))
       end
       assert_equal([], binding.local_variables)
       assert_raise(NameError) { binding.local_variable_get(:_9) }
       assert_raise(NameError) { binding.local_variable_set(:_9, 1) }
+      assert_equal(false, binding.local_variable_defined?(:_9))
     end
   end
 
@@ -1690,31 +1696,39 @@ class TestProc < Test::Unit::TestCase
       it
       assert_equal([], binding.local_variables)
       assert_raise(NameError) { binding.local_variable_get(:it) }
+      assert_equal(false, binding.local_variable_defined?(:it))
       "bar".tap do
         assert_equal([], binding.local_variables)
         assert_raise(NameError) { binding.local_variable_get(:it) }
+        assert_equal(false, binding.local_variable_defined?(:it))
       end
       assert_equal([], binding.local_variables)
       assert_raise(NameError) { binding.local_variable_get(:it) }
+      assert_equal(false, binding.local_variable_defined?(:it))
       "bar".tap do
         it
         assert_equal([], binding.local_variables)
         assert_raise(NameError) { binding.local_variable_get(:it) }
+        assert_equal(false, binding.local_variable_defined?(:it))
       end
       assert_equal([], binding.local_variables)
       assert_raise(NameError) { binding.local_variable_get(:it) }
+      assert_equal(false, binding.local_variable_defined?(:it))
     end
 
     "foo".tap do
       assert_equal([], binding.local_variables)
       assert_raise(NameError) { binding.local_variable_get(:it) }
+      assert_equal(false, binding.local_variable_defined?(:it))
       "bar".tap do
         it
         assert_equal([], binding.local_variables)
         assert_raise(NameError) { binding.local_variable_get(:it) }
+        assert_equal(false, binding.local_variable_defined?(:it))
       end
       assert_equal([], binding.local_variables)
       assert_raise(NameError) { binding.local_variable_get(:it) }
+      assert_equal(false, binding.local_variable_defined?(:it))
     end
   end