diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-26 14:49:54 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-26 17:03:38 (GMT) |
| commit | ea3955ca80ab6e067c58aa9def4055a53020cd90 (patch) | |
| tree | 7f49fcf82baff2ccc1f28b26f111c87022c5cbf8 /src/3rdparty | |
| parent | a3ceb3627c0270274caa5818d34689b7bd81e2e3 (diff) | |
| download | Qt-ea3955ca80ab6e067c58aa9def4055a53020cd90.zip Qt-ea3955ca80ab6e067c58aa9def4055a53020cd90.tar.gz Qt-ea3955ca80ab6e067c58aa9def4055a53020cd90.tar.bz2 | |
make JIT construct objects of type QScriptObject, not JSC::JSObject
Commit 25e76959da84fe4c40f98cf32b7b8c69e5087681 changed it for the
interpreter, this commit makes it work with the JIT enabled as well.
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.cpp b/src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.cpp index 40d2182..2563848 100644 --- a/src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.cpp @@ -58,6 +58,10 @@ #include "SamplingTool.h" #include <stdio.h> +#ifdef QT_BUILD_SCRIPT_LIB +#include "bridge/qscriptobject_p.h" +#endif + using namespace std; namespace JSC { @@ -1470,7 +1474,11 @@ DEFINE_STUB_FUNCTION(JSObject*, op_construct_JSConstruct) structure = asObject(stackFrame.args[3].jsValue())->inheritorID(); else structure = constructor->scope().node()->globalObject()->emptyObjectStructure(); +#ifdef QT_BUILD_SCRIPT_LIB + return new (stackFrame.globalData) QScriptObject(structure); +#else return new (stackFrame.globalData) JSObject(structure); +#endif } DEFINE_STUB_FUNCTION(EncodedJSValue, op_construct_NotJSConstruct) |