From e8d6e379383b16bdc25601ea7ee10b73315dd29e Mon Sep 17 00:00:00 2001 From: Lang Hames Date: Thu, 14 Aug 2014 02:38:20 +0000 Subject: [PATCH] [MCJIT] Support DisableSymbolSearching and InstallLazyFunctionCreator in MCJIT. Patch by Anthony Pesch. Thanks Anthony! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@215613 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/ExecutionEngine/MCJIT/MCJIT.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/lib/ExecutionEngine/MCJIT/MCJIT.cpp b/lib/ExecutionEngine/MCJIT/MCJIT.cpp index 53630d5a5e8..c60f366f8b8 100644 --- a/lib/ExecutionEngine/MCJIT/MCJIT.cpp +++ b/lib/ExecutionEngine/MCJIT/MCJIT.cpp @@ -316,13 +316,19 @@ uint64_t MCJIT::getSymbolAddress(const std::string &Name, // If it hasn't already been generated, see if it's in one of our modules. Module *M = findModuleForSymbol(Name, CheckFunctionsOnly); - if (!M) - return 0; + if (M) { + generateCodeForModule(M); - generateCodeForModule(M); + // Check the RuntimeDyld table again, it should be there now. + return getExistingSymbolAddress(Name); + } - // Check the RuntimeDyld table again, it should be there now. - return getExistingSymbolAddress(Name); + // If a LazyFunctionCreator is installed, use it to get/create the function. + // FIXME: Should we instead have a LazySymbolCreator callback? + if (LazyFunctionCreator) + Addr = (uint64_t)LazyFunctionCreator(Name); + + return Addr; } uint64_t MCJIT::getGlobalValueAddress(const std::string &Name) { @@ -578,5 +584,7 @@ uint64_t LinkingMemoryManager::getSymbolAddress(const std::string &Name) { Result = ParentEngine->getSymbolAddress(Name.substr(1), false); if (Result) return Result; + if (ParentEngine->isSymbolSearchingDisabled()) + return 0; return ClientMM->getSymbolAddress(Name); }