Changeset 157964 in webkit

Timestamp:

Oct 24, 2013, 5:06:57 PM (13 years ago)

Author:

Lucas Forschler

Message:

Merge fix for <rdar://problem/15109401>

Location:

branches/safari-537.73-branch/Source/JavaScriptCore/dfg

Files:

• DFGCSEPhase.cpp (modified) (2 diffs)
• DFGFixupPhase.cpp (modified) (1 diff)

branches/safari-537.73-branch/Source/JavaScriptCore/dfg/DFGCSEPhase.cpp

@@ -255 +255 @@
             } 
             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: {
@@ -328 +330 @@
             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;
             }
                 

branches/safari-537.73-branch/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp

@@ -121 +121 @@
             if (node->child1()->shouldSpeculateInteger()) {
                 setUseKindAndUnboxIfProfitable<Int32Use>(node->child1());
+                node->setOpAndDefaultFlags(Identity);
                 break;
             }