From 46261a74db3114e7035be0a3c5fb485fc3ec8ef6 Mon Sep 17 00:00:00 2001 From: Yunzhong Gao Date: Fri, 11 Sep 2015 20:01:53 +0000 Subject: Add a non-exiting diagnostic handler for LTO. This is in order to give LTO clients a chance to do some clean-up before terminating the process. llvm-svn: 247461 --- llvm/tools/llvm-lto/llvm-lto.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'llvm/tools/llvm-lto/llvm-lto.cpp') diff --git a/llvm/tools/llvm-lto/llvm-lto.cpp b/llvm/tools/llvm-lto/llvm-lto.cpp index ddde23175a3..cdb1bcaa6bc 100644 --- a/llvm/tools/llvm-lto/llvm-lto.cpp +++ b/llvm/tools/llvm-lto/llvm-lto.cpp @@ -216,8 +216,11 @@ int main(int argc, char **argv) { if (SetMergedModule && i == BaseArg) { // Transfer ownership to the code generator. CodeGen.setModule(std::move(Module)); - } else if (!CodeGen.addModule(Module.get())) + } else if (!CodeGen.addModule(Module.get())) { + // Print a message here so that we know addModule() did not abort. + errs() << argv[0] << ": error adding file '" << InputFilenames[i] << "'\n"; return 1; + } } // Add all the exported symbols to the table of symbols to preserve. -- cgit v1.2.3