From b48816b9fc8f4414984cd6ec30fe48a468b4502a Mon Sep 17 00:00:00 2001 From: Kevin Enderby Date: Wed, 3 Aug 2016 21:57:47 +0000 Subject: Clean up of libObject/Archive interfaces and change the last three uses of ErrorOr<> changing them to Expected<> to allow them to pass through llvm Errors. No functional change. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit by itself will break the next lld builds.  I’ll be committing the matching change for lld immediately next. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@277656 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llvm-nm/llvm-nm.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tools/llvm-nm') diff --git a/tools/llvm-nm/llvm-nm.cpp b/tools/llvm-nm/llvm-nm.cpp index 424303b1695..af3d7db1dda 100644 --- a/tools/llvm-nm/llvm-nm.cpp +++ b/tools/llvm-nm/llvm-nm.cpp @@ -1097,9 +1097,9 @@ static void dumpSymbolNamesFromFile(std::string &Filename) { if (I != E) { outs() << "Archive map\n"; for (; I != E; ++I) { - ErrorOr C = I->getMember(); - if (error(C.getError())) - return; + Expected C = I->getMember(); + if (!C) + error(C.takeError(), Filename); Expected FileNameOrErr = C->getName(); if (!FileNameOrErr) { error(FileNameOrErr.takeError(), Filename); -- cgit v1.2.3