diff options
| author | Alec Rivers <alec@shapertools.com> | 2019-04-12 10:58:13 -0700 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-04-12 19:25:16 +0000 |
| commit | 956099608b98d8f57798f59c8f5367a476e2d5ae (patch) | |
| tree | 24c2afd213a5cd7561018d06e1263e34badf0c6e /src/3rdparty | |
| parent | 0af154c41dc0dfbf5994e7eb3056b2333b5645b7 (diff) | |
Ensure the correct version of LinkBuffer's performFinalization is called
Task-number: QTBUG-74876
Change-Id: I8e816d29b709750b121cc63edfc5f3493a3ed119
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
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 c79b0663c8..7f9979302e 100644 --- a/src/3rdparty/masm/assembler/LinkBuffer.h +++ b/src/3rdparty/masm/assembler/LinkBuffer.h @@ -243,7 +243,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); @@ -342,7 +342,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 @@ -388,7 +388,7 @@ public: linkCode(ownerUID, effort); } - inline void performFinalization(); + virtual void performFinalization() override final; inline void linkCode(void* ownerUID, JITCompilationEffort); @@ -412,7 +412,7 @@ private: }; template <typename MacroAssembler> -inline void BranchCompactingLinkBuffer<MacroAssembler>::performFinalization() +void BranchCompactingLinkBuffer<MacroAssembler>::performFinalization() { #ifndef NDEBUG ASSERT(!m_completed); |