Changeset 120556 in webkit for trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp

Timestamp:

Jun 17, 2012, 6:59:18 PM (13 years ago)

Author:

[email protected]

Message:

DFG should attempt to use structure watchpoints for all inlined get_by_id's and put_by_id's
​https://bugs.webkit.org/show_bug.cgi?id=89316

Reviewed by Oliver Hunt.

• dfg/DFGByteCodeParser.cpp:

(JSC::DFG::ByteCodeParser::addStructureTransitionCheck):
(ByteCodeParser):
(JSC::DFG::ByteCodeParser::handleGetById):
(JSC::DFG::ByteCodeParser::parseBlock):

File:

• trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (modified) (7 diffs)

trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp

@@ -751 +751 @@
     }
     
-    void addStructureTransitionCheck(JSCell* object, Structure* structure)
+    NodeIndex addStructureTransitionCheck(JSCell* object, Structure* structure)
     {
         // Add a weak JS constant for the object regardless, since the code should
@@ -759 +759 @@
         if (object->structure() == structure && structure->transitionWatchpointSetIsStillValid()) {
             addToGraph(StructureTransitionWatchpoint, OpInfo(structure), objectIndex);
-            return;
+            return objectIndex;
         }
         
         addToGraph(CheckStructure, OpInfo(m_graph.addStructureSet(structure)), objectIndex);
+        
+        return objectIndex;
+    }
+    
+    NodeIndex addStructureTransitionCheck(JSCell* object)
+    {
+        return addStructureTransitionCheck(object, object->structure());
     }
     
@@ -1592 +1599 @@
             currentObject = asObject(currentStructure->prototypeForLookup(m_inlineStackTop->m_codeBlock));
             currentStructure = getByIdStatus.chain()[i];
-            base = addToGraph(WeakJSConstant, OpInfo(currentObject));
-            addToGraph(CheckStructure, OpInfo(m_graph.addStructureSet(currentStructure)), base);
+            base = addStructureTransitionCheck(currentObject, currentStructure);
         }
         useInlineStorage = currentStructure->isUsingInlineStorage();
@@ -1611 +1617 @@
         ASSERT(getByIdStatus.specificValue().isCell());
         
-        set(destinationOperand,
-            addToGraph(WeakJSConstant, OpInfo(getByIdStatus.specificValue().asCell())));
+        set(destinationOperand, cellConstant(getByIdStatus.specificValue().asCell()));
         return;
     }
@@ -2211 +2216 @@
                 addToGraph(CheckStructure, OpInfo(m_graph.addStructureSet(putByIdStatus.oldStructure())), base);
                 if (!direct) {
-                    if (!putByIdStatus.oldStructure()->storedPrototype().isNull())
-                        addToGraph(
-                            CheckStructure,
-                            OpInfo(m_graph.addStructureSet(putByIdStatus.oldStructure()->storedPrototype().asCell()->structure())),
-                            cellConstant(putByIdStatus.oldStructure()->storedPrototype().asCell()));
+                    if (!putByIdStatus.oldStructure()->storedPrototype().isNull()) {
+                        addStructureTransitionCheck(
+                            putByIdStatus.oldStructure()->storedPrototype().asCell());
+                    }
                     
                     for (WriteBarrier<Structure>* it = putByIdStatus.structureChain()->head(); *it; ++it) {
@@ -2222 +2226 @@
                             continue;
                         ASSERT(prototype.isCell());
-                        addToGraph(
-                            CheckStructure,
-                            OpInfo(m_graph.addStructureSet(prototype.asCell()->structure())),
-                            cellConstant(prototype.asCell()));
+                        addStructureTransitionCheck(prototype.asCell());
                     }
                 }
@@ -2322 +2323 @@
             JSValue specificValue = globalObject->registerAt(entry.getIndex()).get();
             ASSERT(specificValue.isCell());
-            set(currentInstruction[1].u.operand,
-                addToGraph(WeakJSConstant, OpInfo(specificValue.asCell())));
+            set(currentInstruction[1].u.operand, cellConstant(specificValue.asCell()));
             
             NEXT_OPCODE(op_get_global_var_watchable);