diff options
author | Teresa Johnson <tejohnson@google.com> | 2015-11-02 22:17:32 +0000 |
---|---|---|
committer | Teresa Johnson <tejohnson@google.com> | 2015-11-02 22:17:32 +0000 |
commit | 227a923140b446b281fde945d662ae16227d5f51 (patch) | |
tree | f5b6a5ac3992e290a25f20f92021661c14b8a0df /llvm/lib/Object/FunctionIndexObjectFile.cpp | |
parent | a7cd16b252c68bd7e79ba52bdab8f5c377ca4fd2 (diff) | |
download | bcm5719-llvm-227a923140b446b281fde945d662ae16227d5f51.tar.gz bcm5719-llvm-227a923140b446b281fde945d662ae16227d5f51.zip |
Revert "Support for ThinLTO function importing and symbol linking."
This reverts commit r251837, due to a number of bot failures of the form:
/home/grosser/buildslave/perf-x86_64-penryn-O3-polly-fast/llvm.obj/tools/llvm-link/Release+Asserts/llvm-link.o:llvm-link.cpp:function
loadIndex(llvm::LLVMContext&, llvm::Module const*): error: undefined
reference to
'llvm::object::FunctionIndexObjectFile::create(llvm::MemoryBufferRef,
llvm::LLVMContext&, llvm::Module const*, bool)'
/home/grosser/buildslave/perf-x86_64-penryn-O3-polly-fast/llvm.obj/tools/llvm-link/Release+Asserts/llvm-link.o:llvm-link.cpp:function
loadIndex(llvm::LLVMContext&, llvm::Module const*): error: undefined
reference to 'llvm::object::FunctionIndexObjectFile::takeIndex()'
I'm not sure why these are happening - I added Object to the requred
libraries in tools/llvm-link/LLVMBuild.txt and the LLVM_LINK_COMPONENTS
in tools/llvm-link/CMakeLists.txt. Confirmed for my build that these
symbols come out of libLLVMObject.a. What am I missing?
llvm-svn: 251841
Diffstat (limited to 'llvm/lib/Object/FunctionIndexObjectFile.cpp')
-rw-r--r-- | llvm/lib/Object/FunctionIndexObjectFile.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/llvm/lib/Object/FunctionIndexObjectFile.cpp b/llvm/lib/Object/FunctionIndexObjectFile.cpp index ee65990c528..b1e8ebc657c 100644 --- a/llvm/lib/Object/FunctionIndexObjectFile.cpp +++ b/llvm/lib/Object/FunctionIndexObjectFile.cpp @@ -1,4 +1,5 @@ -//===- FunctionIndexObjectFile.cpp - Function index file implementation ---===// +//===- FunctionIndexObjectFile.cpp - Function index file implementation +//----===// // // The LLVM Compiler Infrastructure // @@ -85,15 +86,15 @@ bool FunctionIndexObjectFile::hasFunctionSummaryInMemBuffer( // function summary/index. ErrorOr<std::unique_ptr<FunctionIndexObjectFile>> FunctionIndexObjectFile::create(MemoryBufferRef Object, LLVMContext &Context, - const Module *ExportingModule, bool IsLazy) { + bool IsLazy) { std::unique_ptr<FunctionInfoIndex> Index; ErrorOr<MemoryBufferRef> BCOrErr = findBitcodeInMemBuffer(Object); if (!BCOrErr) return BCOrErr.getError(); - ErrorOr<std::unique_ptr<FunctionInfoIndex>> IOrErr = getFunctionInfoIndex( - BCOrErr.get(), Context, nullptr, ExportingModule, IsLazy); + ErrorOr<std::unique_ptr<FunctionInfoIndex>> IOrErr = + getFunctionInfoIndex(BCOrErr.get(), Context, nullptr, IsLazy); if (std::error_code EC = IOrErr.getError()) return EC; |