Merge r283123 into 3.9.1

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

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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_39@287912 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/ExecutionEngine/RTDyldMemoryManager.h b/include/llvm/ExecutionEngine/RTDyldMemoryManager.h
index adcb063f45440c7a80de6674ab28c40caf5d1383..9451fa57c0f6b1a039cfbc43c7a1c911735cbf51 100644 (file)
--- a/include/llvm/ExecutionEngine/RTDyldMemoryManager.h
+++ b/include/llvm/ExecutionEngine/RTDyldMemoryManager.h
@@ -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