From 0948eb62e68d559e0a42732c896fe9957b8d6b80 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 8 Jan 2018 09:04:07 +0000
Subject: vm.c: respect redefinition of Proc#call

* vm.c (vm_redefinition_check_method_type): hoist out method
  definition type to check redefinition.

* vm.c (rb_vm_check_redefinition_opt_method): should check
  optimized method too.

* vm.c (vm_init_redefined_flag): check Proc#call.

* vm_insnhelper.c (vm_call_opt_block_call): search proper method
  if redefined.  [Bug #14335]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61680 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/ruby/test_proc.rb | 18 ++++++++++++++++++
 vm.c                   | 19 +++++++++++++++----
 vm_insnhelper.c        |  1 +
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/test/ruby/test_proc.rb b/test/ruby/test_proc.rb
index 701bd078ca..69cb0e439b 100644
--- a/test/ruby/test_proc.rb
+++ b/test/ruby/test_proc.rb
@@ -1390,4 +1390,22 @@ class TestProc < Test::Unit::TestCase
       e.each {}
     EOS
   end
+
+  def test_prepended_call
+    assert_in_out_err([], "#{<<~"begin;"}\n#{<<~'end;'}", ["call"])
+    begin;
+      Proc.prepend Module.new {def call() puts "call"; super; end}
+      def m(&blk) blk.call; end
+      m {}
+    end;
+  end
+
+  def test_refined_call
+    assert_in_out_err([], "#{<<~"begin;"}\n#{<<~'end;'}", ["call"])
+    begin;
+      using Module.new {refine(Proc) {def call() puts "call"; super; end}}
+      def m(&blk) blk.call; end
+      m {}
+    end;
+  end
 end
diff --git a/vm.c b/vm.c
index c90e5da472..ae002c4721 100644
--- a/vm.c
+++ b/vm.c
@@ -1500,6 +1500,18 @@ vm_redefinition_check_flag(VALUE klass)
     return 0;
 }
 
+static int
+vm_redefinition_check_method_type(const rb_method_definition_t *def)
+{
+    switch (def->type) {
+      case VM_METHOD_TYPE_CFUNC:
+      case VM_METHOD_TYPE_OPTIMIZED:
+	return TRUE;
+      default:
+	return FALSE;
+    }
+}
+
 static void
 rb_vm_check_redefinition_opt_method(const rb_method_entry_t *me, VALUE klass)
 {
@@ -1507,7 +1519,7 @@ rb_vm_check_redefinition_opt_method(const rb_method_entry_t *me, VALUE klass)
     if (RB_TYPE_P(klass, T_ICLASS) && FL_TEST(klass, RICLASS_IS_ORIGIN)) {
        klass = RBASIC_CLASS(klass);
     }
-    if (me->def->type == VM_METHOD_TYPE_CFUNC) {
+    if (vm_redefinition_check_method_type(me->def)) {
 	if (st_lookup(vm_opt_method_table, (st_data_t)me, &bop)) {
 	    int flag = vm_redefinition_check_flag(klass);
 
@@ -1540,9 +1552,7 @@ add_opt_method(VALUE klass, ID mid, VALUE bop)
 {
     const rb_method_entry_t *me = rb_method_entry_at(klass, mid);
 
-    if (me &&
-	(me->def->type == VM_METHOD_TYPE_CFUNC ||
-	 me->def->type == VM_METHOD_TYPE_OPTIMIZED)) {
+    if (me && vm_redefinition_check_method_type(me->def)) {
 	st_insert(vm_opt_method_table, (st_data_t)me, (st_data_t)bop);
     }
     else {
@@ -1584,6 +1594,7 @@ vm_init_redefined_flag(void)
     OP(UMinus, UMINUS), (C(String));
     OP(Max, MAX), (C(Array));
     OP(Min, MIN), (C(Array));
+    OP(Call, CALL), (C(Proc));
 #undef C
 #undef OP
 }
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 12aa53274c..da861253da 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -2086,6 +2086,7 @@ vm_call_opt_block_call(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp,
     }
     else {
 	calling->recv = rb_vm_bh_to_procval(ec, block_handler);
+	vm_search_method(ci, cc, calling->recv);
 	return vm_call_general(ec, reg_cfp, calling, ci, cc);
     }
 }
-- 
cgit v1.2.3