From da9dd05011be9f9d6576299a24aee639d212faff Mon Sep 17 00:00:00 2001
From: Kevin Enderby <enderby@apple.com>
Date: Wed, 21 Oct 2015 17:13:20 +0000
Subject: Backing out commit r250906 as it broke lld.

llvm-svn: 250908
---
 llvm/lib/Object/ArchiveWriter.cpp | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'llvm/lib/Object/ArchiveWriter.cpp')

diff --git a/llvm/lib/Object/ArchiveWriter.cpp b/llvm/lib/Object/ArchiveWriter.cpp
index 1f304ccfb75..dae0188a21e 100644
--- a/llvm/lib/Object/ArchiveWriter.cpp
+++ b/llvm/lib/Object/ArchiveWriter.cpp
@@ -347,10 +347,10 @@ llvm::writeArchive(StringRef ArcName,
       MemberRef = Buffers.back()->getMemBufferRef();
     } else {
       object::Archive::child_iterator OldMember = Member.getOld();
-      assert((!Thin || (*OldMember && (*OldMember)->getParent()->isThin())) &&
+      assert((!Thin || OldMember->getParent()->isThin()) &&
              "Thin archives cannot refers to member of other archives");
       ErrorOr<MemoryBufferRef> MemberBufferOrErr =
-          (*OldMember)->getMemoryBufferRef();
+          OldMember->getMemoryBufferRef();
       if (auto EC = MemberBufferOrErr.getError())
         return std::make_pair("", EC);
       MemberRef = MemberBufferOrErr.get();
@@ -398,10 +398,10 @@ llvm::writeArchive(StringRef ArcName,
       Perms = Status.permissions();
     } else {
       object::Archive::child_iterator OldMember = I.getOld();
-      ModTime = (*OldMember)->getLastModified();
-      UID = (*OldMember)->getUID();
-      GID = (*OldMember)->getGID();
-      Perms = (*OldMember)->getAccessMode();
+      ModTime = OldMember->getLastModified();
+      UID = OldMember->getUID();
+      GID = OldMember->getGID();
+      Perms = OldMember->getAccessMode();
     }
 
     if (I.isNewMember()) {
@@ -412,11 +412,8 @@ llvm::writeArchive(StringRef ArcName,
                         Status.getSize());
     } else {
       object::Archive::child_iterator OldMember = I.getOld();
-      ErrorOr<uint32_t> Size = (*OldMember)->getSize();
-      if (std::error_code EC = Size.getError())
-        return std::make_pair("", EC);
       printMemberHeader(Out, Kind, Thin, I.getName(), StringMapIndexIter,
-                        ModTime, UID, GID, Perms, Size.get());
+                        ModTime, UID, GID, Perms, OldMember->getSize());
     }
 
     if (!Thin)
-- 
cgit v1.2.3