Changeset 95326 in webkit

Timestamp:

Sep 16, 2011 2:34:20 PM (13 years ago)

Author:

weinig@apple.com

Message:

Prepare JSTypes for more Object subtypes
​https://bugs.webkit.org/show_bug.cgi?id=68200

Reviewed by Gavin Barraclough.

• dfg/DFGJITCompiler.h:

(JSC::DFG::JITCompiler::branchIfNotObject):

• jit/JITInlineMethods.h:

(JSC::JIT::emitJumpIfNotObject):

• runtime/JSGlobalObject.h:

(JSC::Structure::prototypeForLookup):

• runtime/JSObject.h:

(JSC::JSObject::finishCreation):

• runtime/JSType.h:
• runtime/JSTypeInfo.h:

(JSC::TypeInfo::type):
(JSC::TypeInfo::isObject):
(JSC::TypeInfo::isFinal):
(JSC::TypeInfo::prohibitsPropertyCaching):

• runtime/NativeErrorConstructor.h:

(JSC::NativeErrorConstructor::finishCreation):

• runtime/Operations.cpp:

(JSC::jsIsObjectType):

• runtime/Structure.cpp:

(JSC::Structure::addPropertyTransitionToExistingStructure):
(JSC::Structure::addPropertyTransition):

• runtime/Structure.h:

(JSC::Structure::isObject):
(JSC::JSCell::isObject):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• dfg/DFGJITCompiler.h (modified) (1 diff)
• jit/JITInlineMethods.h (modified) (1 diff)
• runtime/JSGlobalObject.h (modified) (1 diff)
• runtime/JSObject.h (modified) (1 diff)
• runtime/JSType.h (modified) (1 diff)
• runtime/JSTypeInfo.h (modified) (2 diffs)
• runtime/NativeErrorConstructor.h (modified) (1 diff)
• runtime/Operations.cpp (modified) (1 diff)
• runtime/Structure.cpp (modified) (2 diffs)
• runtime/Structure.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-09-15  Sam Weinig  <sam@webkit.org>
+
+        Prepare JSTypes for more Object subtypes
+        https://bugs.webkit.org/show_bug.cgi?id=68200
+
+        Reviewed by Gavin Barraclough.
+
+        * dfg/DFGJITCompiler.h:
+        (JSC::DFG::JITCompiler::branchIfNotObject):
+        * jit/JITInlineMethods.h:
+        (JSC::JIT::emitJumpIfNotObject):
+        * runtime/JSGlobalObject.h:
+        (JSC::Structure::prototypeForLookup):
+        * runtime/JSObject.h:
+        (JSC::JSObject::finishCreation):
+        * runtime/JSType.h:
+        * runtime/JSTypeInfo.h:
+        (JSC::TypeInfo::type):
+        (JSC::TypeInfo::isObject):
+        (JSC::TypeInfo::isFinal):
+        (JSC::TypeInfo::prohibitsPropertyCaching):
+        * runtime/NativeErrorConstructor.h:
+        (JSC::NativeErrorConstructor::finishCreation):
+        * runtime/Operations.cpp:
+        (JSC::jsIsObjectType):
+        * runtime/Structure.cpp:
+        (JSC::Structure::addPropertyTransitionToExistingStructure):
+        (JSC::Structure::addPropertyTransition):
+        * runtime/Structure.h:
+        (JSC::Structure::isObject):
+        (JSC::JSCell::isObject):
+
 2011-09-16  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.h

@@ -188 +188 @@
     Jump branchIfNotObject(GPRReg structureReg)
     {
-        return branch8(NotEqual, Address(structureReg, Structure::typeInfoTypeOffset()), TrustedImm32(ObjectType));
+        return branch8(Below, Address(structureReg, Structure::typeInfoTypeOffset()), TrustedImm32(ObjectType));
     }
 

trunk/Source/JavaScriptCore/jit/JITInlineMethods.h

@@ -316 +316 @@
 ALWAYS_INLINE JIT::Jump JIT::emitJumpIfNotObject(RegisterID structureReg)
 {
-    return branch8(NotEqual, Address(structureReg, Structure::typeInfoTypeOffset()), TrustedImm32(ObjectType));
+    return branch8(Below, Address(structureReg, Structure::typeInfoTypeOffset()), TrustedImm32(ObjectType));
 }
 

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h

@@ -349 +349 @@
     inline JSValue Structure::prototypeForLookup(ExecState* exec) const
     {
-        if (typeInfo().type() == ObjectType)
+        if (isObject())
             return m_prototype.get();
 

trunk/Source/JavaScriptCore/runtime/JSObject.h

@@ -246 +246 @@
             ASSERT(prototype().isNull() || Heap::heap(this) == Heap::heap(prototype()));
             ASSERT_UNUSED(inlineStorage, static_cast<void*>(inlineStorage) == static_cast<void*>(this + 1));
-            ASSERT(m_structure->typeInfo().type() == ObjectType);
+            ASSERT(m_structure->isObject());
         }
 

trunk/Source/JavaScriptCore/runtime/JSType.h

@@ -37 +37 @@
         // The CompoundType value must come before any JSType that may have children
         CompoundType      = 7,
-        ObjectType        = 8,
-        GetterSetterType  = 9,
-        APIValueWrapper   = 10
+        GetterSetterType  = 8,
+        APIValueWrapper   = 9,
+        // The ObjectType value must come before any JSType that is a subclass of JSObject
+        ObjectType        = 10,
+        FinalObjectType   = 11,
     };
 

trunk/Source/JavaScriptCore/runtime/JSTypeInfo.h

@@ -61 +61 @@
         }
 
-        JSType type() const { return (JSType)m_type; }
+        JSType type() const { return static_cast<JSType>(m_type); }
+        bool isObject() const { return type() >= ObjectType; }
 
         bool masqueradesAsUndefined() const { return m_flags & MasqueradesAsUndefined; }
@@ -70 +71 @@
         bool overridesVisitChildren() const { return m_flags & OverridesVisitChildren; }
         bool overridesGetPropertyNames() const { return m_flags & OverridesGetPropertyNames; }
-        unsigned isFinal() const { return m_flags2 & (IsJSFinalObject >> 8); }
-        unsigned prohibitsPropertyCaching() const { return m_flags2 & (ProhibitsPropertyCaching >> 8); }
+        bool isFinal() const { return m_flags2 & (IsJSFinalObject >> 8); }
+        bool prohibitsPropertyCaching() const { return m_flags2 & (ProhibitsPropertyCaching >> 8); }
+        
         unsigned flags() const { return m_flags; }
 

trunk/Source/JavaScriptCore/runtime/NativeErrorConstructor.h

@@ -63 +63 @@
             m_errorStructure.set(exec->globalData(), this, ErrorInstance::createStructure(exec->globalData(), globalObject, prototype));
             ASSERT(m_errorStructure);
-            ASSERT(m_errorStructure->typeInfo().type() == ObjectType);
+            ASSERT(m_errorStructure->isObject());
         }
 

trunk/Source/JavaScriptCore/runtime/Operations.cpp

@@ -89 +89 @@
     if (type == NumberType || type == StringType)
         return false;
-    if (type == ObjectType) {
+    if (type >= ObjectType) {
         if (asObject(v)->structure()->typeInfo().masqueradesAsUndefined())
             return false;

trunk/Source/JavaScriptCore/runtime/Structure.cpp

@@ -281 +281 @@
 {
     ASSERT(!structure->isDictionary());
-    ASSERT(structure->typeInfo().type() == ObjectType);
+    ASSERT(structure->isObject());
 
     if (Structure* existingTransition = structure->m_transitionTable.get(propertyName.impl(), attributes)) {
@@ -308 +308 @@
 
     ASSERT(!structure->isDictionary());
-    ASSERT(structure->typeInfo().type() == ObjectType);
+    ASSERT(structure->isObject());
     ASSERT(!Structure::addPropertyTransitionToExistingStructure(structure, propertyName, attributes, specificValue, offset));
     

trunk/Source/JavaScriptCore/runtime/Structure.h

@@ -120 +120 @@
         bool isUncacheableDictionary() const { return m_dictionaryKind == UncachedDictionaryKind; }
 
+        // Type accessors.
         const TypeInfo& typeInfo() const { ASSERT(structure()->classInfo() == &s_info); return m_typeInfo; }
+        bool isObject() const { return typeInfo().isObject(); }
+
 
         JSGlobalObject* globalObject() const { return m_globalObject.get(); }
@@ -305 +308 @@
     inline bool JSCell::isObject() const
     {
-        return m_structure->typeInfo().type() == ObjectType;
+        return m_structure->isObject();
     }