* class.c (clone_method): fixed missing assignment introduced by

unak · unak · commit 967f56114a2e · 2015-02-25T08:31:54.000Z
previous commit.

* vm_insnhelper.c (rb_vm_rewrite_cref_stack): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49745 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Feb 25 17:30:10 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* class.c (clone_method): fixed missing assignment introduced by
+	  previous commit.
+
+	* vm_insnhelper.c (rb_vm_rewrite_cref_stack): ditto.
+
 Wed Feb 25 15:07:01 2015  Kazuki Tsujimoto  <kazuki@callcc.net>
 
 	* vm_insnhelper.c (rb_vm_rewrite_cref_stack): copy nd_refinements
diff --git a/class.c b/class.c
@@ -131,6 +131,7 @@ clone_method(VALUE klass, ID mid, const rb_method_entry_t *me)
 	newiseqval = rb_iseq_clone(me->def->body.iseq->self, klass);
 	GetISeqPtr(newiseqval, iseq);
 	rb_vm_rewrite_cref_stack(me->def->body.iseq->cref_stack, me->klass, klass, &new_cref);
+	iseq->cref_stack = new_cref;
 	rb_add_method(klass, mid, VM_METHOD_TYPE_ISEQ, iseq, me->flag);
 	RB_GC_GUARD(newiseqval);
     }
diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2015-02-25"
-#define RUBY_PATCHLEVEL 642
+#define RUBY_PATCHLEVEL 643
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 2
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
@@ -303,6 +303,7 @@ rb_vm_rewrite_cref_stack(NODE *node, VALUE old_klass, VALUE new_klass, NODE **ne
 	if (node->nd_clss == old_klass) {
 	    new_node = NEW_CREF(new_klass);
 	    COPY_CREF_OMOD(new_node, node);
+	    new_node->nd_next = node->nd_next;
 	    *new_cref_ptr = new_node;
 	    return;
 	}

Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,7 @@ clone_method(VALUE klass, ID mid, const rb_method_entry_t *me)`
`131`	`131`	`newiseqval = rb_iseq_clone(me->def->body.iseq->self, klass);`
`132`	`132`	`GetISeqPtr(newiseqval, iseq);`
`133`	`133`	`rb_vm_rewrite_cref_stack(me->def->body.iseq->cref_stack, me->klass, klass, &new_cref);`
	`134`	`+ iseq->cref_stack = new_cref;`
`134`	`135`	`rb_add_method(klass, mid, VM_METHOD_TYPE_ISEQ, iseq, me->flag);`
`135`	`136`	`RB_GC_GUARD(newiseqval);`
`136`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -303,6 +303,7 @@ rb_vm_rewrite_cref_stack(NODE node, VALUE old_klass, VALUE new_klass, NODE *ne`
`303`	`303`	`if (node->nd_clss == old_klass) {`
`304`	`304`	`new_node = NEW_CREF(new_klass);`
`305`	`305`	`COPY_CREF_OMOD(new_node, node);`
	`306`	`+ new_node->nd_next = node->nd_next;`
`306`	`307`	`*new_cref_ptr = new_node;`
`307`	`308`	`return;`
`308`	`309`	`}`