diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-28 12:44:45 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-28 12:44:45 (GMT) |
| commit | 53826d67541498a3531d7f3edb4d6aa2733d37b6 (patch) | |
| tree | 8e98c1c3e7a9ea21de2740aca410b42186da927c /src | |
| parent | 8694efe1973296c9245b18e1efc00f658fb3486e (diff) | |
| parent | b0885663f2192eb5eb27f8a8032e7e05b19e3736 (diff) | |
| download | Qt-53826d67541498a3531d7f3edb4d6aa2733d37b6.zip Qt-53826d67541498a3531d7f3edb4d6aa2733d37b6.tar.gz Qt-53826d67541498a3531d7f3edb4d6aa2733d37b6.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp | 4 | ||||
| -rw-r--r-- | src/3rdparty/javascriptcore/VERSION | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp index ec242cc..c31216b 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp @@ -435,7 +435,7 @@ void Interpreter::dumpRegisters(CallFrame* callFrame) printf("[ReturnPC] | %10p | %p \n", it, (*it).vPC()); ++it; printf("[ReturnValueRegister] | %10p | %d \n", it, (*it).i()); ++it; printf("[ArgumentCount] | %10p | %d \n", it, (*it).i()); ++it; - printf("[Callee] | %10p | %p \n", it, (*it).function()); ++it; + printf("[Callee] | %10p | %p \n", it, (*it).object()); ++it; printf("[OptionalCalleeArguments] | %10p | %p \n", it, (*it).arguments()); ++it; printf("-----------------------------------------------------------------------------\n"); @@ -3113,7 +3113,7 @@ JSValue Interpreter::privateExecute(ExecutionFlag flag, RegisterFile* registerFi exceptionValue = createStackOverflowError(callFrame); goto vm_throw; } - ASSERT(!callFrame->callee()->isHostFunction()); + ASSERT(!asFunction(callFrame->callee())->isHostFunction()); int32_t expectedParams = static_cast<JSFunction*>(callFrame->callee())->jsExecutable()->parameterCount(); int32_t inplaceArgs = min(argCount, expectedParams); int32_t i = 0; diff --git a/src/3rdparty/javascriptcore/VERSION b/src/3rdparty/javascriptcore/VERSION index 6160986..ae70d26 100644 --- a/src/3rdparty/javascriptcore/VERSION +++ b/src/3rdparty/javascriptcore/VERSION @@ -4,8 +4,8 @@ This is a snapshot of JavaScriptCore from The commit imported was from the - jsc-for-qtscript-4.6-staging-24092009 branch/tag + jsc-for-qtscript-4.6-staging-28092009 branch/tag and has the sha1 checksum - 6906f46c84e6b20612db58018334cb6823d0a18a + b98dec961e9389ddd5e10d7c4086de9a297cb984 |