Import LLVM 7.0.1 release including clang, lld and lldb.

1 files changed, 19 insertions, 6 deletions

diff --git a/gnu/llvm/unittests/ExecutionEngine/Orc/CompileOnDemandLayerTest.cpp b/gnu/llvm/unittests/ExecutionEngine/Orc/CompileOnDemandLayerTest.cpp
index 61ce310e631..a1f864bae01 100644
--- a/gnu/llvm/unittests/ExecutionEngine/Orc/CompileOnDemandLayerTest.cpp
+++ b/gnu/llvm/unittests/ExecutionEngine/Orc/CompileOnDemandLayerTest.cpp
@@ -18,7 +18,8 @@ namespace {
 
 class DummyCallbackManager : public orc::JITCompileCallbackManager {
 public:
-  DummyCallbackManager() : JITCompileCallbackManager(0) {}
+  DummyCallbackManager(ExecutionSession &ES)
+      : JITCompileCallbackManager(ES, 0) {}
 
 public:
   Error grow() override { llvm_unreachable("not implemented"); }
@@ -35,11 +36,11 @@ public:
     llvm_unreachable("Not implemented");
   }
 
-  JITSymbol findStub(StringRef Name, bool ExportedStubsOnly) override {
+  JITEvaluatedSymbol findStub(StringRef Name, bool ExportedStubsOnly) override {
     llvm_unreachable("Not implemented");
   }
 
-  JITSymbol findPointer(StringRef Name) override {
+  JITEvaluatedSymbol findPointer(StringRef Name) override {
     llvm_unreachable("Not implemented");
   }
 
@@ -57,11 +58,23 @@ TEST(CompileOnDemandLayerTest, FindSymbol) {
       return JITSymbol(nullptr);
     };
 
-  DummyCallbackManager CallbackMgr;
+
+  ExecutionSession ES(std::make_shared<SymbolStringPool>());
+  DummyCallbackManager CallbackMgr(ES);
+
+  auto GetResolver =
+      [](orc::VModuleKey) -> std::shared_ptr<llvm::orc::SymbolResolver> {
+    llvm_unreachable("Should never be called");
+  };
+
+  auto SetResolver = [](orc::VModuleKey, std::shared_ptr<orc::SymbolResolver>) {
+    llvm_unreachable("Should never be called");
+  };
 
   llvm::orc::CompileOnDemandLayer<decltype(TestBaseLayer)> COD(
-      TestBaseLayer, [](Function &F) { return std::set<Function *>{&F}; },
-      CallbackMgr, [] { return llvm::make_unique<DummyStubsManager>(); }, true);
+      ES, TestBaseLayer, GetResolver, SetResolver,
+      [](Function &F) { return std::set<Function *>{&F}; }, CallbackMgr,
+      [] { return llvm::make_unique<DummyStubsManager>(); }, true);
 
   auto Sym = COD.findSymbol("foo", true);