From 93a70a051b21ae253331f922027bd9bb7a3e457a Mon Sep 17 00:00:00 2001
From: Tuomas Heimonen <tuomas.heimonen@qt.io>
Date: Mon, 18 Jun 2018 13:46:27 +0300
Subject: Swap the order of protection for cache flush

This is to accommodate operating systems such as VxWorks that require
writable pages in order to perform the flushing

Change-Id: Iefcd26a4d7fa74fa046776c6ee2883399a4d31dc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/3rdparty/masm/assembler/LinkBuffer.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/3rdparty')

diff --git a/src/3rdparty/masm/assembler/LinkBuffer.h b/src/3rdparty/masm/assembler/LinkBuffer.h
index bfd0e402ca..75b9a5c0bd 100644
--- a/src/3rdparty/masm/assembler/LinkBuffer.h
+++ b/src/3rdparty/masm/assembler/LinkBuffer.h
@@ -350,8 +350,8 @@ inline void LinkBufferBase<MacroAssembler, ExecutableOffsetCalculator>::performF
 #endif
 
     ASSERT(m_size <= INT_MAX);
-    ExecutableAllocator::makeExecutable(code(), static_cast<int>(m_size));
     MacroAssembler::cacheFlush(code(), m_size);
+    ExecutableAllocator::makeExecutable(code(), static_cast<int>(m_size));
 }
 
 template <typename MacroAssembler>
@@ -418,8 +418,8 @@ inline void BranchCompactingLinkBuffer<MacroAssembler>::performFinalization()
     this->m_completed = true;
 #endif
 
-    ExecutableAllocator::makeExecutable(code(), m_initialSize);
     MacroAssembler::cacheFlush(code(), m_size);
+    ExecutableAllocator::makeExecutable(code(), m_initialSize);
 }
 
 template <typename MacroAssembler>
-- 
cgit v1.2.3