X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2Fllvm-link%2Fllvm-link.cpp;h=369f3477fe5c99434cd1ce74d1c3b40ba6cf7292;hb=60dbe0fd0dbb5f52411a399480b2b8066839de37;hp=07ce76203bd45fc772af9dc4767d356203f31d12;hpb=6bb69355d25be940824106eaa88783bf282db626;p=oota-llvm.git diff --git a/tools/llvm-link/llvm-link.cpp b/tools/llvm-link/llvm-link.cpp index 07ce76203bd..369f3477fe5 100644 --- a/tools/llvm-link/llvm-link.cpp +++ b/tools/llvm-link/llvm-link.cpp @@ -1,10 +1,10 @@ //===- llvm-link.cpp - Low-level LLVM linker ------------------------------===// -// +// // The LLVM Compiler Infrastructure // -// This file was developed by the LLVM research group and is distributed under -// the University of Illinois Open Source License. See LICENSE.TXT for details. -// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// //===----------------------------------------------------------------------===// // // This utility may be invoked in the following manner: @@ -12,29 +12,47 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Linker.h" -#include "llvm/Module.h" -#include "llvm/Analysis/Verifier.h" -#include "llvm/Bytecode/Reader.h" -#include "llvm/Bytecode/Writer.h" +#include "llvm/Linker/Linker.h" +#include "llvm/ADT/STLExtras.h" +#include "llvm/Bitcode/ReaderWriter.h" +#include "llvm/IR/AutoUpgrade.h" +#include "llvm/IR/DiagnosticInfo.h" +#include "llvm/IR/DiagnosticPrinter.h" +#include "llvm/IR/LLVMContext.h" +#include "llvm/IR/Module.h" +#include "llvm/IR/Verifier.h" +#include "llvm/IRReader/IRReader.h" #include "llvm/Support/CommandLine.h" -#include "llvm/System/Signals.h" -#include "llvm/System/Path.h" -#include -#include +#include "llvm/Support/FileSystem.h" +#include "llvm/Support/ManagedStatic.h" +#include "llvm/Support/Path.h" +#include "llvm/Support/PrettyStackTrace.h" +#include "llvm/Support/Signals.h" +#include "llvm/Support/SourceMgr.h" +#include "llvm/Support/SystemUtils.h" +#include "llvm/Support/ToolOutputFile.h" #include - using namespace llvm; static cl::list InputFilenames(cl::Positional, cl::OneOrMore, - cl::desc("")); + cl::desc("")); + +static cl::list OverridingInputs( + "override", cl::ZeroOrMore, cl::value_desc("filename"), + cl::desc( + "input bitcode file which can override previously defined symbol(s)")); static cl::opt OutputFilename("o", cl::desc("Override output filename"), cl::init("-"), cl::value_desc("filename")); -static cl::opt Force("f", cl::desc("Overwrite output files")); +static cl::opt +Force("f", cl::desc("Enable binary output on terminals")); + +static cl::opt +OutputAssembly("S", + cl::desc("Write output as LLVM assembly"), cl::Hidden); static cl::opt Verbose("v", cl::desc("Print information about actions taken")); @@ -42,103 +60,125 @@ Verbose("v", cl::desc("Print information about actions taken")); static cl::opt DumpAsm("d", cl::desc("Print assembly as linked"), cl::Hidden); -static cl::opt NoCompress("disable-compression", cl::init(false), - cl::desc("Don't ompress the generated bytecode")); +static cl::opt +SuppressWarnings("suppress-warnings", cl::desc("Suppress all linking warnings"), + cl::init(false)); + +static cl::opt PreserveBitcodeUseListOrder( + "preserve-bc-uselistorder", + cl::desc("Preserve use-list order when writing LLVM bitcode."), + cl::init(true), cl::Hidden); + +static cl::opt PreserveAssemblyUseListOrder( + "preserve-ll-uselistorder", + cl::desc("Preserve use-list order when writing LLVM assembly."), + cl::init(false), cl::Hidden); -// LoadFile - Read the specified bytecode file in and return it. This routine -// searches the link path for the specified file to try to find it... +// Read the specified bitcode file in and return it. This routine searches the +// link path for the specified file to try to find it... // -static inline std::auto_ptr LoadFile(const std::string &FN) { - sys::Path Filename; - if (!Filename.setFile(FN)) { - std::cerr << "Invalid file name: '" << FN << "'\n"; - return std::auto_ptr(); +static std::unique_ptr +loadFile(const char *argv0, const std::string &FN, LLVMContext &Context) { + SMDiagnostic Err; + if (Verbose) errs() << "Loading '" << FN << "'\n"; + std::unique_ptr Result = getLazyIRFileModule(FN, Err, Context); + if (!Result) + Err.print(argv0, errs()); + + Result->materializeMetadata(); + UpgradeDebugInfo(*Result); + + return Result; +} + +static void diagnosticHandler(const DiagnosticInfo &DI) { + unsigned Severity = DI.getSeverity(); + switch (Severity) { + case DS_Error: + errs() << "ERROR: "; + break; + case DS_Warning: + if (SuppressWarnings) + return; + errs() << "WARNING: "; + break; + case DS_Remark: + case DS_Note: + llvm_unreachable("Only expecting warnings and errors"); } - std::string ErrorMessage; - if (Filename.exists()) { - if (Verbose) std::cerr << "Loading '" << Filename.c_str() << "'\n"; - Module* Result = ParseBytecodeFile(Filename.get(), &ErrorMessage); - if (Result) return std::auto_ptr(Result); // Load successful! + DiagnosticPrinterRawOStream DP(errs()); + DI.print(DP); + errs() << '\n'; +} + +static bool linkFiles(const char *argv0, LLVMContext &Context, Linker &L, + const cl::list &Files, + bool OverrideDuplicateSymbols) { + for (const auto &File : Files) { + std::unique_ptr M = loadFile(argv0, File, Context); + if (!M.get()) { + errs() << argv0 << ": error loading file '" << File << "'\n"; + return false; + } - if (Verbose) { - std::cerr << "Error opening bytecode file: '" << Filename.c_str() << "'"; - if (ErrorMessage.size()) std::cerr << ": " << ErrorMessage; - std::cerr << "\n"; + if (verifyModule(*M, &errs())) { + errs() << argv0 << ": " << File << ": error: input module is broken!\n"; + return false; } - } else { - std::cerr << "Bytecode file: '" << Filename.c_str() - << "' does not exist.\n"; + + if (Verbose) + errs() << "Linking in '" << File << "'\n"; + + if (L.linkInModule(M.get(), OverrideDuplicateSymbols)) + return false; } - return std::auto_ptr(); + return true; } int main(int argc, char **argv) { - cl::ParseCommandLineOptions(argc, argv, " llvm linker\n"); + // Print a stack trace if we signal out. sys::PrintStackTraceOnErrorSignal(); - assert(InputFilenames.size() > 0 && "OneOrMore is not working"); - - unsigned BaseArg = 0; - std::string ErrorMessage; - - std::auto_ptr Composite(LoadFile(InputFilenames[BaseArg])); - if (Composite.get() == 0) { - std::cerr << argv[0] << ": error loading file '" - << InputFilenames[BaseArg] << "'\n"; - return 1; - } + PrettyStackTraceProgram X(argc, argv); - for (unsigned i = BaseArg+1; i < InputFilenames.size(); ++i) { - std::auto_ptr M(LoadFile(InputFilenames[i])); - if (M.get() == 0) { - std::cerr << argv[0] << ": error loading file '" - << InputFilenames[i] << "'\n"; - return 1; - } + LLVMContext &Context = getGlobalContext(); + llvm_shutdown_obj Y; // Call llvm_shutdown() on exit. + cl::ParseCommandLineOptions(argc, argv, "llvm linker\n"); - if (Verbose) std::cerr << "Linking in '" << InputFilenames[i] << "'\n"; + auto Composite = make_unique("llvm-link", Context); + Linker L(Composite.get(), diagnosticHandler); - if (LinkModules(Composite.get(), M.get(), &ErrorMessage)) { - std::cerr << argv[0] << ": link error in '" << InputFilenames[i] - << "': " << ErrorMessage << "\n"; - return 1; - } - } + // First add all the regular input files + if (!linkFiles(argv[0], Context, L, InputFilenames, false)) + return 1; - // TODO: Iterate over the -l list and link in any modules containing - // global symbols that have not been resolved so far. + // Next the -override ones. + if (!linkFiles(argv[0], Context, L, OverridingInputs, true)) + return 1; - if (DumpAsm) std::cerr << "Here's the assembly:\n" << Composite.get(); + if (DumpAsm) errs() << "Here's the assembly:\n" << *Composite; - std::ostream *Out = &std::cout; // Default to printing to stdout... - if (OutputFilename != "-") { - if (!Force && std::ifstream(OutputFilename.c_str())) { - // If force is not specified, make sure not to overwrite a file! - std::cerr << argv[0] << ": error opening '" << OutputFilename - << "': file exists!\n" - << "Use -f command line argument to force output\n"; - return 1; - } - Out = new std::ofstream(OutputFilename.c_str()); - if (!Out->good()) { - std::cerr << argv[0] << ": error opening '" << OutputFilename << "'!\n"; - return 1; - } - - // Make sure that the Out file gets unlinked from the disk if we get a - // SIGINT - sys::RemoveFileOnSignal(sys::Path(OutputFilename)); + std::error_code EC; + tool_output_file Out(OutputFilename, EC, sys::fs::F_None); + if (EC) { + errs() << EC.message() << '\n'; + return 1; } - if (verifyModule(*Composite.get())) { - std::cerr << argv[0] << ": linked module is broken!\n"; + if (verifyModule(*Composite, &errs())) { + errs() << argv[0] << ": error: linked module is broken!\n"; return 1; } - if (Verbose) std::cerr << "Writing bytecode...\n"; - WriteBytecodeToFile(Composite.get(), *Out, !NoCompress); + if (Verbose) errs() << "Writing bitcode...\n"; + if (OutputAssembly) { + Composite->print(Out.os(), nullptr, PreserveAssemblyUseListOrder); + } else if (Force || !CheckBitcodeOutputToConsole(Out.os(), true)) + WriteBitcodeToFile(Composite.get(), Out.os(), PreserveBitcodeUseListOrder); + + // Declare success. + Out.keep(); - if (Out != &std::cout) delete Out; return 0; }