diff options
Diffstat (limited to 'Source/JavaScriptCore/runtime/ConstructData.cpp')
-rw-r--r-- | Source/JavaScriptCore/runtime/ConstructData.cpp | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/Source/JavaScriptCore/runtime/ConstructData.cpp b/Source/JavaScriptCore/runtime/ConstructData.cpp index 3dc46180c..0a4eecbff 100644 --- a/Source/JavaScriptCore/runtime/ConstructData.cpp +++ b/Source/JavaScriptCore/runtime/ConstructData.cpp @@ -28,16 +28,34 @@ #include "Executable.h" #include "Interpreter.h" +#include "JSCInlines.h" #include "JSFunction.h" #include "JSGlobalObject.h" -#include "Operations.h" +#include "ScriptProfilingScope.h" namespace JSC { -JSObject* construct(ExecState* exec, JSValue constructorObject, ConstructType constructType, const ConstructData& constructData, const ArgList& args) +JSObject* construct(ExecState* exec, JSValue constructorObject, const ArgList& args, const String& errorMessage) +{ + ConstructData constructData; + ConstructType constructType = getConstructData(constructorObject, constructData); + if (constructType == ConstructTypeNone) + return throwTypeError(exec, errorMessage); + + return construct(exec, constructorObject, constructType, constructData, args, constructorObject); +} + + +JSObject* construct(ExecState* exec, JSValue constructorObject, ConstructType constructType, const ConstructData& constructData, const ArgList& args, JSValue newTarget) { ASSERT(constructType == ConstructTypeJS || constructType == ConstructTypeHost); - return exec->interpreter()->executeConstruct(exec, asObject(constructorObject), constructType, constructData, args); + return exec->interpreter()->executeConstruct(exec, asObject(constructorObject), constructType, constructData, args, newTarget); +} + +JSObject* profiledConstruct(ExecState* exec, ProfilingReason reason, JSValue constructorObject, ConstructType constructType, const ConstructData& constructData, const ArgList& args, JSValue newTarget) +{ + ScriptProfilingScope profilingScope(exec->vmEntryGlobalObject(), reason); + return construct(exec, constructorObject, constructType, constructData, args, newTarget); } } // namespace JSC |