marcandre	2015-02-05 04:45:16 +0900 (Thu, 05 Feb 2015)

  New Revision: 49502

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49502

  Log:
    * vm_insnhelper.c: Revert r49500 (6ae6a8c7bc86e97)
      Creates a regression in test_drb. Above my rubyfu. [#10828]

  Modified files:
    trunk/test/ruby/test_symbol.rb
    trunk/vm_insnhelper.c
Index: vm_insnhelper.c
===================================================================
--- vm_insnhelper.c	(revision 49501)
+++ vm_insnhelper.c	(revision 49502)
@@ -1531,17 +1531,16 @@ vm_call_opt_send(rb_thread_t *th, rb_con https://github.com/ruby/ruby/blob/trunk/vm_insnhelper.c#L1531
 	    VALUE exc = make_no_method_exception(rb_eNoMethodError, NULL, ci->recv, rb_long2int(ci->argc), &TOPN(i));
 	    rb_exc_raise(exc);
 	}
-	ci->mid = idMethodMissing;
-	th->method_missing_reason = ci->aux.missing_reason = NOEX_VCALL;
-    } else {
-	/* shift arguments */
-	if (i > 0) {
-	    MEMMOVE(&TOPN(i), &TOPN(i-1), VALUE, i);
-	}
-	ci->argc -= 1;
-	DEC_SP(1);
+	ci->mid = rb_to_id(sym);
+    }
+
+    /* shift arguments */
+    if (i > 0) {
+	MEMMOVE(&TOPN(i), &TOPN(i-1), VALUE, i);
     }
     ci->me = rb_method_entry_without_refinements(CLASS_OF(ci->recv), ci->mid, &ci->defined_class);
+    ci->argc -= 1;
+    DEC_SP(1);
 
     ci->flag = VM_CALL_FCALL | VM_CALL_OPT_SEND;
 
Index: test/ruby/test_symbol.rb
===================================================================
--- test/ruby/test_symbol.rb	(revision 49501)
+++ test/ruby/test_symbol.rb	(revision 49502)
@@ -265,7 +265,7 @@ class TestSymbol < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_symbol.rb#L265
     assert_no_immortal_symbol_created do
       10.times { |i| x.send "send should not leak #{i} - str mm" }
     end
-  end
+  end if false
 
   def test_symbol_send_leak_symbol_custom_method_missing
     x = Object.new
@@ -273,7 +273,7 @@ class TestSymbol < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_symbol.rb#L273
     assert_no_immortal_symbol_created do
       10.times { |i| x.send "send should not leak #{i} - sym mm".to_sym }
     end
-  end
+  end if false
 
   def test_symbol_send_leak_string_no_optimization
     assert_no_immortal_symbol_created do

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/