JavaScriptCore-1218.35.tar.gz

[apple/javascriptcore.git] / dfg / DFGCSEPhase.cpp

diff --git a/dfg/DFGCSEPhase.cpp b/dfg/DFGCSEPhase.cpp
index 47af696a0c7d3debc12e7ad1657032182fd4e32d..0eb29fcafa8ede4d94aa7aac32d0b62f9bb9a94c 100644 (file)
--- a/dfg/DFGCSEPhase.cpp
+++ b/dfg/DFGCSEPhase.cpp
@@ -254,9 +254,11 @@ private:
                 break;
             } 
             case PutScopedVar: {
-                if (node->child2() == registers && node->varNumber() == varNumber)
+                if (node->varNumber() != varNumber)
+                    break;
+                if (node->child2() == registers)
                     return node->child3().node();
-                break;
+                return 0;
             }
             case SetLocal: {
                 VariableAccessData* variableAccessData = node->variableAccessData();
@@ -327,9 +329,11 @@ private:
             Node* node = m_currentBlock->at(i);
             switch (node->op()) {
             case PutScopedVar: {
-                if (node->child1() == scope && node->child2() == registers && node->varNumber() == varNumber)
+                if (node->varNumber() != varNumber)
+                    break;
+                if (node->child1() == scope && node->child2() == registers)
                     return node;
-                break;
+                return 0;
             }
                 
             case GetScopedVar: {