Diff
Modified: trunk/Source/_javascript_Core/API/JSAPIWrapperObject.h (171938 => 171939)
--- trunk/Source/_javascript_Core/API/JSAPIWrapperObject.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/API/JSAPIWrapperObject.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -45,8 +45,6 @@
void setWrappedObject(void*);
protected:
- static const unsigned StructureFlags = OverridesVisitChildren | Base::StructureFlags;
-
JSAPIWrapperObject(VM&, Structure*);
private:
Modified: trunk/Source/_javascript_Core/API/JSAPIWrapperObject.mm (171938 => 171939)
--- trunk/Source/_javascript_Core/API/JSAPIWrapperObject.mm 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/API/JSAPIWrapperObject.mm 2014-08-01 18:57:39 UTC (rev 171939)
@@ -99,7 +99,6 @@
void JSAPIWrapperObject::visitChildren(JSCell* cell, JSC::SlotVisitor& visitor)
{
JSAPIWrapperObject* thisObject = JSC::jsCast<JSAPIWrapperObject*>(cell);
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
Base::visitChildren(cell, visitor);
if (thisObject->wrappedObject())
Modified: trunk/Source/_javascript_Core/API/JSCallbackObject.h (171938 => 171939)
--- trunk/Source/_javascript_Core/API/JSCallbackObject.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/API/JSCallbackObject.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -169,7 +169,7 @@
using Parent::methodTable;
protected:
- static const unsigned StructureFlags = ProhibitsPropertyCaching | OverridesGetOwnPropertySlot | InterceptsGetOwnPropertySlotByIndexEvenWhenLengthIsNotZero | ImplementsHasInstance | OverridesHasInstance | OverridesVisitChildren | OverridesGetPropertyNames | Parent::StructureFlags;
+ static const unsigned StructureFlags = ProhibitsPropertyCaching | OverridesGetOwnPropertySlot | InterceptsGetOwnPropertySlotByIndexEvenWhenLengthIsNotZero | ImplementsHasInstance | OverridesHasInstance | OverridesGetPropertyNames | Parent::StructureFlags;
private:
static String className(const JSObject*);
@@ -196,8 +196,6 @@
{
JSCallbackObject* thisObject = jsCast<JSCallbackObject*>(cell);
ASSERT_GC_OBJECT_INHERITS((static_cast<Parent*>(thisObject)), JSCallbackObject<Parent>::info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->Parent::structure()->typeInfo().overridesVisitChildren());
Parent::visitChildren(thisObject, visitor);
thisObject->m_callbackObjectData->visitChildren(visitor);
}
Modified: trunk/Source/_javascript_Core/ChangeLog (171938 => 171939)
--- trunk/Source/_javascript_Core/ChangeLog 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-08-01 18:57:39 UTC (rev 171939)
@@ -1,3 +1,138 @@
+2014-07-31 Andreas Kling <[email protected]>
+
+ Remove the JSC::OverridesVisitChildren flag.
+ <https://webkit.org/b/135489>
+
+ Except for 3 special classes, the visitChildren() call is always
+ dispatched through the method table (see SlotVisitor.cpp.)
+
+ The OverridesVisitChildren flag doesn't actually do anything.
+ It could be used to implement a non-virtual direct call to
+ JSCell::visitChildren, bypassing the method table for some objects,
+ but such a micro-optimization seems like a weak trade for all this
+ code complexity. Instead, just remove the flag.
+
+ This change frees up an inline flag bit in JSCell.
+
+ Reviewed by Geoffrey Garen.
+
+ * API/JSAPIWrapperObject.h:
+ * API/JSAPIWrapperObject.mm:
+ (JSC::JSAPIWrapperObject::visitChildren):
+ * API/JSCallbackObject.h:
+ (JSC::JSCallbackObject::visitChildren):
+ * bytecode/UnlinkedCodeBlock.cpp:
+ (JSC::UnlinkedFunctionExecutable::visitChildren):
+ (JSC::UnlinkedCodeBlock::visitChildren):
+ (JSC::UnlinkedProgramCodeBlock::visitChildren):
+ * bytecode/UnlinkedCodeBlock.h:
+ * debugger/DebuggerScope.cpp:
+ (JSC::DebuggerScope::visitChildren):
+ * debugger/DebuggerScope.h:
+ * jsc.cpp:
+ * runtime/Arguments.cpp:
+ (JSC::Arguments::visitChildren):
+ * runtime/Arguments.h:
+ * runtime/Executable.cpp:
+ (JSC::EvalExecutable::visitChildren):
+ (JSC::ProgramExecutable::visitChildren):
+ (JSC::FunctionExecutable::visitChildren):
+ * runtime/Executable.h:
+ * runtime/GetterSetter.cpp:
+ (JSC::GetterSetter::visitChildren):
+ * runtime/GetterSetter.h:
+ (JSC::GetterSetter::createStructure):
+ * runtime/JSAPIValueWrapper.h:
+ (JSC::JSAPIValueWrapper::createStructure):
+ * runtime/JSActivation.cpp:
+ (JSC::JSActivation::visitChildren):
+ * runtime/JSActivation.h:
+ * runtime/JSArrayIterator.cpp:
+ (JSC::JSArrayIterator::visitChildren):
+ * runtime/JSArrayIterator.h:
+ * runtime/JSBoundFunction.cpp:
+ (JSC::JSBoundFunction::visitChildren):
+ * runtime/JSBoundFunction.h:
+ * runtime/JSCellInlines.h:
+ (JSC::JSCell::setStructure):
+ * runtime/JSFunction.cpp:
+ (JSC::JSFunction::visitChildren):
+ * runtime/JSFunction.h:
+ * runtime/JSGlobalObject.cpp:
+ (JSC::JSGlobalObject::visitChildren):
+ * runtime/JSGlobalObject.h:
+ * runtime/JSMap.h:
+ * runtime/JSMapIterator.cpp:
+ (JSC::JSMapIterator::visitChildren):
+ * runtime/JSMapIterator.h:
+ * runtime/JSNameScope.cpp:
+ (JSC::JSNameScope::visitChildren):
+ * runtime/JSNameScope.h:
+ * runtime/JSPromise.cpp:
+ (JSC::JSPromise::visitChildren):
+ * runtime/JSPromise.h:
+ * runtime/JSPromiseDeferred.cpp:
+ (JSC::JSPromiseDeferred::visitChildren):
+ * runtime/JSPromiseDeferred.h:
+ * runtime/JSPromiseReaction.cpp:
+ (JSC::JSPromiseReaction::visitChildren):
+ * runtime/JSPromiseReaction.h:
+ * runtime/JSPropertyNameIterator.cpp:
+ (JSC::JSPropertyNameIterator::visitChildren):
+ * runtime/JSPropertyNameIterator.h:
+ * runtime/JSProxy.cpp:
+ (JSC::JSProxy::visitChildren):
+ * runtime/JSProxy.h:
+ * runtime/JSScope.cpp:
+ (JSC::JSScope::visitChildren):
+ * runtime/JSScope.h:
+ * runtime/JSSegmentedVariableObject.cpp:
+ (JSC::JSSegmentedVariableObject::visitChildren):
+ * runtime/JSSegmentedVariableObject.h:
+ * runtime/JSSet.h:
+ * runtime/JSSetIterator.cpp:
+ (JSC::JSSetIterator::visitChildren):
+ * runtime/JSSetIterator.h:
+ * runtime/JSSymbolTableObject.cpp:
+ (JSC::JSSymbolTableObject::visitChildren):
+ * runtime/JSSymbolTableObject.h:
+ * runtime/JSTypeInfo.h:
+ (JSC::TypeInfo::overridesVisitChildren): Deleted.
+ * runtime/JSWeakMap.h:
+ * runtime/JSWithScope.cpp:
+ (JSC::JSWithScope::visitChildren):
+ * runtime/JSWithScope.h:
+ * runtime/JSWrapperObject.cpp:
+ (JSC::JSWrapperObject::visitChildren):
+ * runtime/JSWrapperObject.h:
+ * runtime/MapData.h:
+ * runtime/NativeErrorConstructor.cpp:
+ (JSC::NativeErrorConstructor::visitChildren):
+ * runtime/NativeErrorConstructor.h:
+ * runtime/PropertyMapHashTable.h:
+ * runtime/PropertyTable.cpp:
+ (JSC::PropertyTable::visitChildren):
+ * runtime/RegExpConstructor.cpp:
+ (JSC::RegExpConstructor::visitChildren):
+ * runtime/RegExpConstructor.h:
+ * runtime/RegExpMatchesArray.cpp:
+ (JSC::RegExpMatchesArray::visitChildren):
+ * runtime/RegExpMatchesArray.h:
+ * runtime/RegExpObject.cpp:
+ (JSC::RegExpObject::visitChildren):
+ * runtime/RegExpObject.h:
+ * runtime/SparseArrayValueMap.h:
+ * runtime/Structure.cpp:
+ (JSC::Structure::Structure):
+ (JSC::Structure::visitChildren):
+ * runtime/StructureChain.cpp:
+ (JSC::StructureChain::visitChildren):
+ * runtime/StructureChain.h:
+ * runtime/StructureRareData.cpp:
+ (JSC::StructureRareData::visitChildren):
+ * runtime/StructureRareData.h:
+ * runtime/WeakMapData.h:
+
2014-07-31 Mark Lam <[email protected]>
JSCell::classInfo() belongs in JSCellInlines.h.
Modified: trunk/Source/_javascript_Core/bytecode/UnlinkedCodeBlock.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/bytecode/UnlinkedCodeBlock.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/bytecode/UnlinkedCodeBlock.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -113,8 +113,6 @@
{
UnlinkedFunctionExecutable* thisObject = jsCast<UnlinkedFunctionExecutable*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
Base::visitChildren(thisObject, visitor);
visitor.append(&thisObject->m_codeBlockForCall);
visitor.append(&thisObject->m_codeBlockForConstruct);
@@ -231,8 +229,6 @@
{
UnlinkedCodeBlock* thisObject = jsCast<UnlinkedCodeBlock*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
Base::visitChildren(thisObject, visitor);
visitor.append(&thisObject->m_symbolTable);
for (FunctionExpressionVector::iterator ptr = thisObject->m_functionDecls.begin(), end = thisObject->m_functionDecls.end(); ptr != end; ++ptr)
@@ -408,8 +404,6 @@
{
UnlinkedProgramCodeBlock* thisObject = jsCast<UnlinkedProgramCodeBlock*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
Base::visitChildren(thisObject, visitor);
for (size_t i = 0, end = thisObject->m_functionDeclarations.size(); i != end; i++)
visitor.append(&thisObject->m_functionDeclarations[i].second);
Modified: trunk/Source/_javascript_Core/bytecode/UnlinkedCodeBlock.h (171938 => 171939)
--- trunk/Source/_javascript_Core/bytecode/UnlinkedCodeBlock.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/bytecode/UnlinkedCodeBlock.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -205,7 +205,7 @@
return Structure::create(vm, globalObject, proto, TypeInfo(UnlinkedFunctionExecutableType, StructureFlags), info());
}
- static const unsigned StructureFlags = OverridesVisitChildren | StructureIsImmortal | JSCell::StructureFlags;
+ static const unsigned StructureFlags = StructureIsImmortal | JSCell::StructureFlags;
DECLARE_EXPORT_INFO;
};
@@ -578,7 +578,7 @@
protected:
- static const unsigned StructureFlags = OverridesVisitChildren | StructureIsImmortal | Base::StructureFlags;
+ static const unsigned StructureFlags = StructureIsImmortal | Base::StructureFlags;
static void visitChildren(JSCell*, SlotVisitor&);
public:
@@ -595,8 +595,6 @@
{
}
- static const unsigned StructureFlags = OverridesVisitChildren | Base::StructureFlags;
-
DECLARE_INFO;
};
@@ -647,8 +645,6 @@
return Structure::create(vm, globalObject, proto, TypeInfo(UnlinkedProgramCodeBlockType, StructureFlags), info());
}
- static const unsigned StructureFlags = OverridesVisitChildren | Base::StructureFlags;
-
DECLARE_INFO;
};
@@ -689,8 +685,6 @@
return Structure::create(vm, globalObject, proto, TypeInfo(UnlinkedEvalCodeBlockType, StructureFlags), info());
}
- static const unsigned StructureFlags = OverridesVisitChildren | Base::StructureFlags;
-
DECLARE_INFO;
};
@@ -718,8 +712,6 @@
return Structure::create(vm, globalObject, proto, TypeInfo(UnlinkedFunctionCodeBlockType, StructureFlags), info());
}
- static const unsigned StructureFlags = OverridesVisitChildren | Base::StructureFlags;
-
DECLARE_INFO;
};
Modified: trunk/Source/_javascript_Core/debugger/DebuggerScope.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/debugger/DebuggerScope.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/debugger/DebuggerScope.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -52,9 +52,6 @@
{
DebuggerScope* thisObject = jsCast<DebuggerScope*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
-
JSObject::visitChildren(thisObject, visitor);
visitor.append(&thisObject->m_activation);
}
Modified: trunk/Source/_javascript_Core/debugger/DebuggerScope.h (171938 => 171939)
--- trunk/Source/_javascript_Core/debugger/DebuggerScope.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/debugger/DebuggerScope.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -57,7 +57,7 @@
}
protected:
- static const unsigned StructureFlags = OverridesGetOwnPropertySlot | OverridesVisitChildren | JSObject::StructureFlags;
+ static const unsigned StructureFlags = OverridesGetOwnPropertySlot | JSObject::StructureFlags;
JS_EXPORT_PRIVATE void finishCreation(VM&, JSObject* activation);
Modified: trunk/Source/_javascript_Core/jsc.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/jsc.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/jsc.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -272,7 +272,7 @@
m_delegate.set(vm, this, delegate);
}
- static const unsigned StructureFlags = JSC::HasImpureGetOwnPropertySlot | JSC::OverridesGetOwnPropertySlot | JSC::OverridesVisitChildren | Base::StructureFlags;
+ static const unsigned StructureFlags = JSC::HasImpureGetOwnPropertySlot | JSC::OverridesGetOwnPropertySlot | Base::StructureFlags;
static bool getOwnPropertySlot(JSObject* object, ExecState* exec, PropertyName name, PropertySlot& slot)
{
Modified: trunk/Source/_javascript_Core/runtime/Arguments.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/Arguments.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/Arguments.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -44,8 +44,6 @@
{
Arguments* thisObject = jsCast<Arguments*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
JSObject::visitChildren(thisObject, visitor);
if (thisObject->m_registerArray) {
Modified: trunk/Source/_javascript_Core/runtime/Arguments.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/Arguments.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/Arguments.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -105,7 +105,7 @@
}
protected:
- static const unsigned StructureFlags = OverridesGetOwnPropertySlot | InterceptsGetOwnPropertySlotByIndexEvenWhenLengthIsNotZero | OverridesVisitChildren | OverridesGetPropertyNames | JSObject::StructureFlags;
+ static const unsigned StructureFlags = OverridesGetOwnPropertySlot | InterceptsGetOwnPropertySlotByIndexEvenWhenLengthIsNotZero | OverridesGetPropertyNames | JSObject::StructureFlags;
void finishCreation(CallFrame*);
void finishCreation(CallFrame*, InlineCallFrame*);
Modified: trunk/Source/_javascript_Core/runtime/Executable.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/Executable.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/Executable.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -413,8 +413,6 @@
{
EvalExecutable* thisObject = jsCast<EvalExecutable*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
ScriptExecutable::visitChildren(thisObject, visitor);
if (thisObject->m_evalCodeBlock)
thisObject->m_evalCodeBlock->visitAggregate(visitor);
@@ -498,8 +496,6 @@
{
ProgramExecutable* thisObject = jsCast<ProgramExecutable*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
ScriptExecutable::visitChildren(thisObject, visitor);
visitor.append(&thisObject->m_unlinkedProgramCodeBlock);
if (thisObject->m_programCodeBlock)
@@ -531,8 +527,6 @@
{
FunctionExecutable* thisObject = jsCast<FunctionExecutable*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
ScriptExecutable::visitChildren(thisObject, visitor);
if (thisObject->m_codeBlockForCall)
thisObject->m_codeBlockForCall->visitAggregate(visitor);
Modified: trunk/Source/_javascript_Core/runtime/Executable.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/Executable.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/Executable.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -493,7 +493,6 @@
private:
friend class ScriptExecutable;
- static const unsigned StructureFlags = OverridesVisitChildren | ScriptExecutable::StructureFlags;
EvalExecutable(ExecState*, const SourceCode&, bool);
static void visitChildren(JSCell*, SlotVisitor&);
@@ -546,8 +545,6 @@
private:
friend class ScriptExecutable;
-
- static const unsigned StructureFlags = OverridesVisitChildren | ScriptExecutable::StructureFlags;
ProgramExecutable(ExecState*, const SourceCode&);
@@ -672,7 +669,6 @@
friend class ScriptExecutable;
- static const unsigned StructureFlags = OverridesVisitChildren | ScriptExecutable::StructureFlags;
WriteBarrier<UnlinkedFunctionExecutable> m_unlinkedExecutable;
RefPtr<FunctionCodeBlock> m_codeBlockForCall;
RefPtr<FunctionCodeBlock> m_codeBlockForConstruct;
Modified: trunk/Source/_javascript_Core/runtime/GetterSetter.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/GetterSetter.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/GetterSetter.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -38,7 +38,6 @@
{
GetterSetter* thisObject = jsCast<GetterSetter*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
JSCell::visitChildren(thisObject, visitor);
visitor.append(&thisObject->m_getter);
Modified: trunk/Source/_javascript_Core/runtime/GetterSetter.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/GetterSetter.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/GetterSetter.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -61,7 +61,7 @@
void setSetter(VM& vm, JSObject* setter) { m_setter.setMayBeNull(vm, this, setter); }
static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
{
- return Structure::create(vm, globalObject, prototype, TypeInfo(GetterSetterType, OverridesVisitChildren), info());
+ return Structure::create(vm, globalObject, prototype, TypeInfo(GetterSetterType), info());
}
static ptrdiff_t offsetOfGetter()
Modified: trunk/Source/_javascript_Core/runtime/JSAPIValueWrapper.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSAPIValueWrapper.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSAPIValueWrapper.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -39,7 +39,7 @@
static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
{
- return Structure::create(vm, globalObject, prototype, TypeInfo(APIValueWrapperType, OverridesVisitChildren | OverridesGetPropertyNames), info());
+ return Structure::create(vm, globalObject, prototype, TypeInfo(APIValueWrapperType, OverridesGetPropertyNames), info());
}
DECLARE_EXPORT_INFO;
Modified: trunk/Source/_javascript_Core/runtime/JSActivation.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSActivation.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSActivation.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -44,8 +44,6 @@
{
JSActivation* thisObject = jsCast<JSActivation*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
Base::visitChildren(thisObject, visitor);
// No need to mark our registers if they're still in the JSStack.
Modified: trunk/Source/_javascript_Core/runtime/JSActivation.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSActivation.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSActivation.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -91,7 +91,7 @@
static int registersOffset(SymbolTable*);
protected:
- static const unsigned StructureFlags = OverridesGetOwnPropertySlot | OverridesVisitChildren | OverridesGetPropertyNames | Base::StructureFlags;
+ static const unsigned StructureFlags = OverridesGetOwnPropertySlot | OverridesGetPropertyNames | Base::StructureFlags;
private:
bool symbolTableGet(PropertyName, PropertySlot&);
Modified: trunk/Source/_javascript_Core/runtime/JSArrayIterator.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSArrayIterator.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSArrayIterator.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -64,12 +64,8 @@
{
JSArrayIterator* thisObject = jsCast<JSArrayIterator*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
-
Base::visitChildren(thisObject, visitor);
visitor.append(&thisObject->m_iteratedObject);
-
}
static EncodedJSValue createIteratorResult(CallFrame* callFrame, ArrayIterationKind kind, size_t index, JSValue result, bool done)
Modified: trunk/Source/_javascript_Core/runtime/JSArrayIterator.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSArrayIterator.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSArrayIterator.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -71,9 +71,6 @@
static ptrdiff_t offsetOfNextIndex() { return OBJECT_OFFSETOF(JSArrayIterator, m_nextIndex); }
private:
-
- static const unsigned StructureFlags = Base::StructureFlags | OverridesVisitChildren;
-
JSArrayIterator(VM& vm, Structure* structure)
: Base(vm, structure)
, m_nextIndex(0)
Modified: trunk/Source/_javascript_Core/runtime/JSBoundFunction.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSBoundFunction.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSBoundFunction.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -117,8 +117,6 @@
{
JSBoundFunction* thisObject = jsCast<JSBoundFunction*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
Base::visitChildren(thisObject, visitor);
visitor.append(&thisObject->m_targetFunction);
Modified: trunk/Source/_javascript_Core/runtime/JSBoundFunction.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSBoundFunction.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSBoundFunction.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -56,7 +56,7 @@
DECLARE_INFO;
protected:
- const static unsigned StructureFlags = OverridesHasInstance | OverridesVisitChildren | Base::StructureFlags;
+ const static unsigned StructureFlags = OverridesHasInstance | Base::StructureFlags;
static void visitChildren(JSCell*, SlotVisitor&);
Modified: trunk/Source/_javascript_Core/runtime/JSCellInlines.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSCellInlines.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSCellInlines.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -174,7 +174,6 @@
inline void JSCell::setStructure(VM& vm, Structure* structure)
{
- ASSERT(structure->typeInfo().overridesVisitChildren() == this->structure()->typeInfo().overridesVisitChildren());
ASSERT(structure->classInfo() == this->structure()->classInfo());
ASSERT(!this->structure()
|| this->structure()->transitionWatchpointSetHasBeenInvalidated()
Modified: trunk/Source/_javascript_Core/runtime/JSFunction.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSFunction.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSFunction.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -178,8 +178,6 @@
{
JSFunction* thisObject = jsCast<JSFunction*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
Base::visitChildren(thisObject, visitor);
visitor.append(&thisObject->m_scope);
Modified: trunk/Source/_javascript_Core/runtime/JSFunction.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSFunction.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSFunction.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -153,7 +153,7 @@
JS_EXPORT_PRIVATE bool isHostFunctionNonInline() const;
protected:
- const static unsigned StructureFlags = OverridesGetOwnPropertySlot | ImplementsHasInstance | OverridesVisitChildren | OverridesGetPropertyNames | JSObject::StructureFlags;
+ const static unsigned StructureFlags = OverridesGetOwnPropertySlot | ImplementsHasInstance | OverridesGetPropertyNames | JSObject::StructureFlags;
JS_EXPORT_PRIVATE JSFunction(VM&, JSGlobalObject*, Structure*);
JSFunction(VM&, FunctionExecutable*, JSScope*);
Modified: trunk/Source/_javascript_Core/runtime/JSGlobalObject.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSGlobalObject.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSGlobalObject.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -632,8 +632,6 @@
{
JSGlobalObject* thisObject = jsCast<JSGlobalObject*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
Base::visitChildren(thisObject, visitor);
visitor.append(&thisObject->m_globalThis);
Modified: trunk/Source/_javascript_Core/runtime/JSGlobalObject.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSGlobalObject.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSGlobalObject.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -576,7 +576,7 @@
protected:
- static const unsigned StructureFlags = OverridesGetOwnPropertySlot | OverridesVisitChildren | OverridesGetPropertyNames | Base::StructureFlags;
+ static const unsigned StructureFlags = OverridesGetOwnPropertySlot | OverridesGetPropertyNames | Base::StructureFlags;
struct GlobalPropertyInfo {
GlobalPropertyInfo(const Identifier& i, JSValue v, unsigned a)
Modified: trunk/Source/_javascript_Core/runtime/JSMap.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSMap.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSMap.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -58,8 +58,6 @@
MapData* mapData() { return m_mapData.get(); }
private:
- static const unsigned StructureFlags = OverridesVisitChildren | Base::StructureFlags;
-
JSMap(VM& vm, Structure* structure)
: Base(vm, structure)
{
Modified: trunk/Source/_javascript_Core/runtime/JSMapIterator.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSMapIterator.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSMapIterator.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -45,10 +45,7 @@
void JSMapIterator::visitChildren(JSCell* cell, SlotVisitor& visitor)
{
JSMapIterator* thisObject = jsCast<JSMapIterator*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
-
+ ASSERT_GC_OBJECT_INHERITS(thisObject, info());
Base::visitChildren(thisObject, visitor);
visitor.append(&thisObject->m_iteratedObjectData);
}
Modified: trunk/Source/_javascript_Core/runtime/JSMapIterator.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSMapIterator.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSMapIterator.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -71,9 +71,6 @@
}
private:
-
- static const unsigned StructureFlags = Base::StructureFlags | OverridesVisitChildren;
-
JSMapIterator(VM& vm, Structure* structure, JSMap* iteratedObject, MapIterationKind kind)
: Base(vm, structure)
, m_iterator(iteratedObject->mapData()->begin())
Modified: trunk/Source/_javascript_Core/runtime/JSNameScope.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSNameScope.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSNameScope.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -37,9 +37,6 @@
{
JSNameScope* thisObject = jsCast<JSNameScope*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
-
Base::visitChildren(thisObject, visitor);
visitor.append(&thisObject->m_registerStore);
}
Modified: trunk/Source/_javascript_Core/runtime/JSNameScope.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSNameScope.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSNameScope.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -68,7 +68,7 @@
symbolTable()->add(identifier.impl(), SymbolTableEntry(-1, attributes));
}
- static const unsigned StructureFlags = OverridesGetOwnPropertySlot | OverridesVisitChildren | Base::StructureFlags;
+ static const unsigned StructureFlags = OverridesGetOwnPropertySlot | Base::StructureFlags;
private:
JSNameScope(VM& vm, JSGlobalObject* globalObject, JSScope* next)
Modified: trunk/Source/_javascript_Core/runtime/JSPromise.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSPromise.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSPromise.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -78,8 +78,6 @@
{
JSPromise* thisObject = jsCast<JSPromise*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
Base::visitChildren(thisObject, visitor);
Modified: trunk/Source/_javascript_Core/runtime/JSPromise.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSPromise.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSPromise.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -75,7 +75,6 @@
private:
JSPromise(VM&, Structure*);
void finishCreation(VM&, JSPromiseConstructor*);
- static const unsigned StructureFlags = OverridesVisitChildren | JSObject::StructureFlags;
static void destroy(JSCell*);
static void visitChildren(JSCell*, SlotVisitor&);
Modified: trunk/Source/_javascript_Core/runtime/JSPromiseDeferred.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSPromiseDeferred.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSPromiseDeferred.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -78,8 +78,6 @@
{
JSPromiseDeferred* thisObject = jsCast<JSPromiseDeferred*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
Base::visitChildren(thisObject, visitor);
Modified: trunk/Source/_javascript_Core/runtime/JSPromiseDeferred.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSPromiseDeferred.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSPromiseDeferred.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -56,7 +56,6 @@
private:
JSPromiseDeferred(VM&);
void finishCreation(VM&, JSObject*, JSValue, JSValue);
- static const unsigned StructureFlags = OverridesVisitChildren | Base::StructureFlags;
static void visitChildren(JSCell*, SlotVisitor&);
WriteBarrier<JSObject> m_promise;
Modified: trunk/Source/_javascript_Core/runtime/JSPromiseReaction.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSPromiseReaction.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSPromiseReaction.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -148,8 +148,6 @@
{
JSPromiseReaction* thisObject = jsCast<JSPromiseReaction*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
Base::visitChildren(thisObject, visitor);
Modified: trunk/Source/_javascript_Core/runtime/JSPromiseReaction.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSPromiseReaction.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSPromiseReaction.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -56,7 +56,6 @@
private:
JSPromiseReaction(VM&);
void finishCreation(VM&, JSPromiseDeferred*, JSValue);
- static const unsigned StructureFlags = OverridesVisitChildren | Base::StructureFlags;
static void visitChildren(JSCell*, SlotVisitor&);
WriteBarrier<JSPromiseDeferred> m_deferred;
Modified: trunk/Source/_javascript_Core/runtime/JSPropertyNameIterator.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSPropertyNameIterator.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSPropertyNameIterator.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -106,7 +106,6 @@
{
JSPropertyNameIterator* thisObject = jsCast<JSPropertyNameIterator*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
visitor.appendValues(thisObject->m_jsStrings.get(), thisObject->m_jsStringsSize);
visitor.append(&thisObject->m_cachedPrototypeChain);
}
Modified: trunk/Source/_javascript_Core/runtime/JSPropertyNameIterator.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSPropertyNameIterator.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSPropertyNameIterator.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -76,7 +76,7 @@
DECLARE_EXPORT_INFO;
protected:
- static const unsigned StructureFlags = OverridesVisitChildren | StructureIsImmortal;
+ static const unsigned StructureFlags = StructureIsImmortal;
void finishCreation(VM& vm, PropertyNameArrayData* propertyNameArrayData, JSObject* object)
{
Modified: trunk/Source/_javascript_Core/runtime/JSProxy.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSProxy.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSProxy.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -39,10 +39,6 @@
{
JSProxy* thisObject = jsCast<JSProxy*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
-
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
-
Base::visitChildren(thisObject, visitor);
visitor.append(&thisObject->m_target);
}
Modified: trunk/Source/_javascript_Core/runtime/JSProxy.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSProxy.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSProxy.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -68,7 +68,7 @@
m_target.set(vm, this, target);
}
- static const unsigned StructureFlags = OverridesVisitChildren | OverridesGetOwnPropertySlot | OverridesGetPropertyNames | InterceptsGetOwnPropertySlotByIndexEvenWhenLengthIsNotZero | Base::StructureFlags;
+ static const unsigned StructureFlags = OverridesGetOwnPropertySlot | OverridesGetPropertyNames | InterceptsGetOwnPropertySlotByIndexEvenWhenLengthIsNotZero | Base::StructureFlags;
JS_EXPORT_PRIVATE static void visitChildren(JSCell*, SlotVisitor&);
Modified: trunk/Source/_javascript_Core/runtime/JSScope.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSScope.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSScope.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -40,9 +40,6 @@
{
JSScope* thisObject = jsCast<JSScope*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
-
Base::visitChildren(thisObject, visitor);
visitor.append(&thisObject->m_next);
}
Modified: trunk/Source/_javascript_Core/runtime/JSScope.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSScope.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSScope.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -168,7 +168,6 @@
protected:
JSScope(VM&, Structure*, JSScope* next);
- static const unsigned StructureFlags = OverridesVisitChildren | Base::StructureFlags;
private:
WriteBarrier<JSScope> m_next;
Modified: trunk/Source/_javascript_Core/runtime/JSSegmentedVariableObject.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSSegmentedVariableObject.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSSegmentedVariableObject.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -65,8 +65,6 @@
{
JSSegmentedVariableObject* thisObject = jsCast<JSSegmentedVariableObject*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
JSSymbolTableObject::visitChildren(thisObject, slotVisitor);
for (unsigned i = thisObject->m_registers.size(); i--;)
Modified: trunk/Source/_javascript_Core/runtime/JSSegmentedVariableObject.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSSegmentedVariableObject.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSSegmentedVariableObject.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -79,8 +79,6 @@
JS_EXPORT_PRIVATE static void visitChildren(JSCell*, SlotVisitor&);
protected:
- static const unsigned StructureFlags = OverridesVisitChildren | JSSymbolTableObject::StructureFlags;
-
JSSegmentedVariableObject(VM& vm, Structure* structure, JSScope* scope)
: JSSymbolTableObject(vm, structure, scope)
{
Modified: trunk/Source/_javascript_Core/runtime/JSSet.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSSet.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSSet.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -58,9 +58,6 @@
MapData* mapData() { return m_mapData.get(); }
private:
-
- static const unsigned StructureFlags = OverridesVisitChildren | Base::StructureFlags;
-
JSSet(VM& vm, Structure* structure)
: Base(vm, structure)
{
Modified: trunk/Source/_javascript_Core/runtime/JSSetIterator.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSSetIterator.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSSetIterator.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -45,10 +45,7 @@
void JSSetIterator::visitChildren(JSCell* cell, SlotVisitor& visitor)
{
JSSetIterator* thisObject = jsCast<JSSetIterator*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
-
+ ASSERT_GC_OBJECT_INHERITS(thisObject, info());
Base::visitChildren(thisObject, visitor);
visitor.append(&thisObject->m_iteratedObjectData);
}
Modified: trunk/Source/_javascript_Core/runtime/JSSetIterator.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSSetIterator.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSSetIterator.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -69,9 +69,6 @@
}
private:
-
- static const unsigned StructureFlags = Base::StructureFlags | OverridesVisitChildren;
-
JSSetIterator(VM& vm, Structure* structure, JSSet* iteratedObject, SetIterationKind kind)
: Base(vm, structure)
, m_iterator(iteratedObject->mapData()->begin())
Modified: trunk/Source/_javascript_Core/runtime/JSSymbolTableObject.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSSymbolTableObject.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSSymbolTableObject.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -41,9 +41,6 @@
{
JSSymbolTableObject* thisObject = jsCast<JSSymbolTableObject*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
-
Base::visitChildren(thisObject, visitor);
visitor.append(&thisObject->m_symbolTable);
}
Modified: trunk/Source/_javascript_Core/runtime/JSSymbolTableObject.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSSymbolTableObject.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSSymbolTableObject.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -46,7 +46,7 @@
JS_EXPORT_PRIVATE static void getOwnNonIndexPropertyNames(JSObject*, ExecState*, PropertyNameArray&, EnumerationMode);
protected:
- static const unsigned StructureFlags = IsEnvironmentRecord | OverridesVisitChildren | OverridesGetPropertyNames | Base::StructureFlags;
+ static const unsigned StructureFlags = IsEnvironmentRecord | OverridesGetPropertyNames | Base::StructureFlags;
JSSymbolTableObject(VM& vm, Structure* structure, JSScope* scope, SymbolTable* symbolTable = 0)
: Base(vm, structure, scope)
Modified: trunk/Source/_javascript_Core/runtime/JSTypeInfo.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSTypeInfo.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSTypeInfo.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -43,7 +43,6 @@
static const unsigned IsEnvironmentRecord = 1 << 4;
static const unsigned OverridesGetOwnPropertySlot = 1 << 5;
static const unsigned InterceptsGetOwnPropertySlotByIndexEvenWhenLengthIsNotZero = 1 << 6;
- static const unsigned OverridesVisitChildren = 1 << 7;
static const unsigned OverridesGetPropertyNames = 1 << 8;
static const unsigned ProhibitsPropertyCaching = 1 << 9;
@@ -89,7 +88,6 @@
bool overridesGetOwnPropertySlot() const { return overridesGetOwnPropertySlot(inlineTypeFlags()); }
static bool overridesGetOwnPropertySlot(InlineTypeFlags flags) { return flags & OverridesGetOwnPropertySlot; }
bool interceptsGetOwnPropertySlotByIndexEvenWhenLengthIsNotZero() const { return isSetOnFlags1(InterceptsGetOwnPropertySlotByIndexEvenWhenLengthIsNotZero); }
- bool overridesVisitChildren() const { return isSetOnFlags1(OverridesVisitChildren); }
bool overridesGetPropertyNames() const { return isSetOnFlags2(OverridesGetPropertyNames); }
bool prohibitsPropertyCaching() const { return isSetOnFlags2(ProhibitsPropertyCaching); }
bool hasImpureGetOwnPropertySlot() const { return isSetOnFlags2(HasImpureGetOwnPropertySlot); }
Modified: trunk/Source/_javascript_Core/runtime/JSWeakMap.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSWeakMap.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSWeakMap.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -65,8 +65,6 @@
void clear(CallFrame*);
private:
- static const unsigned StructureFlags = OverridesVisitChildren | Base::StructureFlags;
-
JSWeakMap(VM& vm, Structure* structure)
: Base(vm, structure)
{
Modified: trunk/Source/_javascript_Core/runtime/JSWithScope.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSWithScope.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSWithScope.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -36,9 +36,6 @@
{
JSWithScope* thisObject = jsCast<JSWithScope*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
-
Base::visitChildren(thisObject, visitor);
visitor.append(&thisObject->m_object);
}
Modified: trunk/Source/_javascript_Core/runtime/JSWithScope.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSWithScope.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSWithScope.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -59,9 +59,6 @@
DECLARE_EXPORT_INFO;
-protected:
- static const unsigned StructureFlags = OverridesVisitChildren | Base::StructureFlags;
-
private:
JSWithScope(ExecState* exec, JSObject* object)
: Base(
Modified: trunk/Source/_javascript_Core/runtime/JSWrapperObject.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSWrapperObject.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSWrapperObject.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -32,9 +32,6 @@
{
JSWrapperObject* thisObject = jsCast<JSWrapperObject*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
-
JSObject::visitChildren(thisObject, visitor);
visitor.append(&thisObject->m_internalValue);
}
Modified: trunk/Source/_javascript_Core/runtime/JSWrapperObject.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/JSWrapperObject.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/JSWrapperObject.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -58,7 +58,6 @@
protected:
explicit JSWrapperObject(VM&, Structure*);
- static const unsigned StructureFlags = OverridesVisitChildren | Base::StructureFlags;
JS_EXPORT_PRIVATE static void visitChildren(JSCell*, SlotVisitor&);
Modified: trunk/Source/_javascript_Core/runtime/MapData.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/MapData.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/MapData.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -96,7 +96,7 @@
void clear();
DECLARE_INFO;
- static const unsigned StructureFlags = OverridesVisitChildren | StructureIsImmortal | Base::StructureFlags;
+ static const unsigned StructureFlags = StructureIsImmortal | Base::StructureFlags;
private:
typedef WTF::UnsignedWithZeroKeyHashTraits<int32_t> IndexTraits;
Modified: trunk/Source/_javascript_Core/runtime/NativeErrorConstructor.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/NativeErrorConstructor.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/NativeErrorConstructor.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -56,10 +56,7 @@
{
NativeErrorConstructor* thisObject = jsCast<NativeErrorConstructor*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
-
- InternalFunction::visitChildren(thisObject, visitor);
+ Base::visitChildren(thisObject, visitor);
visitor.append(&thisObject->m_errorStructure);
}
Modified: trunk/Source/_javascript_Core/runtime/NativeErrorConstructor.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/NativeErrorConstructor.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/NativeErrorConstructor.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -55,7 +55,6 @@
private:
NativeErrorConstructor(VM&, Structure*);
- static const unsigned StructureFlags = OverridesVisitChildren | InternalFunction::StructureFlags;
static ConstructType getConstructData(JSCell*, ConstructData&);
static CallType getCallData(JSCell*, CallData&);
static void visitChildren(JSCell*, SlotVisitor&);
Modified: trunk/Source/_javascript_Core/runtime/PropertyMapHashTable.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/PropertyMapHashTable.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/PropertyMapHashTable.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -210,7 +210,7 @@
#endif
protected:
- static const unsigned StructureFlags = OverridesVisitChildren | StructureIsImmortal;
+ static const unsigned StructureFlags = StructureIsImmortal;
private:
PropertyTable(VM&, unsigned initialCapacity);
Modified: trunk/Source/_javascript_Core/runtime/PropertyTable.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/PropertyTable.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/PropertyTable.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -136,7 +136,6 @@
{
PropertyTable* thisObject = jsCast<PropertyTable*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
JSCell::visitChildren(thisObject, visitor);
Modified: trunk/Source/_javascript_Core/runtime/RegExpConstructor.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/RegExpConstructor.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/RegExpConstructor.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -110,9 +110,6 @@
{
RegExpConstructor* thisObject = jsCast<RegExpConstructor*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
-
Base::visitChildren(thisObject, visitor);
thisObject->m_cachedResult.visitChildren(visitor);
}
Modified: trunk/Source/_javascript_Core/runtime/RegExpConstructor.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/RegExpConstructor.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/RegExpConstructor.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -70,7 +70,7 @@
protected:
void finishCreation(VM&, RegExpPrototype*);
- static const unsigned StructureFlags = OverridesGetOwnPropertySlot | OverridesVisitChildren | Base::StructureFlags;
+ static const unsigned StructureFlags = OverridesGetOwnPropertySlot | Base::StructureFlags;
private:
RegExpConstructor(VM&, Structure*, RegExpPrototype*);
Modified: trunk/Source/_javascript_Core/runtime/RegExpMatchesArray.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/RegExpMatchesArray.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/RegExpMatchesArray.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -61,9 +61,6 @@
{
RegExpMatchesArray* thisObject = jsCast<RegExpMatchesArray*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
-
Base::visitChildren(thisObject, visitor);
visitor.append(&thisObject->m_input);
visitor.append(&thisObject->m_regExp);
Modified: trunk/Source/_javascript_Core/runtime/RegExpMatchesArray.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/RegExpMatchesArray.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/RegExpMatchesArray.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -52,7 +52,7 @@
protected:
void finishCreation(VM&);
- static const unsigned StructureFlags = OverridesGetOwnPropertySlot | OverridesVisitChildren | OverridesGetPropertyNames | Base::StructureFlags;
+ static const unsigned StructureFlags = OverridesGetOwnPropertySlot | OverridesGetPropertyNames | Base::StructureFlags;
private:
ALWAYS_INLINE void reifyAllPropertiesIfNecessary(ExecState* exec)
Modified: trunk/Source/_javascript_Core/runtime/RegExpObject.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/RegExpObject.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/RegExpObject.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -81,9 +81,6 @@
{
RegExpObject* thisObject = jsCast<RegExpObject*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
-
Base::visitChildren(thisObject, visitor);
visitor.append(&thisObject->m_regExp);
visitor.append(&thisObject->m_lastIndex);
Modified: trunk/Source/_javascript_Core/runtime/RegExpObject.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/RegExpObject.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/RegExpObject.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -77,7 +77,7 @@
JS_EXPORT_PRIVATE RegExpObject(VM&, Structure*, RegExp*);
JS_EXPORT_PRIVATE void finishCreation(VM&);
- static const unsigned StructureFlags = OverridesVisitChildren | OverridesGetOwnPropertySlot | Base::StructureFlags;
+ static const unsigned StructureFlags = OverridesGetOwnPropertySlot | Base::StructureFlags;
static void visitChildren(JSCell*, SlotVisitor&);
Modified: trunk/Source/_javascript_Core/runtime/SparseArrayValueMap.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/SparseArrayValueMap.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/SparseArrayValueMap.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -69,7 +69,7 @@
void finishCreation(VM&);
- static const unsigned StructureFlags = OverridesVisitChildren | StructureIsImmortal | JSCell::StructureFlags;
+ static const unsigned StructureFlags = StructureIsImmortal | Base::StructureFlags;
public:
DECLARE_EXPORT_INFO;
Modified: trunk/Source/_javascript_Core/runtime/Structure.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/Structure.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/Structure.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -203,7 +203,7 @@
setStaticFunctionsReified(false);
setHasRareData(false);
- TypeInfo typeInfo = TypeInfo(CellType, OverridesVisitChildren | StructureIsImmortal);
+ TypeInfo typeInfo = TypeInfo(CellType, StructureIsImmortal);
m_blob = StructureIDBlob(vm.heap.structureIDTable().allocateID(this), 0, typeInfo);
m_outOfLineTypeFlags = typeInfo.outOfLineTypeFlags();
@@ -1027,7 +1027,6 @@
{
Structure* thisObject = jsCast<Structure*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
JSCell::visitChildren(thisObject, visitor);
visitor.append(&thisObject->m_globalObject);
Modified: trunk/Source/_javascript_Core/runtime/StructureChain.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/StructureChain.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/StructureChain.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -49,7 +49,6 @@
{
StructureChain* thisObject = jsCast<StructureChain*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
size_t i = 0;
while (thisObject->m_vector[i])
visitor.append(&thisObject->m_vector[i++]);
Modified: trunk/Source/_javascript_Core/runtime/StructureChain.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/StructureChain.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/StructureChain.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -67,7 +67,7 @@
static void destroy(JSCell*);
protected:
- static const unsigned StructureFlags = OverridesVisitChildren | StructureIsImmortal;
+ static const unsigned StructureFlags = StructureIsImmortal;
void finishCreation(VM& vm, Structure* head)
{
Modified: trunk/Source/_javascript_Core/runtime/StructureRareData.cpp (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/StructureRareData.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/StructureRareData.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -73,7 +73,6 @@
{
StructureRareData* thisObject = jsCast<StructureRareData*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
JSCell::visitChildren(thisObject, visitor);
visitor.append(&thisObject->m_previous);
Modified: trunk/Source/_javascript_Core/runtime/StructureRareData.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/StructureRareData.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/StructureRareData.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -64,7 +64,7 @@
StructureRareData(VM&, Structure*);
StructureRareData(VM&, const StructureRareData*);
- static const unsigned StructureFlags = OverridesVisitChildren | JSCell::StructureFlags;
+ static const unsigned StructureFlags = JSCell::StructureFlags;
WriteBarrier<Structure> m_previous;
WriteBarrier<JSString> m_objectToStringValue;
Modified: trunk/Source/_javascript_Core/runtime/WeakMapData.h (171938 => 171939)
--- trunk/Source/_javascript_Core/runtime/WeakMapData.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/_javascript_Core/runtime/WeakMapData.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -61,7 +61,7 @@
DECLARE_INFO;
- static const unsigned StructureFlags = OverridesVisitChildren | StructureIsImmortal | Base::StructureFlags;
+ static const unsigned StructureFlags = StructureIsImmortal | Base::StructureFlags;
private:
WeakMapData(VM&);
Modified: trunk/Source/WebCore/ChangeLog (171938 => 171939)
--- trunk/Source/WebCore/ChangeLog 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/WebCore/ChangeLog 2014-08-01 18:57:39 UTC (rev 171939)
@@ -1,3 +1,19 @@
+2014-07-31 Andreas Kling <[email protected]>
+
+ Remove the JSC::OverridesVisitChildren flag.
+ <https://webkit.org/b/135489>
+
+ Tweak the bindings code generator to stop spitting out the flag.
+
+ Reviewed by Geoffrey Garen.
+
+ * bindings/js/JSDOMBinding.h:
+ * bindings/js/JSDOMGlobalObject.cpp:
+ (WebCore::JSDOMGlobalObject::visitChildren):
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateHeader):
+ (GenerateImplementation):
+
2014-08-01 Jer Noble <[email protected]>
[MSE][Mac] Volume is not remembered between items in a YouTube playlist
Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.h (171938 => 171939)
--- trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -102,7 +102,7 @@
}
protected:
- static const unsigned StructureFlags = JSC::ImplementsHasInstance | JSC::OverridesVisitChildren | JSDOMWrapper::StructureFlags;
+ static const unsigned StructureFlags = JSC::ImplementsHasInstance | JSDOMWrapper::StructureFlags;
DOMConstructorObject(JSC::Structure* structure, JSDOMGlobalObject* globalObject)
: JSDOMWrapper(structure, globalObject)
{
Modified: trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp (171938 => 171939)
--- trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -87,8 +87,6 @@
{
JSDOMGlobalObject* thisObject = jsCast<JSDOMGlobalObject*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
Base::visitChildren(thisObject, visitor);
for (auto& structure : thisObject->structures().values())
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (171938 => 171939)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2014-08-01 18:57:39 UTC (rev 171939)
@@ -1006,7 +1006,6 @@
push(@headerContent, " static void visitChildren(JSCell*, JSC::SlotVisitor&);\n");
push(@headerContent, " void visitAdditionalChildren(JSC::SlotVisitor&);\n") if $interface->extendedAttributes->{"JSCustomMarkFunction"};
push(@headerContent, "\n");
- $structureFlags{"JSC::OverridesVisitChildren"} = 1;
}
if ($numCustomAttributes > 0) {
@@ -2863,8 +2862,6 @@
push(@implContent, "{\n");
push(@implContent, " ${className}* thisObject = jsCast<${className}*>(cell);\n");
push(@implContent, " ASSERT_GC_OBJECT_INHERITS(thisObject, info());\n");
- push(@implContent, " COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);\n");
- push(@implContent, " ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());\n");
push(@implContent, " Base::visitChildren(thisObject, visitor);\n");
if ($interface->extendedAttributes->{"EventTarget"} || $interface->name eq "EventTarget") {
push(@implContent, " thisObject->impl().visitJSEventListeners(visitor);\n");
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp (171938 => 171939)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -307,8 +307,6 @@
{
JSTestEventTarget* thisObject = jsCast<JSTestEventTarget*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
Base::visitChildren(thisObject, visitor);
thisObject->impl().visitJSEventListeners(visitor);
}
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.h (171938 => 171939)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -77,7 +77,7 @@
ASSERT(inherits(info()));
}
- static const unsigned StructureFlags = JSC::HasImpureGetOwnPropertySlot | JSC::InterceptsGetOwnPropertySlotByIndexEvenWhenLengthIsNotZero | JSC::MasqueradesAsUndefined | JSC::OverridesGetOwnPropertySlot | JSC::OverridesGetPropertyNames | JSC::OverridesVisitChildren | Base::StructureFlags;
+ static const unsigned StructureFlags = JSC::HasImpureGetOwnPropertySlot | JSC::InterceptsGetOwnPropertySlotByIndexEvenWhenLengthIsNotZero | JSC::MasqueradesAsUndefined | JSC::OverridesGetOwnPropertySlot | JSC::OverridesGetPropertyNames | Base::StructureFlags;
private:
static bool canGetItemsForName(JSC::ExecState*, TestEventTarget*, JSC::PropertyName);
static JSC::EncodedJSValue nameGetter(JSC::ExecState*, JSC::JSObject*, JSC::EncodedJSValue, JSC::PropertyName);
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp (171938 => 171939)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -161,8 +161,6 @@
{
JSTestNode* thisObject = jsCast<JSTestNode*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
Base::visitChildren(thisObject, visitor);
thisObject->impl().visitJSEventListeners(visitor);
}
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.h (171938 => 171939)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -62,7 +62,6 @@
ASSERT(inherits(info()));
}
- static const unsigned StructureFlags = JSC::OverridesVisitChildren | Base::StructureFlags;
};
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (171938 => 171939)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -4378,8 +4378,6 @@
{
JSTestObj* thisObject = jsCast<JSTestObj*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
Base::visitChildren(thisObject, visitor);
visitor.append(&thisObject->m_cachedAttribute1);
visitor.append(&thisObject->m_cachedAttribute2);
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h (171938 => 171939)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -85,7 +85,7 @@
ASSERT(inherits(info()));
}
- static const unsigned StructureFlags = JSC::InterceptsGetOwnPropertySlotByIndexEvenWhenLengthIsNotZero | JSC::OverridesGetOwnPropertySlot | JSC::OverridesVisitChildren | Base::StructureFlags;
+ static const unsigned StructureFlags = JSC::InterceptsGetOwnPropertySlotByIndexEvenWhenLengthIsNotZero | JSC::OverridesGetOwnPropertySlot | Base::StructureFlags;
};
class JSTestObjOwner : public JSC::WeakHandleOwner {
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp (171938 => 171939)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp 2014-08-01 18:57:39 UTC (rev 171939)
@@ -306,8 +306,6 @@
{
JSTestSerializedScriptValueInterface* thisObject = jsCast<JSTestSerializedScriptValueInterface*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
Base::visitChildren(thisObject, visitor);
visitor.append(&thisObject->m_cachedValue);
visitor.append(&thisObject->m_cachedReadonlyValue);
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h (171938 => 171939)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h 2014-08-01 18:54:28 UTC (rev 171938)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h 2014-08-01 18:57:39 UTC (rev 171939)
@@ -77,7 +77,6 @@
ASSERT(inherits(info()));
}
- static const unsigned StructureFlags = JSC::OverridesVisitChildren | Base::StructureFlags;
};
class JSTestSerializedScriptValueInterfaceOwner : public JSC::WeakHandleOwner {
