From 8dca87b62db9b94e2aee8bcdf9e8d992357e8373 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 1 Oct 2015 02:57:43 +0000
Subject: vm_args.c: GC guard

* vm_args.c (vm_caller_setup_arg_block): prevent newly created
  ifunc object from GC.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51991 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 insns.def                | 8 +++++---
 test/ruby/test_symbol.rb | 5 +++++
 vm_args.c                | 9 +++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/insns.def b/insns.def
index a923d3a4d6..ad6c4bc747 100644
--- a/insns.def
+++ b/insns.def
@@ -941,10 +941,10 @@ send
 (VALUE val) // inc += - (int)(ci->orig_argc + ((ci->flag & VM_CALL_ARGS_BLOCKARG) ? 1 : 0));
 {
     struct rb_calling_info calling;
-
-    vm_caller_setup_arg_block(th, reg_cfp, &calling, ci, blockiseq, FALSE);
+    VALUE mark = vm_caller_setup_arg_block(th, reg_cfp, &calling, ci, blockiseq, FALSE);
     vm_search_method(ci, cc, calling.recv = TOPN(calling.argc = ci->orig_argc));
     CALL_METHOD(&calling, ci, cc);
+    RB_GC_GUARD(mark);
 }
 
 DEFINE_INSN
@@ -989,13 +989,15 @@ invokesuper
 (...)
 (VALUE val) // inc += - (int)(ci->orig_argc + ((ci->flag & VM_CALL_ARGS_BLOCKARG) ? 1 : 0));
 {
+    VALUE mark;
     struct rb_calling_info calling;
     calling.argc = ci->orig_argc;
 
-    vm_caller_setup_arg_block(th, reg_cfp, &calling, ci, blockiseq, TRUE);
+    mark = vm_caller_setup_arg_block(th, reg_cfp, &calling, ci, blockiseq, TRUE);
     calling.recv = GET_SELF();
     vm_search_super_method(th, GET_CFP(), &calling, ci, cc);
     CALL_METHOD(&calling, ci, cc);
+    RB_GC_GUARD(mark);
 }
 
 /**
diff --git a/test/ruby/test_symbol.rb b/test/ruby/test_symbol.rb
index 7b1dbd3ae7..b62e7538c8 100644
--- a/test/ruby/test_symbol.rb
+++ b/test/ruby/test_symbol.rb
@@ -117,6 +117,11 @@ class TestSymbol < Test::Unit::TestCase
       ary_ids = ary.collect{|x| x.object_id }
       assert_equal ary_ids, ary.collect(&:object_id)
     end
+
+    assert_ruby_status([], <<-"end;", timeout: 0.1)
+      GC.stress = true
+      true.tap(&:itself)
+    end;
   end
 
   def test_call
diff --git a/vm_args.c b/vm_args.c
index 1ed98b5a4c..7211701fb1 100644
--- a/vm_args.c
+++ b/vm_args.c
@@ -766,10 +766,11 @@ vm_caller_setup_arg_kw(rb_control_frame_t *cfp, struct rb_calling_info *calling,
     calling->argc -= kw_len - 1;
 }
 
-static void
+static VALUE
 vm_caller_setup_arg_block(const rb_thread_t *th, rb_control_frame_t *reg_cfp,
 			  struct rb_calling_info *calling, const struct rb_call_info *ci, rb_iseq_t *blockiseq, const int is_super)
 {
+    VALUE mark = 0;
     if (ci->flag & VM_CALL_ARGS_BLOCKARG) {
 	rb_proc_t *po;
 	VALUE proc;
@@ -778,8 +779,10 @@ vm_caller_setup_arg_block(const rb_thread_t *th, rb_control_frame_t *reg_cfp,
 
 	if (SYMBOL_P(proc) && rb_method_basic_definition_p(rb_cSymbol, idTo_proc)) {
 	    calling->blockptr = RUBY_VM_GET_BLOCK_PTR_IN_CFP(reg_cfp);
-	    calling->blockptr->iseq = (rb_iseq_t *)IFUNC_NEW(rb_sym_proc_call, SYM2ID(proc), 0);
+	    blockiseq = (rb_iseq_t *)IFUNC_NEW(rb_sym_proc_call, SYM2ID(proc), 0);
+	    calling->blockptr->iseq = blockiseq;
 	    calling->blockptr->proc = 0;
+	    mark = (VALUE)blockiseq;
 	}
 	else if (!NIL_P(proc)) {
 	    if (!rb_obj_is_proc(proc)) {
@@ -814,6 +817,8 @@ vm_caller_setup_arg_block(const rb_thread_t *th, rb_control_frame_t *reg_cfp,
 	    calling->blockptr = NULL;
 	}
     }
+
+    return mark;
 }
 
 #define IS_ARGS_SPLAT(ci)   ((ci)->flag & VM_CALL_ARGS_SPLAT)
-- 
cgit v1.2.3