diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-29 12:18:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-29 12:37:04 +0100 |
| commit | 8ec2403603f82e7a0d43b4de04c97ef1c7f1ad35 (patch) | |
| tree | d7099d5a7cf813f378064ef0348647f4e68b2692 /src/3rdparty | |
| parent | 15525d2a309a6028d548797bc777e38905f36c46 (diff) | |
| parent | 454676a8745a7334539449562a5fda47db2fc2ca (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/3rdparty/masm/yarr/YarrJIT.cpp
src/qml/compiler/qv4instr_moth.cpp
src/quick/handlers/qquicksinglepointhandler_p.h
src/quick/handlers/qquicktaphandler.cpp
src/quick/items/context2d/qquickcontext2d.cpp
Done-With: Ulf Hermann <ulf.hermann@qt.io>
Change-Id: I109453131f9f0a05316ae37c7d6ed1edc8c0f9d4
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/assembler/ARM64Assembler.h | 2 | ||||
| -rw-r--r-- | src/3rdparty/masm/yarr/YarrJIT.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/3rdparty/masm/assembler/ARM64Assembler.h b/src/3rdparty/masm/assembler/ARM64Assembler.h index fcf2e485e8..a9166e83a2 100644 --- a/src/3rdparty/masm/assembler/ARM64Assembler.h +++ b/src/3rdparty/masm/assembler/ARM64Assembler.h @@ -3051,7 +3051,7 @@ public: UNUSED_PARAM(size); #endif #elif OS(INTEGRITY) - ManageCaches((Address)code, size, ACCESS_DST_COHERENT); + ManageCaches((Address)code, size, ACCESS_DST_SYNC); #else #error "The cacheFlush support is missing on this platform." #endif diff --git a/src/3rdparty/masm/yarr/YarrJIT.cpp b/src/3rdparty/masm/yarr/YarrJIT.cpp index 98e4ade51f..da65b772f7 100644 --- a/src/3rdparty/masm/yarr/YarrJIT.cpp +++ b/src/3rdparty/masm/yarr/YarrJIT.cpp @@ -3534,20 +3534,20 @@ public: CodeRef codeRef; if (compileMode == MatchOnly) { if (m_charSize == Char8) { - codeRef = FINALIZE_CODE(linkBuffer, "YarJIT", + codeRef = FINALIZE_CODE(linkBuffer, "YarrJIT", "Match-only 8-bit regular expression"); codeBlock.set8BitCodeMatchOnly(codeRef); } else { - codeRef = FINALIZE_CODE(linkBuffer, "YarJIT", + codeRef = FINALIZE_CODE(linkBuffer, "YarrJIT", "Match-only 16-bit regular expression"); codeBlock.set16BitCodeMatchOnly(codeRef); } } else { if (m_charSize == Char8) { - codeRef = FINALIZE_CODE(linkBuffer, "YarJIT", "8-bit regular expression"); + codeRef = FINALIZE_CODE(linkBuffer, "YarrJIT", "8-bit regular expression"); codeBlock.set8BitCode(codeRef); } else { - codeRef = FINALIZE_CODE(linkBuffer, "YarJIT", "16-bit regular expression"); + codeRef = FINALIZE_CODE(linkBuffer, "YarrJIT", "16-bit regular expression"); codeBlock.set16BitCode(codeRef); } } |