From e63e0188e4c498ebb26462a6b9442f40f1174db5 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Tue, 3 Nov 2015 16:40:37 +0000 Subject: Revert "Revert "[Orc] Directly emit machine code for the x86 resolver block and trampolines."" This reverts commit r251937. The test was updated to the new API, bring the API back. llvm-svn: 251944 --- llvm/unittests/ExecutionEngine/Orc/CompileOnDemandLayerTest.cpp | 4 ++-- llvm/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'llvm/unittests/ExecutionEngine/Orc') diff --git a/llvm/unittests/ExecutionEngine/Orc/CompileOnDemandLayerTest.cpp b/llvm/unittests/ExecutionEngine/Orc/CompileOnDemandLayerTest.cpp index ecfefe47c36..078cbdaa300 100644 --- a/llvm/unittests/ExecutionEngine/Orc/CompileOnDemandLayerTest.cpp +++ b/llvm/unittests/ExecutionEngine/Orc/CompileOnDemandLayerTest.cpp @@ -19,11 +19,11 @@ namespace { class DummyCallbackManager : public orc::JITCompileCallbackManagerBase { public: DummyCallbackManager() - : JITCompileCallbackManagerBase(0, 0), NextStubAddress(0), + : JITCompileCallbackManagerBase(0), NextStubAddress(0), UniversalCompile([]() { return 0; }) { } - CompileCallbackInfo getCompileCallback(LLVMContext &Context) override { + CompileCallbackInfo getCompileCallback() override { return CompileCallbackInfo(++NextStubAddress, UniversalCompile); } public: diff --git a/llvm/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp b/llvm/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp index 095d42599bf..2957a3c1570 100644 --- a/llvm/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp +++ b/llvm/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp @@ -82,7 +82,7 @@ TEST_F(OrcCAPIExecutionTest, TestEagerIRCompilation) { return; LLVMOrcJITStackRef JIT = - LLVMOrcCreateInstance(wrap(TM.get()), LLVMGetGlobalContext()); + LLVMOrcCreateInstance(wrap(TM.get())); std::unique_ptr M = createTestModule(TM->getTargetTriple()); @@ -106,7 +106,7 @@ TEST_F(OrcCAPIExecutionTest, TestLazyIRCompilation) { return; LLVMOrcJITStackRef JIT = - LLVMOrcCreateInstance(wrap(TM.get()), LLVMGetGlobalContext()); + LLVMOrcCreateInstance(wrap(TM.get())); std::unique_ptr M = createTestModule(TM->getTargetTriple()); @@ -130,7 +130,7 @@ TEST_F(OrcCAPIExecutionTest, TestDirectCallbacksAPI) { return; LLVMOrcJITStackRef JIT = - LLVMOrcCreateInstance(wrap(TM.get()), LLVMGetGlobalContext()); + LLVMOrcCreateInstance(wrap(TM.get())); LLVMOrcGetMangledSymbol(JIT, &testFuncName, "testFunc"); -- cgit v1.2.3