From a4e969f4965059196ca948db781e52f7cfebf19e Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 24 May 2016 08:28:08 +0000 Subject: webkitgtk-2.12.3 --- Source/JavaScriptCore/runtime/JSSymbolTableObject.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'Source/JavaScriptCore/runtime/JSSymbolTableObject.cpp') diff --git a/Source/JavaScriptCore/runtime/JSSymbolTableObject.cpp b/Source/JavaScriptCore/runtime/JSSymbolTableObject.cpp index 2ac2524c5..1e78b7d04 100644 --- a/Source/JavaScriptCore/runtime/JSSymbolTableObject.cpp +++ b/Source/JavaScriptCore/runtime/JSSymbolTableObject.cpp @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * 3. Neither the name of Apple Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * @@ -29,10 +29,9 @@ #include "config.h" #include "JSSymbolTableObject.h" -#include "JSActivation.h" #include "JSGlobalObject.h" -#include "JSNameScope.h" -#include "Operations.h" +#include "JSLexicalEnvironment.h" +#include "JSCInlines.h" #include "PropertyNameArray.h" namespace JSC { @@ -41,9 +40,6 @@ void JSSymbolTableObject::visitChildren(JSCell* cell, SlotVisitor& visitor) { JSSymbolTableObject* thisObject = jsCast(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); } @@ -51,7 +47,7 @@ void JSSymbolTableObject::visitChildren(JSCell* cell, SlotVisitor& visitor) bool JSSymbolTableObject::deleteProperty(JSCell* cell, ExecState* exec, PropertyName propertyName) { JSSymbolTableObject* thisObject = jsCast(cell); - if (thisObject->symbolTable()->contains(propertyName.publicName())) + if (thisObject->symbolTable()->contains(propertyName.uid())) return false; return JSObject::deleteProperty(thisObject, exec, propertyName); @@ -64,8 +60,11 @@ void JSSymbolTableObject::getOwnNonIndexPropertyNames(JSObject* object, ExecStat ConcurrentJITLocker locker(thisObject->symbolTable()->m_lock); SymbolTable::Map::iterator end = thisObject->symbolTable()->end(locker); for (SymbolTable::Map::iterator it = thisObject->symbolTable()->begin(locker); it != end; ++it) { - if (!(it->value.getAttributes() & DontEnum) || (mode == IncludeDontEnumProperties)) - propertyNames.add(Identifier(exec, it->key.get())); + if (!(it->value.getAttributes() & DontEnum) || mode.includeDontEnumProperties()) { + if (it->key->isSymbol() && !propertyNames.includeSymbolProperties()) + continue; + propertyNames.add(Identifier::fromUid(exec, it->key.get())); + } } } -- cgit v1.2.1