averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[stable-merge] [driver] Adopt new Error/Expected API

Browse Source
This commit is contained in:
Vedant Kumar
2016-06-27 11:12:54 -07:00
parent 1409a445d9
commit 21118978aa
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/driver/autolink_extract_main.cpp
View File

@@ -139,9 +139,12 @@ static bool extractLinkerFlags(const llvm::object::Binary *Bin,
// FIXME: BinaryFileName below should instead be ld-style names for
// object files in archives, e.g. "foo.a(bar.o)".
if (!ChildBinary) {
Instance.getDiags().diagnose(SourceLoc(), diag::error_open_input_file,
BinaryFileName,
ChildBinary.getError().message());
llvm::handleAllErrors(
ChildBinary.takeError(), [&](llvm::ErrorInfoBase &EI) {
Instance.getDiags().diagnose(SourceLoc(),
diag::error_open_input_file,
BinaryFileName, EI.message());
});
return true;
}
if (extractLinkerFlags(ChildBinary->get(), Instance, BinaryFileName,