Imported WebKit commit 356d83016b090995d08ad568f2d2c243aa55e831 (http://svn.webkit.org/repository/webkit/trunk@126147)

New snapshot including various build fixes for newer Qt 5

1 files changed, 11 insertions, 4 deletions

diff --git a/Source/JavaScriptCore/dfg/DFGConstantFoldingPhase.cpp b/Source/JavaScriptCore/dfg/DFGConstantFoldingPhase.cpp
index a8eb9ee5c..68d5534e0 100644
--- a/Source/JavaScriptCore/dfg/DFGConstantFoldingPhase.cpp
+++ b/Source/JavaScriptCore/dfg/DFGConstantFoldingPhase.cpp
@@ -91,7 +91,16 @@ private:
                 break;
             }
                     
-                // FIXME: This would be a great place to remove CheckStructure's.
+            case CheckStructure:
+            case ForwardCheckStructure: {
+                AbstractValue& value = m_state.forNode(node.child1());
+                StructureAbstractValue& structureValue = value.m_futurePossibleStructure;
+                if (structureValue.isSubsetOf(node.structureSet())
+                    && structureValue.hasSingleton()
+                    && isCellSpeculation(value.m_type))
+                    node.convertToStructureTransitionWatchpoint(structureValue.singleton());
+                break;
+            }
                     
             default:
                 break;
@@ -103,9 +112,7 @@ private:
             }
                 
             m_state.execute(indexInBlock);
-            if (!node.shouldGenerate()
-                || m_state.didClobber()
-                || node.hasConstant())
+            if (!node.shouldGenerate() || m_state.didClobber() || node.hasConstant())
                 continue;
             JSValue value = m_state.forNode(nodeIndex).value();
             if (!value)