Changeset 153657 in webkit

Timestamp:

Aug 2, 2013, 11:27:51 AM (12 years ago)

Author:

fpizlo@apple.com

Message:

hasIndexingHeader should be a property of the Structure, not just the IndexingType
​https://bugs.webkit.org/show_bug.cgi?id=119422

Reviewed by Oliver Hunt.

This simplifies some code and also allows Structure to claim that an object
has an indexing header even if it doesn't have indexed properties.

I also changed some calls to use hasIndexedProperties() since in some cases,
that's what we actually meant. Currently the two are synonyms.

• dfg/DFGRepatch.cpp:

(JSC::DFG::tryCachePutByID):
(JSC::DFG::tryBuildPutByIdList):

• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::compileAllocatePropertyStorage):
(JSC::DFG::SpeculativeJIT::compileReallocatePropertyStorage):

• runtime/ButterflyInlines.h:

(JSC::Butterfly::create):
(JSC::Butterfly::growPropertyStorage):
(JSC::Butterfly::growArrayRight):
(JSC::Butterfly::resizeArray):

• runtime/IndexingType.h:
• runtime/JSObject.cpp:

(JSC::JSObject::copyButterfly):
(JSC::JSObject::visitButterfly):
(JSC::JSObject::setPrototype):

• runtime/JSObject.h:

(JSC::JSObject::setButterfly):

• runtime/JSPropertyNameIterator.cpp:

(JSC::JSPropertyNameIterator::create):

• runtime/Structure.h:

(JSC::Structure::hasIndexingHeader):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• dfg/DFGRepatch.cpp (modified) (2 diffs)
• dfg/DFGSpeculativeJIT.cpp (modified) (2 diffs)
• runtime/ButterflyInlines.h (modified) (5 diffs)
• runtime/IndexingType.h (modified) (1 diff)
• runtime/JSObject.cpp (modified) (4 diffs)
• runtime/JSObject.h (modified) (1 diff)
• runtime/JSPropertyNameIterator.cpp (modified) (1 diff)
• runtime/Structure.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-08-01  Filip Pizlo  <fpizlo@apple.com>
+
+        hasIndexingHeader should be a property of the Structure, not just the IndexingType
+        https://bugs.webkit.org/show_bug.cgi?id=119422
+
+        Reviewed by Oliver Hunt.
+        
+        This simplifies some code and also allows Structure to claim that an object
+        has an indexing header even if it doesn't have indexed properties.
+        
+        I also changed some calls to use hasIndexedProperties() since in some cases,
+        that's what we actually meant. Currently the two are synonyms.
+
+        * dfg/DFGRepatch.cpp:
+        (JSC::DFG::tryCachePutByID):
+        (JSC::DFG::tryBuildPutByIdList):
+        * dfg/DFGSpeculativeJIT.cpp:
+        (JSC::DFG::SpeculativeJIT::compileAllocatePropertyStorage):
+        (JSC::DFG::SpeculativeJIT::compileReallocatePropertyStorage):
+        * runtime/ButterflyInlines.h:
+        (JSC::Butterfly::create):
+        (JSC::Butterfly::growPropertyStorage):
+        (JSC::Butterfly::growArrayRight):
+        (JSC::Butterfly::resizeArray):
+        * runtime/IndexingType.h:
+        * runtime/JSObject.cpp:
+        (JSC::JSObject::copyButterfly):
+        (JSC::JSObject::visitButterfly):
+        (JSC::JSObject::setPrototype):
+        * runtime/JSObject.h:
+        (JSC::JSObject::setButterfly):
+        * runtime/JSPropertyNameIterator.cpp:
+        (JSC::JSPropertyNameIterator::create):
+        * runtime/Structure.h:
+        (JSC::Structure::hasIndexingHeader):
+
 2013-08-02  Julien Brianceau  <jbrianceau@nds.com>
 

trunk/Source/JavaScriptCore/dfg/DFGRepatch.cpp

@@ -966 +966 @@
             // Skip optimizing the case where we need realloc, and the structure has
             // indexing storage.
-            if (hasIndexingHeader(oldStructure->indexingType()))
+            if (oldStructure->hasIndexingHeader())
                 return false;
             
@@ -1041 +1041 @@
             // Skip optimizing the case where we need realloc, and the structure has
             // indexing storage.
-            if (hasIndexingHeader(oldStructure->indexingType()))
+            if (oldStructure->hasIndexingHeader())
                 return false;
             

trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp

@@ -4260 +4260 @@
 void SpeculativeJIT::compileAllocatePropertyStorage(Node* node)
 {
-    if (hasIndexingHeader(node->structureTransitionData().previousStructure->indexingType())) {
+    if (node->structureTransitionData().previousStructure->hasIndexingHeader()) {
         SpeculateCellOperand base(this, node->child1());
         
@@ -4303 +4303 @@
     ASSERT(newSize == node->structureTransitionData().newStructure->outOfLineCapacity() * sizeof(JSValue));
 
-    if (hasIndexingHeader(node->structureTransitionData().previousStructure->indexingType())) {
+    if (node->structureTransitionData().previousStructure->hasIndexingHeader()) {
         SpeculateCellOperand base(this, node->child1());
         

trunk/Source/JavaScriptCore/runtime/ButterflyInlines.h

@@ -59 +59 @@
     return create(
         vm, intendedOwner, 0, structure->outOfLineCapacity(),
-        hasIndexingHeader(structure->indexingType()), IndexingHeader(), 0);
+        structure->hasIndexingHeader(), IndexingHeader(), 0);
 }
 
@@ -97 +97 @@
     return growPropertyStorage(
         vm, intendedOwner, indexingHeader()->preCapacity(structure), oldPropertyCapacity,
-        hasIndexingHeader(structure->indexingType()),
+        structure->hasIndexingHeader(),
         indexingHeader()->indexingPayloadSizeInBytes(structure), newPropertyCapacity);
 }
@@ -130 +130 @@
 {
     ASSERT_UNUSED(oldStructure, !indexingHeader()->preCapacity(oldStructure));
-    ASSERT_UNUSED(oldStructure, hadIndexingHeader == hasIndexingHeader(oldStructure->indexingType()));
+    ASSERT_UNUSED(oldStructure, hadIndexingHeader == oldStructure->hasIndexingHeader());
     void* theBase = base(0, propertyCapacity);
     size_t oldSize = totalSize(0, propertyCapacity, hadIndexingHeader, oldIndexingPayloadSizeInBytes);
@@ -145 +145 @@
     return growArrayRight(
         vm, intendedOwner, oldStructure, oldStructure->outOfLineCapacity(),
-        hasIndexingHeader(oldStructure->indexingType()),
-        indexingHeader()->indexingPayloadSizeInBytes(oldStructure), newIndexingPayloadSizeInBytes);
+        oldStructure->hasIndexingHeader(), 
+        indexingHeader()->indexingPayloadSizeInBytes(oldStructure),
+        newIndexingPayloadSizeInBytes);
 }
 
@@ -172 +173 @@
     size_t newIndexingPayloadSizeInBytes)
 {
-    bool hasIndexingHeader = JSC::hasIndexingHeader(structure->indexingType());
+    bool hasIndexingHeader = structure->hasIndexingHeader();
     return resizeArray(
         vm, intendedOwner, structure->outOfLineCapacity(), hasIndexingHeader,

trunk/Source/JavaScriptCore/runtime/IndexingType.h

@@ -102 +102 @@
 }
 
-static inline bool hasIndexingHeader(IndexingType type)
-{
-    return hasIndexedProperties(type);
-}
-
 static inline bool hasUndecided(IndexingType indexingType)
 {

trunk/Source/JavaScriptCore/runtime/JSObject.cpp

@@ -103 +103 @@
     size_t preCapacity;
     size_t indexingPayloadSizeInBytes;
-    bool hasIndexingHeader = JSC::hasIndexingHeader(structure->indexingType());
+    bool hasIndexingHeader = structure->hasIndexingHeader();
     if (UNLIKELY(hasIndexingHeader)) {
         preCapacity = butterfly->indexingHeader()->preCapacity(structure);
@@ -149 +149 @@
                 break;
             }
+                
             default:
-                CRASH();
                 currentTarget = 0;
                 currentSource = 0;
@@ -174 +174 @@
     size_t preCapacity;
     size_t indexingPayloadSizeInBytes;
-    bool hasIndexingHeader = JSC::hasIndexingHeader(structure->indexingType());
+    bool hasIndexingHeader = structure->hasIndexingHeader();
     if (UNLIKELY(hasIndexingHeader)) {
         preCapacity = butterfly->indexingHeader()->preCapacity(structure);
@@ -1147 +1147 @@
     }
     
-    if (!hasIndexingHeader(structure()->indexingType()))
+    if (!hasIndexedProperties(structure()->indexingType()))
         return;
     

trunk/Source/JavaScriptCore/runtime/JSObject.h

@@ -1108 +1108 @@
 {
     ASSERT(structure);
-    ASSERT(!butterfly == (!structure->outOfLineCapacity() && !hasIndexingHeader(structure->indexingType())));
+    ASSERT(!butterfly == (!structure->outOfLineCapacity() && !structure->hasIndexingHeader()));
     setStructure(vm, structure);
     m_butterfly = butterfly;

trunk/Source/JavaScriptCore/runtime/JSPropertyNameIterator.cpp

@@ -66 +66 @@
         return jsPropertyNameIterator;
     
-    if (hasIndexingHeader(o->structure()->indexingType()))
+    if (hasIndexedProperties(o->structure()->indexingType()))
         return jsPropertyNameIterator;
     

trunk/Source/JavaScriptCore/runtime/Structure.h

@@ -228 +228 @@
             && (offset < m_inlineCapacity || offset >= firstOutOfLineOffset);
     }
+    
+    bool hasIndexingHeader() const
+    {
+        return hasIndexedProperties(indexingType());
+    }
 
     bool masqueradesAsUndefined(JSGlobalObject* lexicalGlobalObject);