diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-14 11:35:11 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-14 11:35:30 +0200 |
| commit | 809b5e2fc1cc5935c2dd7d63992c7a94dfce4dd8 (patch) | |
| tree | c0f08d106a16f12a89e13550d58d424d0f9cba6a /src/qml/jit | |
| parent | dc4e537d4cfe16aaa88b6edd911571317241ab32 (diff) | |
| parent | da7df10b3d5769d1da7851895d27257a0d930012 (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Change-Id: I2e06c2fcd8aa9d5d090f0568be75272ec82f7b20
Diffstat (limited to 'src/qml/jit')
| -rw-r--r-- | src/qml/jit/qv4assembler_p.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/qml/jit/qv4assembler_p.h b/src/qml/jit/qv4assembler_p.h index 32f709c5d2..5e868c3b11 100644 --- a/src/qml/jit/qv4assembler_p.h +++ b/src/qml/jit/qv4assembler_p.h @@ -225,11 +225,10 @@ public: return frameSize; } + /// \return the stack frame size in number of Value items. int calculateJSStackFrameSize() const { - const int locals = (localCount + sizeof(QV4::CallData)/sizeof(QV4::Value) - 1 + maxOutgoingArgumentCount) + 1; - int frameSize = locals * sizeof(QV4::Value); - return frameSize; + return (localCount + sizeof(QV4::CallData)/sizeof(QV4::Value) - 1 + maxOutgoingArgumentCount) + 1; } Address stackSlotPointer(int idx) const |