JavaScriptCore-1097.3.tar.gz

[apple/javascriptcore.git] / runtime / ConstructData.cpp

diff --git a/runtime/ConstructData.cpp b/runtime/ConstructData.cpp
index 7ee59d7ef77bf261c18c16c8190be56aff60957e..5da2a911cc5177a0d9bda27ebb5be8d6ef8d2de2 100644 (file)
--- a/runtime/ConstructData.cpp
+++ b/runtime/ConstructData.cpp
@@ -26,17 +26,17 @@
 #include "config.h"
 #include "ConstructData.h"
 
 #include "config.h"
 #include "ConstructData.h"
 

+#include "Executable.h"
+#include "Interpreter.h"

 #include "JSFunction.h"
 #include "JSFunction.h"

+#include "JSGlobalObject.h"

 
 namespace JSC {
 
 
 namespace JSC {
 

-JSObject* construct(ExecState* exec, JSValue object, ConstructType constructType, const ConstructData& constructData, const ArgList& args)
+JSObject* construct(ExecState* exec, JSValue constructorObject, ConstructType constructType, const ConstructData& constructData, const ArgList& args)

 {
 {

-    if (constructType == ConstructTypeHost)
-        return constructData.native.function(exec, asObject(object), args);
-    ASSERT(constructType == ConstructTypeJS);
-    // FIXME: Can this be done more efficiently using the constructData?
-    return asFunction(object)->construct(exec, args);
+    ASSERT(constructType == ConstructTypeJS || constructType == ConstructTypeHost);
+    return exec->interpreter()->executeConstruct(exec, asObject(constructorObject), constructType, constructData, args);

 }
 
 } // namespace JSC
 }
 
 } // namespace JSC