Index: llvm/trunk/include/llvm/Object/IRObjectFile.h =================================================================== --- llvm/trunk/include/llvm/Object/IRObjectFile.h +++ llvm/trunk/include/llvm/Object/IRObjectFile.h @@ -28,9 +28,10 @@ class ObjectFile; class IRObjectFile : public SymbolicFile { - std::unique_ptr M; + std::vector> Mods; ModuleSymbolTable SymTab; - IRObjectFile(MemoryBufferRef Object, std::unique_ptr M); + IRObjectFile(MemoryBufferRef Object, + std::vector> Mods); public: ~IRObjectFile() override; Index: llvm/trunk/lib/Object/IRObjectFile.cpp =================================================================== --- llvm/trunk/lib/Object/IRObjectFile.cpp +++ llvm/trunk/lib/Object/IRObjectFile.cpp @@ -35,9 +35,11 @@ using namespace llvm; using namespace object; -IRObjectFile::IRObjectFile(MemoryBufferRef Object, std::unique_ptr Mod) - : SymbolicFile(Binary::ID_IR, Object), M(std::move(Mod)) { - SymTab.addModule(M.get()); +IRObjectFile::IRObjectFile(MemoryBufferRef Object, + std::vector> Mods) + : SymbolicFile(Binary::ID_IR, Object), Mods(std::move(Mods)) { + for (auto &M : this->Mods) + SymTab.addModule(M.get()); } IRObjectFile::~IRObjectFile() {} @@ -73,7 +75,11 @@ return basic_symbol_iterator(BasicSymbolRef(Ret, this)); } -StringRef IRObjectFile::getTargetTriple() const { return M->getTargetTriple(); } +StringRef IRObjectFile::getTargetTriple() const { + // Each module must have the same target triple, so we arbitrarily access the + // first one. + return Mods[0]->getTargetTriple(); +} ErrorOr IRObjectFile::findBitcodeInObject(const ObjectFile &Obj) { for (const SectionRef &Sec : Obj.sections()) { @@ -108,19 +114,26 @@ } Expected> -llvm::object::IRObjectFile::create(MemoryBufferRef Object, - LLVMContext &Context) { +IRObjectFile::create(MemoryBufferRef Object, LLVMContext &Context) { ErrorOr BCOrErr = findBitcodeInMemBuffer(Object); if (!BCOrErr) return errorCodeToError(BCOrErr.getError()); - Expected> MOrErr = - getLazyBitcodeModule(*BCOrErr, Context, - /*ShouldLazyLoadMetadata*/ true); - if (!MOrErr) - return MOrErr.takeError(); + Expected> BMsOrErr = + getBitcodeModuleList(*BCOrErr); + if (!BMsOrErr) + return BMsOrErr.takeError(); + + std::vector> Mods; + for (auto BM : *BMsOrErr) { + Expected> MOrErr = + BM.getLazyModule(Context, /*ShouldLazyLoadMetadata*/ true); + if (!MOrErr) + return MOrErr.takeError(); + + Mods.push_back(std::move(*MOrErr)); + } - std::unique_ptr &M = MOrErr.get(); return std::unique_ptr( - new IRObjectFile(*BCOrErr, std::move(M))); + new IRObjectFile(*BCOrErr, std::move(Mods))); } Index: llvm/trunk/test/Object/Inputs/multi-module.ll =================================================================== --- llvm/trunk/test/Object/Inputs/multi-module.ll +++ llvm/trunk/test/Object/Inputs/multi-module.ll @@ -0,0 +1,3 @@ +define void @f2() { + ret void +} Index: llvm/trunk/test/Object/multi-module.ll =================================================================== --- llvm/trunk/test/Object/multi-module.ll +++ llvm/trunk/test/Object/multi-module.ll @@ -0,0 +1,8 @@ +; RUN: llvm-cat -o - %s %S/Inputs/multi-module.ll | llvm-nm - | FileCheck %s + +; CHECK: T f1 +; CHECK: T f2 + +define void @f1() { + ret void +}