diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2014-03-05 18:03:31 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-07 12:20:24 +0100 |
| commit | 0d3d8aa924f07da2364c73bfb1b4c95cd3429d10 (patch) | |
| tree | e6e1cfe92f1fddda96cc8f33c4e487cb0d3491e4 /src/qml/jit/qv4assembler_p.h | |
| parent | 289d93f785dc3006dd77c33e121c110c5176ac6d (diff) | |
Fix MSVC2012 compiler warnings in disabled code.
... that should soon get enabled.
Change-Id: I2f8393cab5e99a7f5d3c7df6af6385fefd2d4dd1
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/jit/qv4assembler_p.h')
| -rw-r--r-- | src/qml/jit/qv4assembler_p.h | 6 |
1 files changed, 4 insertions, 2 deletions
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<int>(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<int>(WTF::roundUpToMultipleOf(StackAlignment, stackSpaceNeeded)); sub32(TrustedImm32(stackSpaceNeeded), StackPointerRegister); } |