diff options
| -rw-r--r-- | vm_insnhelper.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 64ac539523..7480815d3a 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -940,14 +940,6 @@ vm_getivar(VALUE obj, ID id, IC ic, struct rb_call_cache *cc, int is_attr) if (LIKELY(index < ROBJECT_NUMIV(obj))) { val = ROBJECT_IVPTR(obj)[index]; } - undef_check: - if (UNLIKELY(val == Qundef)) { - if (!is_attr && RTEST(ruby_verbose)) - rb_warning("instance variable %"PRIsVALUE" not initialized", QUOTE_ID(id)); - val = Qnil; - } - RB_DEBUG_COUNTER_INC(ivar_get_ic_hit); - return val; } else { st_data_t index; @@ -967,8 +959,14 @@ vm_getivar(VALUE obj, ID id, IC ic, struct rb_call_cache *cc, int is_attr) } } } - goto undef_check; } + if (UNLIKELY(val == Qundef)) { + if (!is_attr && RTEST(ruby_verbose)) + rb_warning("instance variable %"PRIsVALUE" not initialized", QUOTE_ID(id)); + val = Qnil; + } + RB_DEBUG_COUNTER_INC(ivar_get_ic_hit); + return val; } else { RB_DEBUG_COUNTER_INC(ivar_get_ic_miss_noobject); |