diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2016-11-09 17:49:19 +0000 |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2016-11-09 17:49:19 +0000 |
| commit | 7f00d0a125b98a1c68b05e7b6be4e89f39bf8240 (patch) | |
| tree | b13eb173d29b968498f03be9eceaf03f58752d76 /llvm/lib/LTO/LTOBackend.cpp | |
| parent | 9934c54cca1bc94e02f58c3fe1209e72312c115b (diff) | |
| download | bcm5719-llvm-7f00d0a125b98a1c68b05e7b6be4e89f39bf8240.tar.gz bcm5719-llvm-7f00d0a125b98a1c68b05e7b6be4e89f39bf8240.zip | |
Bitcode: Change the materializer interface to return llvm::Error.
Differential Revision: https://reviews.llvm.org/D26439
llvm-svn: 286382
Diffstat (limited to 'llvm/lib/LTO/LTOBackend.cpp')
| -rw-r--r-- | llvm/lib/LTO/LTOBackend.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/lib/LTO/LTOBackend.cpp b/llvm/lib/LTO/LTOBackend.cpp index 0885c0b8484..fb1cfed96bb 100644 --- a/llvm/lib/LTO/LTOBackend.cpp +++ b/llvm/lib/LTO/LTOBackend.cpp @@ -359,7 +359,8 @@ Error lto::thinBackend(Config &Conf, unsigned Task, AddStreamFn AddStream, }; FunctionImporter Importer(CombinedIndex, ModuleLoader); - Importer.importFunctions(Mod, ImportList); + if (Error Err = Importer.importFunctions(Mod, ImportList).takeError()) + return Err; if (Conf.PostImportModuleHook && !Conf.PostImportModuleHook(Task, Mod)) return Error(); |
