diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-15 01:00:05 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-04-15 09:36:12 +0200 |
| commit | 8bc3329e2cec4638fa9af274a40dda176bbb7352 (patch) | |
| tree | 87ebd27e0f6dc305c78fddb956e65bd5922a078b /src/3rdparty | |
| parent | 75998b22b0b216d925e93d2c0e205025c23b2522 (diff) | |
| parent | 6dac2e7df7fbf0f29667bf92b4e72426db47dbe9 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3
Conflicts:
src/3rdparty/masm/assembler/LinkBuffer.h
src/qmltest/doc/src/qtquicktest-index.qdoc
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
Change-Id: I7d83ad95cf489dda794dd7a0a33bad3ef3b05609
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/assembler/LinkBuffer.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/masm/assembler/LinkBuffer.h b/src/3rdparty/masm/assembler/LinkBuffer.h index 4dfd051797..a1bb046d43 100644 --- a/src/3rdparty/masm/assembler/LinkBuffer.h +++ b/src/3rdparty/masm/assembler/LinkBuffer.h @@ -245,7 +245,7 @@ protected: inline void linkCode(void* ownerUID, JITCompilationEffort); - inline void performFinalization(); + virtual void performFinalization(); #if DUMP_LINK_STATISTICS static void dumpLinkStatistics(void* code, size_t initialSize, size_t finalSize); @@ -344,7 +344,7 @@ inline void LinkBufferBase<MacroAssembler, ExecutableOffsetCalculator>::linkCode } template <typename MacroAssembler, template <typename T> class ExecutableOffsetCalculator> -inline void LinkBufferBase<MacroAssembler, ExecutableOffsetCalculator>::performFinalization() +void LinkBufferBase<MacroAssembler, ExecutableOffsetCalculator>::performFinalization() { // NOTE: This function is specialized in LinkBuffer<MacroAssemblerARMv7> #ifndef NDEBUG @@ -395,7 +395,7 @@ public: linkCode(ownerUID, effort); } - inline void performFinalization(); + virtual void performFinalization() override final; inline void makeExecutable(); inline void linkCode(void* ownerUID, JITCompilationEffort); @@ -420,7 +420,7 @@ private: }; template <typename MacroAssembler> -inline void BranchCompactingLinkBuffer<MacroAssembler>::performFinalization() +void BranchCompactingLinkBuffer<MacroAssembler>::performFinalization() { #ifndef NDEBUG ASSERT(!m_completed); |