Changeset 170215 in webkit

Timestamp:

Jun 20, 2014, 3:27:36 PM (11 years ago)

Author:

mhahnenberg@apple.com

Message:

Merge r169903 to the branch.

2014-06-12 Mark Hahnenberg <​mhahnenberg@apple.com>

Move structureHasRareData out of TypeInfo
​https://bugs.webkit.org/show_bug.cgi?id=133800

Reviewed by Andreas Kling.

StructureHasRareData was originally put in TypeInfo to avoid making Structure bigger,
but we have a few spare bits in Structure so it would be nice to remove this hack.

• runtime/JSTypeInfo.h: (JSC::TypeInfo::newImpurePropertyFiresWatchpoints): (JSC::TypeInfo::structureHasRareData): Deleted.
• runtime/Structure.cpp: (JSC::Structure::Structure): (JSC::Structure::allocateRareData): (JSC::Structure::cloneRareDataFrom):
• runtime/Structure.h: (JSC::Structure::previousID): (JSC::Structure::objectToStringValue): (JSC::Structure::setObjectToStringValue): (JSC::Structure::setPreviousID): (JSC::Structure::clearPreviousID): (JSC::Structure::previous): (JSC::Structure::rareData):
• runtime/StructureInlines.h: (JSC::Structure::setEnumerationCache): (JSC::Structure::enumerationCache):

Location:

branches/ftlopt/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/JSTypeInfo.h (modified) (2 diffs)
• runtime/Structure.cpp (modified) (4 diffs)
• runtime/Structure.h (modified) (8 diffs)
• runtime/StructureInlines.h (modified) (2 diffs)

branches/ftlopt/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-06-20  Mark Hahnenberg  <mhahnenberg@apple.com>
+
+        Merge r169903 to the branch.
+
+    2014-06-12  Mark Hahnenberg  <mhahnenberg@apple.com>
+    
+            Move structureHasRareData out of TypeInfo
+            https://bugs.webkit.org/show_bug.cgi?id=133800
+    
+            Reviewed by Andreas Kling.
+    
+            StructureHasRareData was originally put in TypeInfo to avoid making Structure bigger, 
+            but we have a few spare bits in Structure so it would be nice to remove this hack.
+    
+            * runtime/JSTypeInfo.h:
+            (JSC::TypeInfo::newImpurePropertyFiresWatchpoints):
+            (JSC::TypeInfo::structureHasRareData): Deleted.
+            * runtime/Structure.cpp:
+            (JSC::Structure::Structure):
+            (JSC::Structure::allocateRareData):
+            (JSC::Structure::cloneRareDataFrom):
+            * runtime/Structure.h:
+            (JSC::Structure::previousID):
+            (JSC::Structure::objectToStringValue):
+            (JSC::Structure::setObjectToStringValue):
+            (JSC::Structure::setPreviousID):
+            (JSC::Structure::clearPreviousID):
+            (JSC::Structure::previous):
+            (JSC::Structure::rareData):
+            * runtime/StructureInlines.h:
+            (JSC::Structure::setEnumerationCache):
+            (JSC::Structure::enumerationCache):
+
 2014-06-19  Filip Pizlo  <fpizlo@apple.com>
 

branches/ftlopt/Source/JavaScriptCore/runtime/JSTypeInfo.h

@@ -50 +50 @@
     static const unsigned HasImpureGetOwnPropertySlot = 1 << 10;
     static const unsigned NewImpurePropertyFiresWatchpoints = 1 << 11;
-    static const unsigned StructureHasRareData = 1 << 12;
-    static const unsigned StructureIsImmortal = 1 << 13;
+    static const unsigned StructureIsImmortal = 1 << 12;
 
     class TypeInfo {
@@ -96 +95 @@
         bool hasImpureGetOwnPropertySlot() const { return isSetOnFlags2(HasImpureGetOwnPropertySlot); }
         bool newImpurePropertyFiresWatchpoints() const { return isSetOnFlags2(NewImpurePropertyFiresWatchpoints); }
-        bool structureHasRareData() const { return isSetOnFlags2(StructureHasRareData); }
         bool structureIsImmortal() const { return isSetOnFlags2(StructureIsImmortal); }
 

branches/ftlopt/Source/JavaScriptCore/runtime/Structure.cpp

@@ -176 +176 @@
     , m_didTransition(false)
     , m_staticFunctionReified(false)
+    , m_hasRareData(false)
 {
     ASSERT(inlineCapacity <= JSFinalObject::maxInlineCapacity());
     ASSERT(static_cast<PropertyOffset>(inlineCapacity) < firstOutOfLineOffset);
-    ASSERT(!typeInfo.structureHasRareData());
+    ASSERT(!m_hasRareData);
     ASSERT(hasReadOnlyOrGetterSetterPropertiesExcludingProto() || !m_classInfo->hasStaticSetterOrReadonlyProperties(vm));
     ASSERT(hasGetterSetterProperties() || !m_classInfo->hasStaticSetterOrReadonlyProperties(vm));
@@ -203 +204 @@
     , m_didTransition(false)
     , m_staticFunctionReified(false)
+    , m_hasRareData(false)
 {
     TypeInfo typeInfo = TypeInfo(CellType, OverridesVisitChildren | StructureIsImmortal);
@@ -229 +231 @@
     , m_didTransition(true)
     , m_staticFunctionReified(previous->m_staticFunctionReified)
-{
-    TypeInfo typeInfo = TypeInfo(previous->typeInfo().type(), previous->typeInfo().flags() & ~StructureHasRareData);
+    , m_hasRareData(false)
+{
+    TypeInfo typeInfo = previous->typeInfo();
     m_blob = StructureIDBlob(vm.heap.structureIDTable().allocateID(this), previous->indexingTypeIncludingHistory(), typeInfo);
     m_outOfLineTypeFlags = typeInfo.outOfLineTypeFlags();
 
     ASSERT(!previous->typeInfo().structureIsImmortal());
-    if (previous->typeInfo().structureHasRareData() && previous->rareData()->needsCloning())
+    if (previous->m_hasRareData && previous->rareData()->needsCloning())
         cloneRareDataFrom(vm, previous);
     else if (previous->previousID())
@@ -780 +783 @@
 void Structure::allocateRareData(VM& vm)
 {
-    ASSERT(!typeInfo().structureHasRareData());
+    ASSERT(!m_hasRareData);
     StructureRareData* rareData = StructureRareData::create(vm, previous());
-    TypeInfo oldTypeInfo = typeInfo();
-    TypeInfo newTypeInfo = TypeInfo(oldTypeInfo.type(), oldTypeInfo.flags() | StructureHasRareData);
-    m_outOfLineTypeFlags = newTypeInfo.outOfLineTypeFlags();
     m_previousOrRareData.set(vm, this, rareData);
-    ASSERT(typeInfo().structureHasRareData());
+    m_hasRareData = true;
+    ASSERT(m_hasRareData);
 }
 
 void Structure::cloneRareDataFrom(VM& vm, const Structure* other)
 {
-    ASSERT(other->typeInfo().structureHasRareData());
+    ASSERT(!m_hasRareData);
+    ASSERT(other->m_hasRareData);
     StructureRareData* newRareData = StructureRareData::clone(vm, other->rareData());
-    TypeInfo oldTypeInfo = typeInfo();
-    TypeInfo newTypeInfo = TypeInfo(oldTypeInfo.type(), oldTypeInfo.flags() | StructureHasRareData);
-    m_outOfLineTypeFlags = newTypeInfo.outOfLineTypeFlags();
     m_previousOrRareData.set(vm, this, newRareData);
-    ASSERT(typeInfo().structureHasRareData());
+    m_hasRareData = true;
+    ASSERT(m_hasRareData);
 }
 

branches/ftlopt/Source/JavaScriptCore/runtime/Structure.h

@@ -194 +194 @@
     {
         ASSERT(structure()->classInfo() == info());
-        if (typeInfo().structureHasRareData())
+        if (m_hasRareData)
             return rareData()->previousID();
         return previous();
@@ -299 +299 @@
     JSString* objectToStringValue()
     {
-        if (!typeInfo().structureHasRareData())
+        if (!m_hasRareData)
             return 0;
         return rareData()->objectToStringValue();
@@ -306 +306 @@
     void setObjectToStringValue(VM& vm, const JSCell* owner, JSString* value)
     {
-        if (!typeInfo().structureHasRareData())
+        if (!m_hasRareData)
             allocateRareData(vm);
         rareData()->setObjectToStringValue(vm, owner, value);
@@ -456 +456 @@
     void setPreviousID(VM& vm, Structure* transition, Structure* structure)
     {
-        if (typeInfo().structureHasRareData())
+        if (m_hasRareData)
             rareData()->setPreviousID(vm, transition, structure);
         else
@@ -464 +464 @@
     void clearPreviousID()
     {
-        if (typeInfo().structureHasRareData())
+        if (m_hasRareData)
             rareData()->clearPreviousID();
         else
@@ -483 +483 @@
     Structure* previous() const
     {
-        ASSERT(!typeInfo().structureHasRareData());
+        ASSERT(!m_hasRareData);
         return static_cast<Structure*>(m_previousOrRareData.get());
     }
@@ -489 +489 @@
     StructureRareData* rareData() const
     {
-        ASSERT(typeInfo().structureHasRareData());
+        ASSERT(m_hasRareData);
         return static_cast<StructureRareData*>(m_previousOrRareData.get());
     }
@@ -545 +545 @@
     unsigned m_didTransition : 1;
     unsigned m_staticFunctionReified : 1;
+    bool m_hasRareData : 1;
 };
 

branches/ftlopt/Source/JavaScriptCore/runtime/StructureInlines.h

@@ -136 +136 @@
 {
     ASSERT(!isDictionary());
-    if (!typeInfo().structureHasRareData())
+    if (!m_hasRareData)
         allocateRareData(vm);
     rareData()->setEnumerationCache(vm, this, enumerationCache);
@@ -143 +143 @@
 inline JSPropertyNameIterator* Structure::enumerationCache()
 {
-    if (!typeInfo().structureHasRareData())
+    if (!m_hasRareData)
         return 0;
     return rareData()->enumerationCache();