webkitgtk-2.4.9webkitgtk-2.4.9

1 files changed, 20 insertions, 58 deletions

diff --git a/Source/JavaScriptCore/runtime/SetConstructor.cpp b/Source/JavaScriptCore/runtime/SetConstructor.cpp
index fb97b6d9f..b203888d3 100644
--- a/Source/JavaScriptCore/runtime/SetConstructor.cpp
+++ b/Source/JavaScriptCore/runtime/SetConstructor.cpp
@@ -27,18 +27,16 @@
 #include "SetConstructor.h"
 
 #include "Error.h"
-#include "IteratorOperations.h"
 #include "JSCJSValueInlines.h"
 #include "JSCellInlines.h"
 #include "JSGlobalObject.h"
 #include "JSSet.h"
 #include "MapData.h"
 #include "SetPrototype.h"
-#include "StructureInlines.h"
 
 namespace JSC {
 
-const ClassInfo SetConstructor::s_info = { "Function", &Base::s_info, 0, CREATE_METHOD_TABLE(SetConstructor) };
+const ClassInfo SetConstructor::s_info = { "Function", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(SetConstructor) };
 
 void SetConstructor::finishCreation(VM& vm, SetPrototype* setPrototype)
 {
@@ -47,67 +45,31 @@ void SetConstructor::finishCreation(VM& vm, SetPrototype* setPrototype)
     putDirectWithoutTransition(vm, vm.propertyNames->length, jsNumber(0), ReadOnly | DontEnum | DontDelete);
 }
 
-static EncodedJSValue JSC_HOST_CALL callSet(ExecState* exec)
+static EncodedJSValue JSC_HOST_CALL callSet(CallFrame* callFrame)
 {
-    return JSValue::encode(throwTypeError(exec, ASCIILiteral("Set cannot be called as a function")));
+    // Until we have iterators we throw if we've been given
+    // any arguments that could require us to throw.
+    if (!callFrame->argument(0).isUndefinedOrNull())
+        return JSValue::encode(throwTypeError(callFrame, ASCIILiteral("Set does not accept arguments when called as a function")));
+    if (!callFrame->argument(1).isUndefined())
+        return throwVMError(callFrame, createRangeError(callFrame, WTF::ASCIILiteral("Invalid comparator function")));
+
+    JSGlobalObject* globalObject = asInternalFunction(callFrame->callee())->globalObject();
+    Structure* setStructure = globalObject->setStructure();
+    return JSValue::encode(JSSet::create(callFrame, setStructure));
 }
 
-static EncodedJSValue JSC_HOST_CALL constructSet(ExecState* exec)
+static EncodedJSValue JSC_HOST_CALL constructSet(CallFrame* callFrame)
 {
-    JSGlobalObject* globalObject = asInternalFunction(exec->callee())->globalObject();
+    JSGlobalObject* globalObject = asInternalFunction(callFrame->callee())->globalObject();
     Structure* setStructure = globalObject->setStructure();
-    JSSet* set = JSSet::create(exec, setStructure);
-    JSValue iterable = exec->argument(0);
-    if (iterable.isUndefinedOrNull())
-        return JSValue::encode(set);
-
-    JSValue adderFunction = set->get(exec, exec->propertyNames().add);
-    if (exec->hadException())
-        return JSValue::encode(jsUndefined());
-
-    CallData adderFunctionCallData;
-    CallType adderFunctionCallType = getCallData(adderFunction, adderFunctionCallData);
-    if (adderFunctionCallType == CallTypeNone)
-        return JSValue::encode(throwTypeError(exec));
-
-    JSValue iteratorFunction = iterable.get(exec, exec->propertyNames().iteratorSymbol);
-    if (exec->hadException())
-        return JSValue::encode(jsUndefined());
-
-    CallData iteratorFunctionCallData;
-    CallType iteratorFunctionCallType = getCallData(iteratorFunction, iteratorFunctionCallData);
-    if (iteratorFunctionCallType == CallTypeNone)
-        return JSValue::encode(throwTypeError(exec));
-
-    ArgList iteratorFunctionArguments;
-    JSValue iterator = call(exec, iteratorFunction, iteratorFunctionCallType, iteratorFunctionCallData, iterable, iteratorFunctionArguments);
-    if (exec->hadException())
-        return JSValue::encode(jsUndefined());
-
-    if (!iterator.isObject())
-        return JSValue::encode(throwTypeError(exec));
-
-    while (true) {
-        JSValue next = iteratorStep(exec, iterator);
-        if (exec->hadException())
-            return JSValue::encode(jsUndefined());
-
-        if (next.isFalse())
-            return JSValue::encode(set);
-
-        JSValue nextValue = iteratorValue(exec, next);
-        if (exec->hadException())
-            return JSValue::encode(jsUndefined());
-
-        MarkedArgumentBuffer arguments;
-        arguments.append(nextValue);
-        call(exec, adderFunction, adderFunctionCallType, adderFunctionCallData, set, arguments);
-        if (exec->hadException()) {
-            iteratorClose(exec, iterator);
-            return JSValue::encode(jsUndefined());
-        }
+    JSSet* set = JSSet::create(callFrame, setStructure);
+    MapData* mapData = set->mapData();
+    size_t count = callFrame->argumentCount();
+    for (size_t i = 0; i < count; i++) {
+        JSValue item = callFrame->uncheckedArgument(i);
+        mapData->set(callFrame, item, item);
     }
-    RELEASE_ASSERT_NOT_REACHED();
     return JSValue::encode(set);
 }