diff options
author | Reid Spencer <rspencer@reidspencer.com> | 2007-08-16 07:23:37 +0000 |
---|---|---|
committer | Reid Spencer <rspencer@reidspencer.com> | 2007-08-16 07:23:37 +0000 |
commit | af11dc00a0c70fde950f70bd13a43e7cbb98ef72 (patch) | |
tree | 238f29e3effd4a1a17f60ea6abbc0aa7f5e4e9e3 /lib | |
parent | 3c1b4012b6d577926e53d1343ccfa4247f677b4a (diff) | |
download | external_llvm-af11dc00a0c70fde950f70bd13a43e7cbb98ef72.zip external_llvm-af11dc00a0c70fde950f70bd13a43e7cbb98ef72.tar.gz external_llvm-af11dc00a0c70fde950f70bd13a43e7cbb98ef72.tar.bz2 |
Ensure that error messages a propagated from calls to LinkInModule so they get
reported to the end user.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@41117 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Linker/LinkItems.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/Linker/LinkItems.cpp b/lib/Linker/LinkItems.cpp index ad0ccd2..976dee0 100644 --- a/lib/Linker/LinkItems.cpp +++ b/lib/Linker/LinkItems.cpp @@ -162,8 +162,9 @@ bool Linker::LinkInFile(const sys::Path &File, bool &is_native) { if (MemoryBuffer *Buffer = MemoryBuffer::getSTDIN()) { M.reset(ParseBitcodeFile(Buffer, &Error)); delete Buffer; - if (!LinkInModule(M.get())) - return false; + if (M.get()) + if (!LinkInModule(M.get(), &Error)) + return false; } else Error = "standard input is empty"; return error("Cannot link stdin: " + Error); @@ -195,7 +196,7 @@ bool Linker::LinkInFile(const sys::Path &File, bool &is_native) { std::auto_ptr<Module> M(LoadObject(File)); if (M.get() == 0) return error("Cannot load file '" + File.toString() + "'" + Error); - if (LinkInModule(M.get())) + if (LinkInModule(M.get(), &Error)) return error("Cannot link file '" + File.toString() + "'" + Error); verbose("Linked in file '" + File.toString() + "'"); |