1 files changed, 62 insertions, 20 deletions

diff --git a/Source/JavaScriptCore/runtime/MapConstructor.cpp b/Source/JavaScriptCore/runtime/MapConstructor.cpp
index 9e3a4bf3b..6b34725cc 100644
--- a/Source/JavaScriptCore/runtime/MapConstructor.cpp
+++ b/Source/JavaScriptCore/runtime/MapConstructor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013, 2016 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,47 +27,89 @@
 #include "MapConstructor.h"
 
 #include "Error.h"
-#include "JSCJSValueInlines.h"
-#include "JSCellInlines.h"
+#include "GetterSetter.h"
+#include "IteratorOperations.h"
+#include "JSCInlines.h"
 #include "JSGlobalObject.h"
 #include "JSMap.h"
+#include "JSObjectInlines.h"
 #include "MapPrototype.h"
 
 namespace JSC {
 
-const ClassInfo MapConstructor::s_info = { "Function", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(MapConstructor) };
+const ClassInfo MapConstructor::s_info = { "Function", &Base::s_info, 0, CREATE_METHOD_TABLE(MapConstructor) };
 
-void MapConstructor::finishCreation(VM& vm, MapPrototype* mapPrototype)
+void MapConstructor::finishCreation(VM& vm, MapPrototype* mapPrototype, GetterSetter* speciesSymbol)
 {
-    Base::finishCreation(vm, mapPrototype->classInfo()->className);
+    Base::finishCreation(vm, mapPrototype->classInfo(vm)->className);
     putDirectWithoutTransition(vm, vm.propertyNames->prototype, mapPrototype, DontEnum | DontDelete | ReadOnly);
-    putDirectWithoutTransition(vm, vm.propertyNames->length, jsNumber(0), ReadOnly | DontEnum | DontDelete);
+    putDirectWithoutTransition(vm, vm.propertyNames->length, jsNumber(0), DontEnum | ReadOnly);
+    putDirectNonIndexAccessor(vm, vm.propertyNames->speciesSymbol, speciesSymbol, Accessor | ReadOnly | DontEnum);
+}
+
+static EncodedJSValue JSC_HOST_CALL callMap(ExecState* exec)
+{
+    VM& vm = exec->vm();
+    auto scope = DECLARE_THROW_SCOPE(vm);
+    return JSValue::encode(throwConstructorCannotBeCalledAsFunctionTypeError(exec, scope, "Map"));
 }
 
 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();
-    return JSValue::encode(JSMap::create(exec, mapStructure));
+    VM& vm = exec->vm();
+    auto scope = DECLARE_THROW_SCOPE(vm);
+
+    JSGlobalObject* globalObject = asInternalFunction(exec->jsCallee())->globalObject();
+    Structure* mapStructure = InternalFunction::createSubclassStructure(exec, exec->newTarget(), globalObject->mapStructure());
+    RETURN_IF_EXCEPTION(scope, encodedJSValue());
+    JSMap* map = JSMap::create(exec, vm, mapStructure);
+    RETURN_IF_EXCEPTION(scope, encodedJSValue());
+    JSValue iterable = exec->argument(0);
+    if (iterable.isUndefinedOrNull())
+        return JSValue::encode(map);
+
+    JSValue adderFunction = map->JSObject::get(exec, exec->propertyNames().set);
+    RETURN_IF_EXCEPTION(scope, encodedJSValue());
+
+    CallData adderFunctionCallData;
+    CallType adderFunctionCallType = getCallData(adderFunction, adderFunctionCallData);
+    if (adderFunctionCallType == CallType::None)
+        return JSValue::encode(throwTypeError(exec, scope));
+
+    scope.release();
+    forEachInIterable(exec, iterable, [&](VM& vm, ExecState* exec, JSValue nextItem) {
+        auto scope = DECLARE_THROW_SCOPE(vm);
+        if (!nextItem.isObject()) {
+            throwTypeError(exec, scope);
+            return;
+        }
+
+        JSValue key = nextItem.get(exec, static_cast<unsigned>(0));
+        RETURN_IF_EXCEPTION(scope, void());
+
+        JSValue value = nextItem.get(exec, static_cast<unsigned>(1));
+        RETURN_IF_EXCEPTION(scope, void());
+
+        MarkedArgumentBuffer arguments;
+        arguments.append(key);
+        arguments.append(value);
+        scope.release();
+        call(exec, adderFunction, adderFunctionCallType, adderFunctionCallData, map, arguments);
+    });
+
+    return JSValue::encode(map);
 }
 
 ConstructType MapConstructor::getConstructData(JSCell*, ConstructData& constructData)
 {
     constructData.native.function = constructMap;
-    return ConstructTypeHost;
+    return ConstructType::Host;
 }
 
 CallType MapConstructor::getCallData(JSCell*, CallData& callData)
 {
-    callData.native.function = constructMap;
-    return CallTypeHost;
+    callData.native.function = callMap;
+    return CallType::Host;
 }
 
 }