ko1	2015-03-11 22:37:15 +0900 (Wed, 11 Mar 2015)

  New Revision: 49939

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

  Log:
    * eval.c (frame_called_id): it should use vm_ifunc type.
    * eval.c (frame_func_id): ditto.

  Modified files:
    trunk/ChangeLog
    trunk/eval.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 49938)
+++ ChangeLog	(revision 49939)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Mar 11 22:36:34 2015  Koichi Sasada  <ko1@a...>
+
+	* eval.c (frame_called_id): it should use vm_ifunc type.
+
+	* eval.c (frame_func_id): ditto.
+
 Wed Mar 11 22:27:05 2015  Koichi Sasada  <ko1@a...>
 
 	* node.h: remove NODE_IFUNC, NEW_IFUNC.
Index: eval.c
===================================================================
--- eval.c	(revision 49938)
+++ eval.c	(revision 49939)
@@ -946,8 +946,8 @@ frame_func_id(rb_control_frame_t *cfp) https://github.com/ruby/ruby/blob/trunk/eval.c#L946
     }
     while (iseq) {
 	if (RUBY_VM_IFUNC_P(iseq)) {
-	    NODE *ifunc = (NODE *)iseq;
-	    if (ifunc->nd_aid) return ifunc->nd_aid;
+	    const struct vm_ifunc *ifunc = (struct vm_ifunc *)iseq;
+	    if (ifunc->id) return ifunc->id;
 	    return idIFUNC;
 	}
 	me_local = method_entry_of_iseq(cfp, iseq);
@@ -976,8 +976,8 @@ frame_called_id(rb_control_frame_t *cfp) https://github.com/ruby/ruby/blob/trunk/eval.c#L976
     }
     while (iseq) {
 	if (RUBY_VM_IFUNC_P(iseq)) {
-	    NODE *ifunc = (NODE *)iseq;
-	    if (ifunc->nd_aid) return ifunc->nd_aid;
+	    const struct vm_ifunc *ifunc = (struct vm_ifunc *)iseq;
+	    if (ifunc->id) return ifunc->id;
 	    return idIFUNC;
 	}
 	me_local = method_entry_of_iseq(cfp, iseq);

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