summaryrefslogtreecommitdiffstats
path: root/llvm/tools/dsymutil/BinaryHolder.cpp
diff options
context:
space:
mode:
authorVedant Kumar <vsk@apple.com>2016-08-03 18:44:32 +0000
committerVedant Kumar <vsk@apple.com>2016-08-03 18:44:32 +0000
commitbfb6072d84fbd6169d57afe9d812de1abca7b5d7 (patch)
treeca63aef2231c865815c8d3af447996f6e9c34b96 /llvm/tools/dsymutil/BinaryHolder.cpp
parent23ee12e173762f977f1deeec14dccb32f6478204 (diff)
downloadbcm5719-llvm-bfb6072d84fbd6169d57afe9d812de1abca7b5d7.tar.gz
bcm5719-llvm-bfb6072d84fbd6169d57afe9d812de1abca7b5d7.zip
Revert "More fixes to get good error messages for bad archives."
This reverts commit r277540. It breaks the build with: ../lib/Object/Archive.cpp:264:41: error: return type of out-of-line definition of 'llvm::object::ArchiveMemberHeader::getUID' differs from that in the declaration Expected<unsigned> ArchiveMemberHeader::getUID() const { ~~~~~~~~~~~~~~~~~~ ^ include/llvm/Object/Archive.h:53:12: note: previous declaration is here unsigned getUID() const; ~~~~~~~~ ^ llvm-svn: 277627
Diffstat (limited to 'llvm/tools/dsymutil/BinaryHolder.cpp')
-rw-r--r--llvm/tools/dsymutil/BinaryHolder.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/llvm/tools/dsymutil/BinaryHolder.cpp b/llvm/tools/dsymutil/BinaryHolder.cpp
index 579ffc2bb74..abb4ea083c4 100644
--- a/llvm/tools/dsymutil/BinaryHolder.cpp
+++ b/llvm/tools/dsymutil/BinaryHolder.cpp
@@ -106,11 +106,8 @@ BinaryHolder::GetArchiveMemberBuffers(StringRef Filename,
for (auto Child : CurrentArchive->children(Err)) {
if (auto NameOrErr = Child.getName()) {
if (*NameOrErr == Filename) {
- Expected<sys::TimeValue> ModTimeOrErr = Child.getLastModified();
- if (!ModTimeOrErr)
- return errorToErrorCode(ModTimeOrErr.takeError());
if (Timestamp != sys::TimeValue::PosixZeroTime() &&
- Timestamp != ModTimeOrErr.get()) {
+ Timestamp != Child.getLastModified()) {
if (Verbose)
outs() << "\tmember had timestamp mismatch.\n";
continue;
OpenPOWER on IntegriCloud