From 9e449748744cbb28ede16ecb3064e3fcb0899022 Mon Sep 17 00:00:00 2001 From: shugo Date: Fri, 30 Nov 2012 02:11:59 +0000 Subject: * revert r37993 to avoid SEGV in tests. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- method.h | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'method.h') diff --git a/method.h b/method.h index 57a409f8a9..a87fc5c1ba 100644 --- a/method.h +++ b/method.h @@ -42,8 +42,7 @@ typedef enum { VM_METHOD_TYPE_NOTIMPLEMENTED, VM_METHOD_TYPE_OPTIMIZED, /* Kernel#send, Proc#call, etc */ VM_METHOD_TYPE_MISSING, /* wrapper for method_missing(id) */ - VM_METHOD_TYPE_CFUNC_FRAMELESS, - VM_METHOD_TYPE_REFINED, + VM_METHOD_TYPE_CFUNC_FRAMELESS } rb_method_type_t; struct rb_call_info_struct; @@ -73,7 +72,6 @@ typedef struct rb_method_definition_struct { OPTIMIZED_METHOD_TYPE_SEND, OPTIMIZED_METHOD_TYPE_CALL } optimize_type; - struct rb_method_definition_struct *orig_def; } body; int alias_count; } rb_method_definition_t; @@ -96,16 +94,9 @@ struct unlinked_method_entry_list_entry { void rb_add_method_cfunc(VALUE klass, ID mid, VALUE (*func)(ANYARGS), int argc, rb_method_flag_t noex); rb_method_entry_t *rb_add_method(VALUE klass, ID mid, rb_method_type_t type, void *option, rb_method_flag_t noex); rb_method_entry_t *rb_method_entry(VALUE klass, ID id, VALUE *define_class_ptr); -void rb_add_refined_method_entry(VALUE refined_class, ID mid); -rb_method_entry_t *rb_resolve_refined_method(VALUE refinements, - rb_method_entry_t *me, - rb_method_entry_t *me_buf, - VALUE *defined_class_ptr); -rb_method_entry_t *rb_method_entry_with_refinements(VALUE klass, ID id, - rb_method_entry_t *me_buf, - VALUE *defined_class_ptr); - -rb_method_entry_t *rb_method_entry_get_without_cache(VALUE klass, ID id, VALUE *define_class_ptr); + +rb_method_entry_t *rb_method_entry_get_with_refinements(VALUE refinements, VALUE klass, ID id, VALUE *define_class_ptr); +rb_method_entry_t *rb_method_entry_get_without_cache(VALUE klass, VALUE refinements, ID id, VALUE *define_class_ptr); rb_method_entry_t *rb_method_entry_set(VALUE klass, ID mid, const rb_method_entry_t *, rb_method_flag_t noex); int rb_method_entry_arity(const rb_method_entry_t *me); -- cgit v1.2.3