webkitgtk-2.4.9webkitgtk-2.4.9

1 files changed, 10 insertions, 81 deletions

diff --git a/Source/JavaScriptCore/runtime/MapConstructor.cpp b/Source/JavaScriptCore/runtime/MapConstructor.cpp
index fad52c056..9e3a4bf3b 100644
--- a/Source/JavaScriptCore/runtime/MapConstructor.cpp
+++ b/Source/JavaScriptCore/runtime/MapConstructor.cpp
@@ -27,17 +27,15 @@
 #include "MapConstructor.h"
 
 #include "Error.h"
-#include "IteratorOperations.h"
 #include "JSCJSValueInlines.h"
 #include "JSCellInlines.h"
 #include "JSGlobalObject.h"
 #include "JSMap.h"
 #include "MapPrototype.h"
-#include "StructureInlines.h"
 
 namespace JSC {
 
-const ClassInfo MapConstructor::s_info = { "Function", &Base::s_info, 0, CREATE_METHOD_TABLE(MapConstructor) };
+const ClassInfo MapConstructor::s_info = { "Function", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(MapConstructor) };
 
 void MapConstructor::finishCreation(VM& vm, MapPrototype* mapPrototype)
 {
@@ -46,87 +44,18 @@ void MapConstructor::finishCreation(VM& vm, MapPrototype* mapPrototype)
     putDirectWithoutTransition(vm, vm.propertyNames->length, jsNumber(0), ReadOnly | DontEnum | DontDelete);
 }
 
-static EncodedJSValue JSC_HOST_CALL callMap(ExecState* exec)
-{
-    return JSValue::encode(throwTypeError(exec, ASCIILiteral("Map cannot be called as a function")));
-}
-
 static EncodedJSValue JSC_HOST_CALL constructMap(ExecState* exec)
 {
+    // Until we have iterators we throw if we've been given
+    // any arguments that could require us to throw.
+    if (!exec->argument(0).isUndefinedOrNull())
+        return JSValue::encode(throwTypeError(exec, ASCIILiteral("Map constructor does not accept arguments")));
+    if (!exec->argument(1).isUndefined())
+        return throwVMError(exec, createRangeError(exec, WTF::ASCIILiteral("Invalid comparator function")));
+
     JSGlobalObject* globalObject = asInternalFunction(exec->callee())->globalObject();
     Structure* mapStructure = globalObject->mapStructure();
-    JSMap* map = JSMap::create(exec, mapStructure);
-    JSValue iterable = exec->argument(0);
-    if (iterable.isUndefinedOrNull())
-        return JSValue::encode(map);
-
-    JSValue adderFunction = map->JSObject::get(exec, exec->propertyNames().set);
-    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(map);
-
-        JSValue nextItem = iteratorValue(exec, next);
-        if (exec->hadException())
-            return JSValue::encode(jsUndefined());
-
-        if (!nextItem.isObject()) {
-            throwTypeError(exec);
-            iteratorClose(exec, iterator);
-            return JSValue::encode(jsUndefined());
-        }
-
-        JSValue key = nextItem.get(exec, 0);
-        if (exec->hadException()) {
-            iteratorClose(exec, iterator);
-            return JSValue::encode(jsUndefined());
-        }
-
-        JSValue value = nextItem.get(exec, 1);
-        if (exec->hadException()) {
-            iteratorClose(exec, iterator);
-            return JSValue::encode(jsUndefined());
-        }
-
-        MarkedArgumentBuffer arguments;
-        arguments.append(key);
-        arguments.append(value);
-        call(exec, adderFunction, adderFunctionCallType, adderFunctionCallData, map, arguments);
-        if (exec->hadException()) {
-            iteratorClose(exec, iterator);
-            return JSValue::encode(jsUndefined());
-        }
-    }
-    RELEASE_ASSERT_NOT_REACHED();
-    return JSValue::encode(map);
+    return JSValue::encode(JSMap::create(exec, mapStructure));
 }
 
 ConstructType MapConstructor::getConstructData(JSCell*, ConstructData& constructData)
@@ -137,7 +66,7 @@ ConstructType MapConstructor::getConstructData(JSCell*, ConstructData& construct
 
 CallType MapConstructor::getCallData(JSCell*, CallData& callData)
 {
-    callData.native.function = callMap;
+    callData.native.function = constructMap;
     return CallTypeHost;
 }