k0kubun	2017-12-01 21:26:40 +0900 (Fri, 01 Dec 2017)

  New Revision: 60964

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

  Log:
    vm.c: partially revert r60558
    
    because it was actually used in
    https://github.com/tmm1/rbtrace/blob/v0.4.8/ext/rbtrace.c#L329
    and deprecated in r60579 AFTER removal in r60558.
    
    ko1 agreed that we should keep just deprecated in Ruby 2.5 and remove it
    later, and I'm commiting this because I want to make rbtrace.gem
    installation successful.
    
    backward.h: modify r60579 to make rb_frame_method_id_and_class()
    compilable.

  Modified files:
    trunk/include/ruby/backward.h
    trunk/vm.c
Index: include/ruby/backward.h
===================================================================
--- include/ruby/backward.h	(revision 60963)
+++ include/ruby/backward.h	(revision 60964)
@@ -50,7 +50,7 @@ DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_s https://github.com/ruby/ruby/blob/trunk/include/ruby/backward.h#L50
 DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_generic_ivar_table);
 
 /* vm.c */
-DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_frame_method_id_and_class);
+DEPRECATED(int rb_frame_method_id_and_class(ID *idp, VALUE *klassp));
 
 /* from version.c */
 #ifndef RUBY_SHOW_COPYRIGHT_TO_DIE
Index: vm.c
===================================================================
--- vm.c	(revision 60963)
+++ vm.c	(revision 60964)
@@ -2048,6 +2048,12 @@ rb_ec_frame_method_id_and_class(const rb https://github.com/ruby/ruby/blob/trunk/vm.c#L2048
     return rb_vm_control_frame_id_and_class(ec->cfp, idp, called_idp, klassp);
 }
 
+int
+rb_frame_method_id_and_class(ID *idp, VALUE *klassp)
+{
+    return rb_ec_frame_method_id_and_class(GET_EC(), idp, 0, klassp);
+}
+
 VALUE
 rb_vm_call_cfunc(VALUE recv, VALUE (*func)(VALUE), VALUE arg,
 		 VALUE block_handler, VALUE filename)

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