From a976acd6039bafea26fa5b2d3a1b69c508e84013 Mon Sep 17 00:00:00 2001 From: ko1 Date: Mon, 24 Dec 2018 02:02:47 +0000 Subject: remove "deprecated" for rb_frame_method_id_and_class [Bug #15300] * include/ruby/backward.h (rb_frame_method_id_and_class): we had labeled `rb_frame_method_id_and_class()` as deprecated because MRI internal doesn't use it, but we found there are user of this API in external C-extensions. Now we don't have proper alternative API and no time to make alternative API, so I remove "deprecated" label. [Bug #15300] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66522 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- include/ruby/backward.h | 3 --- include/ruby/intern.h | 1 + vm.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/ruby/backward.h b/include/ruby/backward.h index 2483f961c0..262ed2cef1 100644 --- a/include/ruby/backward.h +++ b/include/ruby/backward.h @@ -49,9 +49,6 @@ DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_struct_ptr); DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_generic_ivar_table); NORETURN(ERRORFUNC(("internal function"), VALUE rb_mod_const_missing(VALUE, VALUE))); -/* vm.c */ -DEPRECATED(int rb_frame_method_id_and_class(ID *idp, VALUE *klassp)); - /* from version.c */ #ifndef RUBY_SHOW_COPYRIGHT_TO_DIE # define RUBY_SHOW_COPYRIGHT_TO_DIE 1 diff --git a/include/ruby/intern.h b/include/ruby/intern.h index 7908340397..17aafd7f8e 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -986,6 +986,7 @@ VALUE rb_mod_class_variables(int, const VALUE*, VALUE); VALUE rb_mod_remove_cvar(VALUE, VALUE); ID rb_frame_callee(void); +int rb_frame_method_id_and_class(ID *idp, VALUE *klassp); VALUE rb_str_succ(VALUE); VALUE rb_time_succ(VALUE); VALUE rb_make_backtrace(void); diff --git a/vm.c b/vm.c index d5434697b2..56f815ef48 100644 --- a/vm.c +++ b/vm.c @@ -2167,7 +2167,7 @@ rb_ec_frame_method_id_and_class(const rb_execution_context_t *ec, ID *idp, ID *c return rb_vm_control_frame_id_and_class(ec->cfp, idp, called_idp, klassp); } -RUBY_FUNC_EXPORTED int +int rb_frame_method_id_and_class(ID *idp, VALUE *klassp) { return rb_ec_frame_method_id_and_class(GET_EC(), idp, 0, klassp); -- cgit v1.2.3