diff --git a/llvm/tools/llvm-link/llvm-link.cpp b/llvm/tools/llvm-link/llvm-link.cpp --- a/llvm/tools/llvm-link/llvm-link.cpp +++ b/llvm/tools/llvm-link/llvm-link.cpp @@ -153,6 +153,7 @@ Error Err = Error::success(); object::Archive Archive(*Buffer, Err); ExitOnErr(std::move(Err)); + Linker L(*Result); for (const object::Archive::Child &C : Archive.children(Err)) { Expected Ename = C.getName(); if (Error E = Ename.takeError()) { @@ -186,7 +187,12 @@ return nullptr; } - std::unique_ptr M = parseIR(MemBuf.get(), ParseErr, Context); + std::unique_ptr M; + if (DisableLazyLoad) + M = parseIR(MemBuf.get(), ParseErr, Context); + else + M = getLazyIRModule(MemoryBuffer::getMemBuffer(MemBuf.get(), false), + ParseErr, Context); if (!M.get()) { errs() << Argv0 << ": "; @@ -197,7 +203,7 @@ } if (Verbose) errs() << "Linking member '" << ChildName << "' of archive library.\n"; - if (Linker::linkModules(*Result, std::move(M))) + if (L.linkInModule(std::move(M))) return nullptr; } // end for each child ExitOnErr(std::move(Err));