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 --- .../JavaScriptCore/runtime/FunctionConstructor.cpp | 53 ++++++++++++---------- 1 file changed, 30 insertions(+), 23 deletions(-) (limited to 'Source/JavaScriptCore/runtime/FunctionConstructor.cpp') diff --git a/Source/JavaScriptCore/runtime/FunctionConstructor.cpp b/Source/JavaScriptCore/runtime/FunctionConstructor.cpp index 53de63271..cda30b957 100644 --- a/Source/JavaScriptCore/runtime/FunctionConstructor.cpp +++ b/Source/JavaScriptCore/runtime/FunctionConstructor.cpp @@ -29,7 +29,7 @@ #include "JSString.h" #include "Lexer.h" #include "Nodes.h" -#include "Operations.h" +#include "JSCInlines.h" #include "Parser.h" #include @@ -37,7 +37,7 @@ namespace JSC { STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(FunctionConstructor); -const ClassInfo FunctionConstructor::s_info = { "Function", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(FunctionConstructor) }; +const ClassInfo FunctionConstructor::s_info = { "Function", &Base::s_info, 0, CREATE_METHOD_TABLE(FunctionConstructor) }; FunctionConstructor::FunctionConstructor(VM& vm, Structure* structure) : InternalFunction(vm, structure) @@ -56,7 +56,7 @@ void FunctionConstructor::finishCreation(VM& vm, FunctionPrototype* functionProt static EncodedJSValue JSC_HOST_CALL constructWithFunctionConstructor(ExecState* exec) { ArgList args(exec); - return JSValue::encode(constructFunction(exec, asInternalFunction(exec->callee())->globalObject(), args)); + return JSValue::encode(constructFunction(exec, asInternalFunction(exec->callee())->globalObject(), args, FunctionConstructionMode::Function, exec->newTarget())); } ConstructType FunctionConstructor::getConstructData(JSCell*, ConstructData& constructData) @@ -79,52 +79,59 @@ CallType FunctionConstructor::getCallData(JSCell*, CallData& callData) } // ECMA 15.3.2 The Function Constructor -JSObject* constructFunction(ExecState* exec, JSGlobalObject* globalObject, const ArgList& args, const Identifier& functionName, const String& sourceURL, const TextPosition& position) +JSObject* constructFunction(ExecState* exec, JSGlobalObject* globalObject, const ArgList& args, const Identifier& functionName, const String& sourceURL, const TextPosition& position, FunctionConstructionMode functionConstructionMode, JSValue newTarget) { if (!globalObject->evalEnabled()) return exec->vm().throwException(exec, createEvalError(exec, globalObject->evalDisabledErrorMessage())); - return constructFunctionSkippingEvalEnabledCheck(exec, globalObject, args, functionName, sourceURL, position); + return constructFunctionSkippingEvalEnabledCheck(exec, globalObject, args, functionName, sourceURL, position, -1, functionConstructionMode, newTarget); } -JSObject* constructFunctionSkippingEvalEnabledCheck(ExecState* exec, JSGlobalObject* globalObject, const ArgList& args, const Identifier& functionName, const String& sourceURL, const TextPosition& position) +JSObject* constructFunctionSkippingEvalEnabledCheck( + ExecState* exec, JSGlobalObject* globalObject, const ArgList& args, + const Identifier& functionName, const String& sourceURL, + const TextPosition& position, int overrideLineNumber, FunctionConstructionMode functionConstructionMode, JSValue newTarget) { - // Functions need to have a space following the opening { due to for web compatibility - // see https://bugs.webkit.org/show_bug.cgi?id=24350 - // We also need \n before the closing } to handle // comments at the end of the last line + // How we stringify functions is sometimes important for web compatibility. + // See https://bugs.webkit.org/show_bug.cgi?id=24350. String program; if (args.isEmpty()) - program = ASCIILiteral("(function() {\n})"); + program = makeString("{function ", functionConstructionMode == FunctionConstructionMode::Generator ? "*" : "", functionName.string(), "() {\n\n}}"); else if (args.size() == 1) - program = makeString("(function() {", args.at(0).toString(exec)->value(exec), "\n})"); + program = makeString("{function ", functionConstructionMode == FunctionConstructionMode::Generator ? "*" : "", functionName.string(), "() {\n", args.at(0).toString(exec)->value(exec), "\n}}"); else { StringBuilder builder; - builder.appendLiteral("(function("); - builder.append(args.at(0).toString(exec)->value(exec)); + builder.appendLiteral("{function "); + if (functionConstructionMode == FunctionConstructionMode::Generator) + builder.append('*'); + builder.append(functionName.string()); + builder.append('('); + builder.append(args.at(0).toString(exec)->view(exec).get()); for (size_t i = 1; i < args.size() - 1; i++) { - builder.append(','); - builder.append(args.at(i).toString(exec)->value(exec)); + builder.appendLiteral(", "); + builder.append(args.at(i).toString(exec)->view(exec).get()); } - builder.appendLiteral(") {"); - builder.append(args.at(args.size() - 1).toString(exec)->value(exec)); - builder.appendLiteral("\n})"); + builder.appendLiteral(") {\n"); + builder.append(args.at(args.size() - 1).toString(exec)->view(exec).get()); + builder.appendLiteral("\n}}"); program = builder.toString(); } SourceCode source = makeSource(program, sourceURL, position); - JSObject* exception = 0; - FunctionExecutable* function = FunctionExecutable::fromGlobalCode(functionName, exec, exec->vmEntryGlobalObject()->debugger(), source, &exception); + JSObject* exception = nullptr; + FunctionExecutable* function = FunctionExecutable::fromGlobalCode(functionName, *exec, source, exception, overrideLineNumber); if (!function) { ASSERT(exception); return exec->vm().throwException(exec, exception); } - return JSFunction::create(exec->vm(), function, globalObject); + + return JSFunction::create(exec->vm(), function, globalObject, InternalFunction::createSubclassStructure(exec, newTarget, globalObject->functionStructure())); } // ECMA 15.3.2 The Function Constructor -JSObject* constructFunction(ExecState* exec, JSGlobalObject* globalObject, const ArgList& args) +JSObject* constructFunction(ExecState* exec, JSGlobalObject* globalObject, const ArgList& args, FunctionConstructionMode functionConstructionMode, JSValue newTarget) { - return constructFunction(exec, globalObject, args, exec->propertyNames().anonymous, String(), TextPosition::minimumPosition()); + return constructFunction(exec, globalObject, args, exec->propertyNames().anonymous, String(), TextPosition::minimumPosition(), functionConstructionMode, newTarget); } } // namespace JSC -- cgit v1.2.1