summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@nokia.com>2010-09-07 15:05:46 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2010-09-09 05:35:59 (GMT)
commit92f32e3765621d29595436ae8283021cb046e8a9 (patch)
tree5e8f088bc1d0935d2699908def595136637c7e24
parent8894fe649ff5f52c7f365299bf612e42ed8173df (diff)
downloadQt-92f32e3765621d29595436ae8283021cb046e8a9.zip
Qt-92f32e3765621d29595436ae8283021cb046e8a9.tar.gz
Qt-92f32e3765621d29595436ae8283021cb046e8a9.tar.bz2
QtWebKit: Downstream patch 1 fixing a crash on MSVC 64bit.
http://bugreports.qt.nokia.com/browse/QTBUG-13279 Sha1 on qtwebkit.git: 8c902b12f771829cecd22edb7742636c8de816c2 Reviewed-by: Simon Hausmann (cherry picked from commit b080eccb98ab861d6625b1980b323a62bed3d50a)
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp b/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp
index 73efc0d..9e2e788 100644
--- a/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp
+++ b/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp
@@ -3465,16 +3465,16 @@ skip_id_custom_self:
goto vm_throw;
}
ASSERT(!callFrame->callee()->isHostFunction());
- uint32_t expectedParams = callFrame->callee()->jsExecutable()->parameterCount();
- uint32_t inplaceArgs = min(argCount, expectedParams);
- uint32_t i = 0;
+ int32_t expectedParams = callFrame->callee()->jsExecutable()->parameterCount();
+ int32_t inplaceArgs = min(static_cast<int32_t>(argCount), expectedParams);
+ int32_t i = 0;
Register* argStore = callFrame->registers() + argsOffset;
// First step is to copy the "expected" parameters from their normal location relative to the callframe
for (; i < inplaceArgs; i++)
argStore[i] = callFrame->registers()[i - RegisterFile::CallFrameHeaderSize - expectedParams];
// Then we copy any additional arguments that may be further up the stack ('-1' to account for 'this')
- for (; i < argCount; i++)
+ for (; i < static_cast<int32_t>(argCount); i++)
argStore[i] = callFrame->registers()[i - RegisterFile::CallFrameHeaderSize - expectedParams - argCount - 1];
} else if (!arguments.isUndefinedOrNull()) {
if (!arguments.isObject()) {