Changeset 162738 in webkit for trunk/Source/JavaScriptCore/runtime/Structure.cpp

Timestamp:

Jan 24, 2014, 4:52:21 PM (12 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r162713.
​http://trac.webkit.org/changeset/162713
​https://bugs.webkit.org/show_bug.cgi?id=127593

broke media/network-no-source-const-shadow (Requested by
thorton on #webkit).

Source/JavaScriptCore:

• create_hash_table:
• interpreter/CallFrame.h:

(JSC::ExecState::arrayConstructorTable):
(JSC::ExecState::arrayPrototypeTable):
(JSC::ExecState::booleanPrototypeTable):
(JSC::ExecState::dataViewTable):
(JSC::ExecState::dateTable):
(JSC::ExecState::dateConstructorTable):
(JSC::ExecState::errorPrototypeTable):
(JSC::ExecState::globalObjectTable):
(JSC::ExecState::jsonTable):
(JSC::ExecState::numberConstructorTable):
(JSC::ExecState::numberPrototypeTable):
(JSC::ExecState::objectConstructorTable):
(JSC::ExecState::privateNamePrototypeTable):
(JSC::ExecState::regExpTable):
(JSC::ExecState::regExpConstructorTable):
(JSC::ExecState::regExpPrototypeTable):
(JSC::ExecState::stringConstructorTable):
(JSC::ExecState::promisePrototypeTable):
(JSC::ExecState::promiseConstructorTable):

• runtime/ArrayConstructor.cpp:

(JSC::ArrayConstructor::getOwnPropertySlot):

• runtime/ArrayPrototype.cpp:

(JSC::ArrayPrototype::getOwnPropertySlot):

• runtime/BooleanPrototype.cpp:

(JSC::BooleanPrototype::getOwnPropertySlot):

• runtime/ClassInfo.h:

(JSC::ClassInfo::propHashTable):

• runtime/DateConstructor.cpp:

(JSC::DateConstructor::getOwnPropertySlot):

• runtime/DatePrototype.cpp:

(JSC::DatePrototype::getOwnPropertySlot):

• runtime/ErrorPrototype.cpp:

(JSC::ErrorPrototype::getOwnPropertySlot):

• runtime/JSDataViewPrototype.cpp:

(JSC::JSDataViewPrototype::getOwnPropertySlot):

• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::getOwnPropertySlot):

• runtime/JSONObject.cpp:

(JSC::JSONObject::getOwnPropertySlot):

• runtime/JSObject.cpp:

(JSC::JSObject::put):
(JSC::JSObject::deleteProperty):

• runtime/JSPromiseConstructor.cpp:

(JSC::JSPromiseConstructor::getOwnPropertySlot):

• runtime/JSPromisePrototype.cpp:

(JSC::JSPromisePrototype::getOwnPropertySlot):

• runtime/Lookup.h:

(JSC::HashTable::copy):
(JSC::putEntry):
(JSC::lookupPut):

• runtime/NamePrototype.cpp:

(JSC::NamePrototype::getOwnPropertySlot):

• runtime/NumberConstructor.cpp:

(JSC::NumberConstructor::getOwnPropertySlot):
(JSC::NumberConstructor::put):

• runtime/NumberConstructor.h:
• runtime/NumberPrototype.cpp:

(JSC::NumberPrototype::getOwnPropertySlot):

• runtime/ObjectConstructor.cpp:

(JSC::ObjectConstructor::getOwnPropertySlot):

• runtime/RegExpConstructor.cpp:

(JSC::RegExpConstructor::getOwnPropertySlot):
(JSC::RegExpConstructor::put):

• runtime/RegExpConstructor.h:
• runtime/RegExpObject.cpp:

(JSC::RegExpObject::getOwnPropertySlot):
(JSC::RegExpObject::put):

• runtime/RegExpPrototype.cpp:

(JSC::RegExpPrototype::getOwnPropertySlot):

• runtime/StringConstructor.cpp:

(JSC::StringConstructor::getOwnPropertySlot):

• runtime/Structure.cpp:

(JSC::Structure::Structure):
(JSC::Structure::freezeTransition):

Source/WebCore:

• bindings/js/JSDOMWindowCustom.cpp:

(WebCore::JSDOMWindow::put):

• bindings/scripts/CodeGeneratorJS.pm:

(hashTableAccessor):
(prototypeHashTableAccessor):
(constructorHashTableAccessor):
(GenerateHeader):
(GenerateImplementation):
(GenerateHashTable):
(GenerateConstructorHelperMethods):

• bindings/scripts/test/JS/JSTestActiveDOMObject.cpp:
• bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp:
• bindings/scripts/test/JS/JSTestEventConstructor.cpp:
• bindings/scripts/test/JS/JSTestEventTarget.cpp:
• bindings/scripts/test/JS/JSTestException.cpp:
• bindings/scripts/test/JS/JSTestGenerateIsReachable.cpp:
• bindings/scripts/test/JS/JSTestInterface.cpp:

(WebCore::JSTestInterface::put):

• bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp:
• bindings/scripts/test/JS/JSTestNamedConstructor.cpp:
• bindings/scripts/test/JS/JSTestNode.cpp:
• bindings/scripts/test/JS/JSTestObj.cpp:

(WebCore::JSTestObj::put):

• bindings/scripts/test/JS/JSTestObj.h:
• bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp:
• bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp:

(WebCore::JSTestSerializedScriptValueInterface::put):

• bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h:
• bindings/scripts/test/JS/JSTestTypedefs.cpp:

(WebCore::JSTestTypedefs::put):

• bindings/scripts/test/JS/JSTestTypedefs.h:
• bindings/scripts/test/JS/JSattribute.cpp:
• bindings/scripts/test/JS/JSreadonly.cpp:
• html/canvas/WebGLRenderingContext.idl:

LayoutTests:

• fast/canvas/webgl/constants.html:
• js/script-tests/static-put-in-prototype-chain.js: Removed.
• js/static-put-in-prototype-chain-expected.txt: Removed.
• js/static-put-in-prototype-chain.html: Removed.

File:

• trunk/Source/JavaScriptCore/runtime/Structure.cpp (modified) (7 diffs)

trunk/Source/JavaScriptCore/runtime/Structure.cpp

@@ -166 +166 @@
     , m_dictionaryKind(NoneDictionaryKind)
     , m_isPinnedPropertyTable(false)
-    , m_hasGetterSetterProperties(classInfo->hasStaticSetterOrReadonlyProperties(vm))
-    , m_hasReadOnlyOrGetterSetterPropertiesExcludingProto(classInfo->hasStaticSetterOrReadonlyProperties(vm))
+    , m_hasGetterSetterProperties(false)
+    , m_hasReadOnlyOrGetterSetterPropertiesExcludingProto(false)
     , m_hasNonEnumerableProperties(false)
     , m_attributesInPrevious(0)
@@ -178 +178 @@
     ASSERT(static_cast<PropertyOffset>(inlineCapacity) < firstOutOfLineOffset);
     ASSERT(!typeInfo.structureHasRareData());
-    ASSERT(hasReadOnlyOrGetterSetterPropertiesExcludingProto() || !m_classInfo->hasStaticSetterOrReadonlyProperties(vm));
-    ASSERT(hasGetterSetterProperties() || !m_classInfo->hasStaticSetterOrReadonlyProperties(vm));
 }
 
@@ -195 +193 @@
     , m_dictionaryKind(NoneDictionaryKind)
     , m_isPinnedPropertyTable(false)
-    , m_hasGetterSetterProperties(m_classInfo->hasStaticSetterOrReadonlyProperties(vm))
-    , m_hasReadOnlyOrGetterSetterPropertiesExcludingProto(m_classInfo->hasStaticSetterOrReadonlyProperties(vm))
+    , m_hasGetterSetterProperties(false)
+    , m_hasReadOnlyOrGetterSetterPropertiesExcludingProto(false)
     , m_hasNonEnumerableProperties(false)
     , m_attributesInPrevious(0)
@@ -204 +202 @@
     , m_staticFunctionReified(false)
 {
-    ASSERT(hasReadOnlyOrGetterSetterPropertiesExcludingProto() || !m_classInfo->hasStaticSetterOrReadonlyProperties(vm));
-    ASSERT(hasGetterSetterProperties() || !m_classInfo->hasStaticSetterOrReadonlyProperties(vm));
 }
 
@@ -236 +232 @@
     if (previous->m_globalObject)
         m_globalObject.set(vm, this, previous->m_globalObject.get());
-    ASSERT(hasReadOnlyOrGetterSetterPropertiesExcludingProto() || !m_classInfo->hasStaticSetterOrReadonlyProperties(vm));
-    ASSERT(hasGetterSetterProperties() || !m_classInfo->hasStaticSetterOrReadonlyProperties(vm));
 }
 
@@ -572 +566 @@
     }
 
-    ASSERT(transition->hasReadOnlyOrGetterSetterPropertiesExcludingProto() || !transition->classInfo()->hasStaticSetterOrReadonlyProperties(vm));
-    ASSERT(transition->hasGetterSetterProperties() || !transition->classInfo()->hasStaticSetterOrReadonlyProperties(vm));
     transition->checkOffsetConsistency();
     return transition;
@@ -1165 +1157 @@
 #endif // DO_PROPERTYMAP_CONSTENCY_CHECK
 
-bool ClassInfo::hasStaticSetterOrReadonlyProperties(VM& vm) const
-{
-    for (const ClassInfo* ci = this; ci; ci = ci->parentClass) {
-        if (const HashTable* table = ci->propHashTable(vm)) {
-            if (table->hasSetterOrReadonlyProperties)
-                return true;
-        }
-    }
-    return false;
-}
-
 } // namespace JSC