summaryrefslogtreecommitdiff
path: root/insns.def
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-25 14:46:19 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-25 14:46:19 +0000
commit0a84a18ef486c13ae75d2272e2e3d4a23e4634ce (patch)
treef77b8f140459d678251f08890330b2258a42d692 /insns.def
parent3e26b9514563b477982444d755156e85279e84bc (diff)
merges r24511 from trunk into ruby_1_9_1.
-- * insns.def, vm.c, vm_insnhelper.c, vm_insnhelper.h: check definition of (classes)#=== for case/when optimization. Fix Bug #1376 [ruby-core:23190]. * string.c (Init_String), bignum.c (Init_Bignum), numeric.c (Init_Numeric): define String#===, Symbol#===, Bignum#===, Fixnum#===, Float#=== as same as (classes)#==. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25478 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'insns.def')
-rw-r--r--insns.def19
1 files changed, 15 insertions, 4 deletions
diff --git a/insns.def b/insns.def
index f7716bfe15..48d1275b35 100644
--- a/insns.def
+++ b/insns.def
@@ -1237,10 +1237,7 @@ opt_case_dispatch
(..., VALUE key)
() // inc += -1;
{
- if (0) {
- /* TODO: if some === method is overrided */
- }
- else {
+ if (BASIC_OP_UNREDEFINED_P(BOP_EQQ)) {
VALUE val;
if (st_lookup(RHASH_TBL(hash), key, &val)) {
JUMP(FIX2INT(val));
@@ -1249,6 +1246,20 @@ opt_case_dispatch
JUMP(else_offset);
}
}
+ else {
+ struct opt_case_dispatch_i_arg arg = {
+ key, -1
+ };
+
+ st_foreach(RHASH_TBL(hash), opt_case_dispatch_i, &arg);
+
+ if (arg.label != -1) {
+ JUMP(arg.label);
+ }
+ else {
+ JUMP(else_offset);
+ }
+ }
}
/**