[llvm-branch-commits] [llvm-branch] r287912 - Merge r283123 into 3.9.1

[Mehdi Amini via llvm-branch-commits]

Author: mehdi_amini
Date: Thu Nov 24 22:47:11 2016
New Revision: 287912

URL: http://llvm.org/viewvc/llvm-project?rev=287912&view=rev
Log:
Merge r283123 into 3.9.1

[RTDyld] Fix a bug in RTDyldMemoryManager::deregisterEHFrames.

See: https://llvm.org/bugs/show_bug.cgi?id=31160


Modified:
    llvm/branches/release_39/include/llvm/ExecutionEngine/RTDyldMemoryManager.h

Modified: llvm/branches/release_39/include/llvm/ExecutionEngine/RTDyldMemoryManager.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_39/include/llvm/ExecutionEngine/RTDyldMemoryManager.h?rev=287912&r1=287911&r2=287912&view=diff
==============================================================================
--- llvm/branches/release_39/include/llvm/ExecutionEngine/RTDyldMemoryManager.h (original)
+++ llvm/branches/release_39/include/llvm/ExecutionEngine/RTDyldMemoryManager.h Thu Nov 24 22:47:11 2016
@@ -72,7 +72,7 @@ public:
   }
 
   void deregisterEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) override {
-    registerEHFramesInProcess(Addr, Size);
+    deregisterEHFramesInProcess(Addr, Size);
   }
 
   /// This method returns the address of the specified function or variable in