From 4911adbdfd834108846b726860f1305cffe8fd9f Mon Sep 17 00:00:00 2001 From: Andrew Kaylor Date: Wed, 24 Apr 2013 22:39:12 +0000 Subject: [PATCH] Making invalidateInstructionCache automatic in SectionMemoryManager llvm-svn: 180225 --- include/llvm/ExecutionEngine/SectionMemoryManager.h | 4 +--- lib/ExecutionEngine/MCJIT/SectionMemoryManager.cpp | 5 +++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/llvm/ExecutionEngine/SectionMemoryManager.h b/include/llvm/ExecutionEngine/SectionMemoryManager.h index ae5004e130c..9ac8c92524a 100644 --- a/include/llvm/ExecutionEngine/SectionMemoryManager.h +++ b/include/llvm/ExecutionEngine/SectionMemoryManager.h @@ -87,9 +87,7 @@ public: /// explicit cache flush, otherwise JIT code manipulations (like resolved /// relocations) will get to the data cache but not to the instruction cache. /// - /// This method is not called by RuntimeDyld or MCJIT during the load - /// process. Clients may call this function when needed. See the lli - /// tool for example use. + /// This method is called from applyPermissions. virtual void invalidateInstructionCache(); private: diff --git a/lib/ExecutionEngine/MCJIT/SectionMemoryManager.cpp b/lib/ExecutionEngine/MCJIT/SectionMemoryManager.cpp index fa35acd389a..da931247b6c 100644 --- a/lib/ExecutionEngine/MCJIT/SectionMemoryManager.cpp +++ b/lib/ExecutionEngine/MCJIT/SectionMemoryManager.cpp @@ -138,6 +138,11 @@ bool SectionMemoryManager::applyPermissions(std::string *ErrMsg) // Read-write data memory already has the correct permissions + // Some platforms with separate data cache and instruction cache require + // explicit cache flush, otherwise JIT code manipulations (like resolved + // relocations) will get to the data cache but not to the instruction cache. + invalidateInstructionCache(); + return false; }