add diff patch

remove RODataMem.FreeMem.clear(); and replace return true to RELEASE_ASSERT(0, "finalizeMemory failed")

llvm_patches/0014-PATCH-SectionMemoryManger-Make-better-use-of-virtual.patch

+From b7035692e3abd5d5b6781d59d17f8a5cf98297f9 Mon Sep 17 00:00:00 2001
+From: Dong-hee Na <corona10@gmail.com>
+Date: Tue, 20 Sep 2016 23:11:35 +0900
+Subject: [PATCH] [PATCH] SectionMemoryManger: Make better use of virtual
+ memory
+
+---
+ lib/Support/Unix/Memory.inc | 19 ++++++++-----------
+ 1 file changed, 8 insertions(+), 11 deletions(-)
+
+diff --git a/lib/Support/Unix/Memory.inc b/lib/Support/Unix/Memory.inc
+index c421ee8..f3463e5 100644
+--- a/lib/Support/Unix/Memory.inc
++++ b/lib/Support/Unix/Memory.inc
+@@ -50,9 +50,8 @@ int getPosixProtectionFlags(unsigned Flags) {
+     return PROT_READ | PROT_WRITE;
+   case llvm::sys::Memory::MF_READ|llvm::sys::Memory::MF_EXEC:
+     return PROT_READ | PROT_EXEC;
+-  case llvm::sys::Memory::MF_READ |
+-	 llvm::sys::Memory::MF_WRITE |
+-	 llvm::sys::Memory::MF_EXEC:
++  case llvm::sys::Memory::MF_READ | llvm::sys::Memory::MF_WRITE |
++      llvm::sys::Memory::MF_EXEC:
+     return PROT_READ | PROT_WRITE | PROT_EXEC;
+   case llvm::sys::Memory::MF_EXEC:
+ #if defined(__FreeBSD__)
+@@ -74,7 +73,7 @@ int getPosixProtectionFlags(unsigned Flags) {
+   return PROT_NONE;
+ }
+ 
+-} // namespace
++} // anonymous namespace
+ 
+ namespace llvm {
+ namespace sys {
+@@ -153,6 +152,7 @@ Memory::releaseMappedMemory(MemoryBlock &M) {
+ 
+ std::error_code
+ Memory::protectMappedMemory(const MemoryBlock &M, unsigned Flags) {
++  static const size_t PageSize = Process::getPageSize();
+   if (M.Address == nullptr || M.Size == 0)
+     return std::error_code();
+ 
+@@ -161,7 +161,7 @@ Memory::protectMappedMemory(const MemoryBlock &M, unsigned Flags) {
+ 
+   int Protect = getPosixProtectionFlags(Flags);
+ 
+-  int Result = ::mprotect(M.Address, M.Size, Protect);
++  int Result = ::mprotect((void*)((uintptr_t)M.Address & ~(PageSize-1)), PageSize*((M.Size+PageSize-1)/PageSize), Protect);
+   if (Result != 0)
+     return std::error_code(errno, std::generic_category());
+ 
+@@ -181,7 +181,7 @@ Memory::AllocateRWX(size_t NumBytes, const MemoryBlock* NearBlock,
+                     std::string *ErrMsg) {
+   if (NumBytes == 0) return MemoryBlock();
+ 
+-  size_t PageSize = Process::getPageSize();
++  static const size_t PageSize = Process::getPageSize();
+   size_t NumPages = (NumBytes+PageSize-1)/PageSize;
+ 
+   int fd = -1;
+@@ -265,15 +265,12 @@ bool Memory::setWritable (MemoryBlock &M, std::string *ErrMsg) {
+ }
+ 
+ bool Memory::setExecutable (MemoryBlock &M, std::string *ErrMsg) {
+-#if defined(__APPLE__) && (defined(__arm__) || defined(__arm64__))
+-  if (M.Address == 0 || M.Size == 0) return false;
++  if (M.Address == nullptr || M.Size == 0) return false;
+   Memory::InvalidateInstructionCache(M.Address, M.Size);
++#if defined(__APPLE__) && (defined(__arm__) || defined(__arm64__))
+   kern_return_t kr = vm_protect(mach_task_self(), (vm_address_t)M.Address,
+     (vm_size_t)M.Size, 0, VM_PROT_READ | VM_PROT_EXECUTE | VM_PROT_COPY);
+   return KERN_SUCCESS == kr;
+-#elif defined(__arm__) || defined(__aarch64__)
+-  Memory::InvalidateInstructionCache(M.Address, M.Size);
+-  return true;
+ #else
+   return true;
+ #endif
+-- 
+2.7.4
+

src/codegen/memmgr.cpp

@@ -182,20 +182,16 @@ bool PystonMemoryManager::finalizeMemory(std::string* ErrMsg) {
         if (ErrMsg) {
             *ErrMsg = ec.message();
         }
-        return true;
+        RELEASE_ASSERT(0, "finalizeMemory failed");
     }
 
-    // This code was removed in latest LLVM's repo.
-    // Don't allow free memory blocks to be used after setting protection flags.
-    RODataMem.FreeMem.clear();
-
     // Make read-only data memory read-only.
     ec = applyMemoryGroupPermissions(RODataMem, sys::Memory::MF_READ | sys::Memory::MF_EXEC);
     if (ec) {
         if (ErrMsg) {
             *ErrMsg = ec.message();
         }
-        return true;
+        RELEASE_ASSERT(0, "finalizeMemory failed");
     }
 
     // Read-write data memory already has the correct permissions
@@ -226,11 +222,6 @@ static sys::MemoryBlock trimBlockToPageSize(sys::MemoryBlock M) {
     return Trimmed;
 }
 
-// Copy from LLVM 3.9 repo's /include/llvm/ADT/STLExtras.h
-template <typename R, class UnaryPredicate> auto remove_if(R&& Range, UnaryPredicate&& P) -> decltype(Range.begin()) {
-    return std::remove_if(Range.begin(), Range.end(), P);
-}
-
 llvm_error_code PystonMemoryManager::applyMemoryGroupPermissions(MemoryGroup& MemGroup, unsigned Permissions) {
 
     for (sys::MemoryBlock& MB : MemGroup.PendingMem) {