diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | variable.c | 3 | ||||
| -rw-r--r-- | vm_insnhelper.c | 3 |
3 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Mon Oct 20 02:23:27 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * variable.c (rb_ivar_get), vm_insnhelper.c (vm_getivar): improve + instance variable retrieval performance by checking ruby_verbose + before call of rb_warning and evaluation of its argument. + [ruby-core:65786] [Feature #10396] + Sun Oct 19 23:31:29 2014 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> * lib/unicode_normalize.rb: (unicode_normalize!): change method name. diff --git a/variable.c b/variable.c index 3364da5a87..006de230fb 100644 --- a/variable.c +++ b/variable.c @@ -1132,7 +1132,8 @@ rb_ivar_get(VALUE obj, ID id) VALUE iv = rb_ivar_lookup(obj, id, Qundef); if (iv == Qundef) { - rb_warning("instance variable %"PRIsVALUE" not initialized", QUOTE_ID(id)); + if (RTEST(ruby_verbose)) + rb_warning("instance variable %"PRIsVALUE" not initialized", QUOTE_ID(id)); iv = Qnil; } return iv; diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 41c1d0678c..b81001b0ef 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -526,7 +526,8 @@ vm_getivar(VALUE obj, ID id, IC ic, rb_call_info_t *ci, int is_attr) } if (UNLIKELY(val == Qundef)) { - if (!is_attr) rb_warning("instance variable %s not initialized", rb_id2name(id)); + if (!is_attr && RTEST(ruby_verbose)) + rb_warning("instance variable %s not initialized", rb_id2name(id)); val = Qnil; } return val; |