From b18151cf537680862dec24899a3dee469356db57 Mon Sep 17 00:00:00 2001 From: charliesome Date: Thu, 26 Sep 2013 07:39:48 +0000 Subject: * insns.def (opt_regexpmatch1): check Regexp#=~ is not defined before calling rb_reg_match() * test/ruby/test_regexp.rb: add test * vm.c (ruby_vm_redefined_flag): change type to short[] * vm.c (vm_redefinition_check_flag): return REGEXP_REDEFINED_OP_FLAG if klass == rb_cRegexp * vm.c (vm_init_redefined_flag): setup BOP flag for Regexp#=~ * vm_insnhelper.h: add REGEXP_REDEFINED_OP_FLAG [ruby-core:57385] [Bug #8953] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43050 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_insnhelper.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'vm_insnhelper.h') diff --git a/vm_insnhelper.h b/vm_insnhelper.h index 220404cfb5..73e88e5a42 100644 --- a/vm_insnhelper.h +++ b/vm_insnhelper.h @@ -55,11 +55,12 @@ enum { BOP_GE, BOP_NOT, BOP_NEQ, + BOP_MATCH, BOP_LAST_ }; -extern char ruby_vm_redefined_flag[BOP_LAST_]; +extern short ruby_vm_redefined_flag[BOP_LAST_]; extern VALUE ruby_vm_const_missing_count; #if VM_COLLECT_USAGE_DETAILS @@ -237,6 +238,7 @@ enum vm_regan_acttype { #define BIGNUM_REDEFINED_OP_FLAG (1 << 5) #define SYMBOL_REDEFINED_OP_FLAG (1 << 6) #define TIME_REDEFINED_OP_FLAG (1 << 7) +#define REGEXP_REDEFINED_OP_FLAG (1 << 8) #define BASIC_OP_UNREDEFINED_P(op, klass) (LIKELY((ruby_vm_redefined_flag[(op)]&(klass)) == 0)) -- cgit v1.2.3