From 0e0229f3026c50df1c0ac5b66b4a26b6b8aedb60 Mon Sep 17 00:00:00 2001 From: matz Date: Tue, 13 May 2008 22:53:01 +0000 Subject: * eval.c (rb_call0): defer calling of rb_frame_self() until it become really necessary. * eval.c (rb_call): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16408 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ eval.c | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 48bb852c45..1f7e7bffd6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed May 14 07:49:35 2008 Yukihiro Matsumoto + + * eval.c (rb_call0): defer calling of rb_frame_self() until it + become really necessary. + + * eval.c (rb_call): ditto. + Wed May 14 00:55:56 2008 Yusuke Endoh * test/ruby/test_io_m17n.rb: remove a duplicative method. diff --git a/eval.c b/eval.c index d85fe85ccf..f79854d0e9 100644 --- a/eval.c +++ b/eval.c @@ -1412,7 +1412,10 @@ rb_call0(VALUE klass, VALUE recv, ID mid, int argc, const VALUE *argv, int scope if (TYPE(defined_class) == T_ICLASS) { defined_class = RBASIC(defined_class)->klass; } - + + if (self == Qundef) { + self = rb_frame_self(); + } if (!rb_obj_is_kind_of(self, rb_class_real(defined_class))) { return method_missing(recv, mid, argc, argv, NOEX_PROTECTED); } @@ -1450,7 +1453,7 @@ rb_call0(VALUE klass, VALUE recv, ID mid, int argc, const VALUE *argv, int scope static VALUE rb_call(VALUE klass, VALUE recv, ID mid, int argc, const VALUE *argv, int scope) { - return rb_call0(klass, recv, mid, argc, argv, scope, rb_frame_self()); + return rb_call0(klass, recv, mid, argc, argv, scope, Qundef); } VALUE -- cgit v1.2.3