From a870f4fcfdcd4223ec345b3e0e78959835e2b7a0 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 6 May 2015 13:49:57 +0000
Subject: [PATCH] vm_eval.c: undefined refined check_funcall

* vm_eval.c (rb_method_call_status): undefined refined method is
  not callable unless using.  [ruby-core:69064] [Bug #11117]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50430 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                    |  5 +++++
 test/ruby/test_refinement.rb | 17 +++++++++++++++++
 vm_eval.c                    |  3 ++-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d348fe2197..32a7ba678b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May  6 22:49:54 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (rb_method_call_status): undefined refined method is
+	  not callable unless using.  [ruby-core:69064] [Bug #11117]
+
 Sun May  3 22:40:06 2015  Rei Odaira  <Rei.Odaira@gmail.com>
 
 	* ext/-test-/file/fs.c: need to include sys/statvfs.h
diff --git a/test/ruby/test_refinement.rb b/test/ruby/test_refinement.rb
index 70cffa86f4..0a8f6e45cb 100644
--- a/test/ruby/test_refinement.rb
+++ b/test/ruby/test_refinement.rb
@@ -1428,6 +1428,23 @@ class TestRefinement < Test::Unit::TestCase
     INPUT
   end
 
+  def test_check_funcall_undefined
+    bug11117 = '[ruby-core:69064] [Bug #11117]'
+
+    x = Class.new
+    Module.new do
+      refine x do
+        def to_regexp
+          //
+        end
+      end
+    end
+
+    assert_nothing_raised(NoMethodError, bug11117) {
+      assert_nil(Regexp.try_convert(x.new))
+    }
+  end
+
   private
 
   def eval_using(mod, s)
diff --git a/vm_eval.c b/vm_eval.c
index 281dbe77cc..f31a60aa80 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -559,7 +559,8 @@ rb_method_call_status(rb_thread_t *th, const rb_method_entry_t *me, call_type sc
     ID oid;
     int noex;
 
-    if (UNDEFINED_METHOD_ENTRY_P(me)) {
+    if (UNDEFINED_METHOD_ENTRY_P(me) ||
+	UNDEFINED_REFINED_METHOD_P(me->def)) {
 	return scope == CALL_VCALL ? NOEX_VCALL : 0;
     }
     klass = me->klass;