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/JSSetIterator.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'Source/JavaScriptCore/runtime/JSSetIterator.cpp') diff --git a/Source/JavaScriptCore/runtime/JSSetIterator.cpp b/Source/JavaScriptCore/runtime/JSSetIterator.cpp index b1d8a6512..634c2ace1 100644 --- a/Source/JavaScriptCore/runtime/JSSetIterator.cpp +++ b/Source/JavaScriptCore/runtime/JSSetIterator.cpp @@ -29,27 +29,26 @@ #include "JSCJSValueInlines.h" #include "JSCellInlines.h" #include "JSSet.h" +#include "MapDataInlines.h" #include "SlotVisitorInlines.h" +#include "StructureInlines.h" namespace JSC { -const ClassInfo JSSetIterator::s_info = { "Set Iterator", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(JSSetIterator) }; +const ClassInfo JSSetIterator::s_info = { "Set Iterator", &Base::s_info, 0, CREATE_METHOD_TABLE(JSSetIterator) }; void JSSetIterator::finishCreation(VM& vm, JSSet* iteratedObject) { Base::finishCreation(vm); - m_iteratedObjectData.set(vm, this, iteratedObject->mapData()); + m_set.set(vm, this, iteratedObject); } void JSSetIterator::visitChildren(JSCell* cell, SlotVisitor& visitor) { JSSetIterator* 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_iteratedObjectData); + visitor.append(&thisObject->m_set); } JSValue JSSetIterator::createPair(CallFrame* callFrame, JSValue key, JSValue value) @@ -61,4 +60,11 @@ JSValue JSSetIterator::createPair(CallFrame* callFrame, JSValue key, JSValue val return constructArray(callFrame, 0, globalObject, args); } +JSSetIterator* JSSetIterator::clone(ExecState* exec) +{ + auto clone = JSSetIterator::create(exec->vm(), exec->callee()->globalObject()->setIteratorStructure(), m_set.get(), m_kind); + clone->m_iterator = m_iterator; + return clone; +} + } -- cgit v1.2.1