diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-01-08 08:18:11 +0200 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-01-08 08:18:11 +0200 |
| commit | c2c012f79438d207cc95237c90b692121acc4876 (patch) | |
| tree | 39064e5a58161a7edb4e0c63f2d43e386d1f4059 /src/3rdparty/masm | |
| parent | 5208b2a671010b11b78312f9c4fe3c3098d253b4 (diff) | |
| parent | 5ed082ea4ce3580134a9a0c83e6fdb81a6231c8e (diff) | |
Merge 5.12 into 5.12.1
Change-Id: Ic746fbce93430867e2eda4bc7155d34e20a4aa2b
Diffstat (limited to 'src/3rdparty/masm')
| -rw-r--r-- | src/3rdparty/masm/yarr/YarrJIT.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/masm/yarr/YarrJIT.cpp b/src/3rdparty/masm/yarr/YarrJIT.cpp index 9a9ab581e8..0655bb0a70 100644 --- a/src/3rdparty/masm/yarr/YarrJIT.cpp +++ b/src/3rdparty/masm/yarr/YarrJIT.cpp @@ -640,7 +640,7 @@ class YarrGenerator : private DefaultMacroAssembler { subPtr(Imm32(callFrameSizeInBytes), stackPointerRegister); if (callFrameSizeInBytes <= 128) { for (unsigned offset = 0; offset < callFrameSizeInBytes; offset += sizeof(intptr_t)) - storePtr(TrustedImmPtr(0), Address(regT0, -8 - offset)); + storePtr(TrustedImmPtr(0), Address(regT0, -8 - int(offset))); } else { Label zeroLoop = label(); subPtr(TrustedImm32(sizeof(intptr_t) * 2), regT0); |