summaryrefslogtreecommitdiff
path: root/insns.def
diff options
context:
space:
mode:
authorcharliesome <charliesome@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-09-26 07:39:48 +0000
committercharliesome <charliesome@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-09-26 07:39:48 +0000
commitb18151cf537680862dec24899a3dee469356db57 (patch)
tree9c23ae9f0287b3e8ba17b34034e0f6fefead851c /insns.def
parent4190cdddbbe85c3097b30eda2a528cc9482bdfa4 (diff)
* 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
Diffstat (limited to 'insns.def')
-rw-r--r--insns.def6
1 files changed, 5 insertions, 1 deletions
diff --git a/insns.def b/insns.def
index 53e22223cd..a73501f245 100644
--- a/insns.def
+++ b/insns.def
@@ -2080,7 +2080,11 @@ opt_regexpmatch1
(VALUE obj)
(VALUE val)
{
- val = rb_reg_match(r, obj);
+ if (BASIC_OP_UNREDEFINED_P(BOP_MATCH, REGEXP_REDEFINED_OP_FLAG)) {
+ val = rb_reg_match(r, obj);
+ } else {
+ val = rb_funcall(r, idEqTilde, 1, obj);
+ }
}
/**