From 0d3d8aa924f07da2364c73bfb1b4c95cd3429d10 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Wed, 5 Mar 2014 18:03:31 +0100 Subject: Fix MSVC2012 compiler warnings in disabled code. ... that should soon get enabled. Change-Id: I2f8393cab5e99a7f5d3c7df6af6385fefd2d4dd1 Reviewed-by: Lars Knoll --- src/qml/jit/qv4assembler_p.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/qml/jit/qv4assembler_p.h') diff --git a/src/qml/jit/qv4assembler_p.h b/src/qml/jit/qv4assembler_p.h index f28aed6ed1..29e94ea5f0 100644 --- a/src/qml/jit/qv4assembler_p.h +++ b/src/qml/jit/qv4assembler_p.h @@ -354,7 +354,8 @@ public: int frameSize = RegisterSize * calleeSavedRegisterCount; frameSize += savedRegCount * sizeof(QV4::Value); // these get written out as Values, not as native registers - frameSize = WTF::roundUpToMultipleOf(StackAlignment, frameSize + stackSpaceAllocatedOtherwise); + Q_ASSERT(frameSize + stackSpaceAllocatedOtherwise < INT_MAX); + frameSize = static_cast(WTF::roundUpToMultipleOf(StackAlignment, frameSize + stackSpaceAllocatedOtherwise)); frameSize -= stackSpaceAllocatedOtherwise; return frameSize; @@ -962,7 +963,8 @@ public: + StackShadowSpace; if (stackSpaceNeeded) { - stackSpaceNeeded = WTF::roundUpToMultipleOf(StackAlignment, stackSpaceNeeded); + Q_ASSERT(stackSpaceNeeded < (INT_MAX - StackAlignment)); + stackSpaceNeeded = static_cast(WTF::roundUpToMultipleOf(StackAlignment, stackSpaceNeeded)); sub32(TrustedImm32(stackSpaceNeeded), StackPointerRegister); } -- cgit v1.2.3