diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-23 01:00:12 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-23 01:00:12 +0100 |
| commit | dca7fc3e3a0fe428ed97762a44c15e83607e6d28 (patch) | |
| tree | 97d33fe2bec52dcbb6c991712bfe39411fbddb91 /src/3rdparty | |
| parent | 03b084e6397b990c69028dc2bbf3226e7339c4a5 (diff) | |
| parent | c57681bc376d1d912d23b044c48932fa8f7816d7 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I9c3d282c11a556e616c5e1ba1b51e88b741327f6
Diffstat (limited to 'src/3rdparty')
| -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 73c919dd90..98e4ade51f 100644 --- a/src/3rdparty/masm/yarr/YarrJIT.cpp +++ b/src/3rdparty/masm/yarr/YarrJIT.cpp @@ -642,7 +642,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); |