[MCJIT] Replace JITEventListener::anchor (temporarily removed in r222861), and

move GDBRegistrationListener into ExecutionEngine to avoid layering violation.

llvm-svn: 222864

diff --git a/llvm/include/llvm/ExecutionEngine/JITEventListener.h b/llvm/include/llvm/ExecutionEngine/JITEventListener.h
index dd52dfb..c3edec8 100644 (file)
--- a/llvm/include/llvm/ExecutionEngine/JITEventListener.h
+++ b/llvm/include/llvm/ExecutionEngine/JITEventListener.h
@@ -113,6 +113,8 @@ public:
     return nullptr;
   }
 #endif // USE_OPROFILE
+private:
+  virtual void anchor();
 };
 
 } // end namespace llvm.

diff --git a/llvm/lib/ExecutionEngine/CMakeLists.txt b/llvm/lib/ExecutionEngine/CMakeLists.txt
index 208495c..dc2fe9b 100644 (file)
--- a/llvm/lib/ExecutionEngine/CMakeLists.txt
+++ b/llvm/lib/ExecutionEngine/CMakeLists.txt
@@ -3,6 +3,7 @@
 add_llvm_library(LLVMExecutionEngine
   ExecutionEngine.cpp
   ExecutionEngineBindings.cpp
+  GDBRegistrationListener.cpp
   RTDyldMemoryManager.cpp
   TargetSelect.cpp
   )

diff --git a/llvm/lib/ExecutionEngine/ExecutionEngine.cpp b/llvm/lib/ExecutionEngine/ExecutionEngine.cpp
index 20d1631..9ca0330 100644 (file)
--- a/llvm/lib/ExecutionEngine/ExecutionEngine.cpp
+++ b/llvm/lib/ExecutionEngine/ExecutionEngine.cpp
@@ -48,6 +48,8 @@ ExecutionEngine *(*ExecutionEngine::MCJITCtor)(
 ExecutionEngine *(*ExecutionEngine::InterpCtor)(std::unique_ptr<Module> M,
                                                 std::string *ErrorStr) =nullptr;
 
+void JITEventListener::anchor() {}
+
 ExecutionEngine::ExecutionEngine(std::unique_ptr<Module> M)
   : EEState(*this),
     LazyFunctionCreator(nullptr) {

diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/GDBRegistrationListener.cpp b/llvm/lib/ExecutionEngine/GDBRegistrationListener.cpp
similarity index 100%
rename from llvm/lib/ExecutionEngine/RuntimeDyld/GDBRegistrationListener.cpp
rename to llvm/lib/ExecutionEngine/GDBRegistrationListener.cpp

diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt b/llvm/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt
index 583d7a0..5790eee 100644 (file)
--- a/llvm/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt
+++ b/llvm/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt
@@ -1,5 +1,4 @@
 add_llvm_library(LLVMRuntimeDyld
-  GDBRegistrationListener.cpp
   RuntimeDyld.cpp
   RuntimeDyldChecker.cpp
   RuntimeDyldELF.cpp