Changeset 40111 in webkit for trunk/JavaScriptCore/interpreter/Interpreter.cpp

Timestamp:

Jan 21, 2009, 8:28:05 PM (16 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2009-01-21 Gavin Barraclough <​[email protected]>

Reviewed by Oliver Hunt.

Fix for ​https://bugs.webkit.org/show_bug.cgi?id=23469.

We need to check all numbers in integer switches, not just those
represented as integer JSImmediates.

• interpreter/Interpreter.cpp: (JSC::Interpreter::privateExecute): (JSC::Interpreter::cti_op_switch_imm):

LayoutTests:

2009-01-21 Gavin Barraclough <​[email protected]>

Reviewed by Oliver Hunt.

Add layout test for switch (-0).

• fast/js/resources/switch-behaviour.js:
• fast/js/switch-behaviour-expected.txt:

File:

• trunk/JavaScriptCore/interpreter/Interpreter.cpp (modified) (2 diffs)

trunk/JavaScriptCore/interpreter/Interpreter.cpp

@@ -3144 +3144 @@
         if (scrutinee.isInt32Fast())
             vPC += callFrame->codeBlock()->immediateSwitchJumpTable(tableIndex).offsetForValue(scrutinee.getInt32Fast(), defaultOffset);
-        else
-            vPC += defaultOffset;
+        else {
+            int32_t value;
+            if (scrutinee.numberToInt32(value))
+                vPC += callFrame->codeBlock()->immediateSwitchJumpTable(tableIndex).offsetForValue(value, defaultOffset);
+            else
+                vPC += defaultOffset;
+        }
         NEXT_INSTRUCTION();
     }
@@ -5969 +5974 @@
     if (scrutinee.isInt32Fast())
         return codeBlock->immediateSwitchJumpTable(tableIndex).ctiForValue(scrutinee.getInt32Fast());
-
-    return codeBlock->immediateSwitchJumpTable(tableIndex).ctiDefault;
+    else {
+        int32_t value;
+        if (scrutinee.numberToInt32(value))
+            return codeBlock->immediateSwitchJumpTable(tableIndex).ctiForValue(value);
+        else
+            return codeBlock->immediateSwitchJumpTable(tableIndex).ctiDefault;
+    }
 }