fix refinements/prepend bug

replaced method entry should be invalidated.
[Bug #17386]

2 files changed, 30 insertions, 1 deletions

diff --git a/class.c b/class.c
index 45c9c6a87f..a76609112f 100644
--- a/class.c
+++ b/class.c
@@ -1110,7 +1110,9 @@ move_refined_method(ID key, VALUE value, void *data)
     struct rb_id_table *tbl = RCLASS_M_TBL(klass);
 
     if (me->def->type == VM_METHOD_TYPE_REFINED) {
-	if (me->def->body.refined.orig_me) {
+        rb_clear_method_cache(klass, me->called_id);
+
+        if (me->def->body.refined.orig_me) {
 	    const rb_method_entry_t *orig_me = me->def->body.refined.orig_me, *new_me;
 	    RB_OBJ_WRITE(me, &me->def->body.refined.orig_me, NULL);
 	    new_me = rb_method_entry_clone(me);
diff --git a/test/ruby/test_refinement.rb b/test/ruby/test_refinement.rb
index 61ad2d92e7..b27a176889 100644
--- a/test/ruby/test_refinement.rb
+++ b/test/ruby/test_refinement.rb
@@ -2446,4 +2446,31 @@ class TestRefinement < Test::Unit::TestCase
   def eval_using(mod, s)
     eval("using #{mod}; #{s}", Sandbox::BINDING)
   end
+
+  # [Bug #17386]
+  def test_prepended_with_method_cache
+    foo = Class.new do
+      def foo
+        :Foo
+      end
+    end
+
+    code = Module.new do
+      def foo
+        :Code
+      end
+    end
+
+    _ext = Module.new do
+      refine foo do
+        def foo; end
+      end
+    end
+
+    obj = foo.new
+
+    assert_equal :Foo, obj.foo
+    foo.prepend code
+    assert_equal :Code, obj.foo
+  end
 end