From c1271893af3f5c732b82ce133af8fbeafba2e79c Mon Sep 17 00:00:00 2001
From: Kevin Enderby <enderby@apple.com>
Date: Fri, 16 Jan 2015 22:10:36 +0000
Subject: [PATCH] =?utf8?q?Fix=20the=20Archive::Child::getRawSize()=20metho?=
 =?utf8?q?d=20used=20by=20llvm-objdump=E2=80=99s=20-archive-headers=20opti?=
 =?utf8?q?on=20and=20tweak=20its=20use=20in=20llvm-objdump.=20=20Add=20bac?=
 =?utf8?q?k=20the=20test=20case=20for=20the=20-archive-headers=20option.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

llvm-svn: 226332
---
 llvm/include/llvm/Object/Archive.h                          |  2 +-
 llvm/lib/Object/Archive.cpp                                 |  2 +-
 llvm/test/tools/llvm-objdump/X86/macho-archive-headers.test | 10 ++++++++++
 llvm/tools/llvm-objdump/MachODump.cpp                       |  2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 llvm/test/tools/llvm-objdump/X86/macho-archive-headers.test

diff --git a/llvm/include/llvm/Object/Archive.h b/llvm/include/llvm/Object/Archive.h
index 71906d1..e3b7a2a 100644
--- a/llvm/include/llvm/Object/Archive.h
+++ b/llvm/include/llvm/Object/Archive.h
@@ -91,7 +91,7 @@ public:
     }
     /// \return the size of the archive member without the header or padding.
     uint64_t getSize() const;
-    /// \return the size of the archive member with the header and padding.
+    /// \return the size in the archive header for this member.
     uint64_t getRawSize() const;
 
     StringRef getBuffer() const {
diff --git a/llvm/lib/Object/Archive.cpp b/llvm/lib/Object/Archive.cpp
index f14b29e..c8d510f 100644
--- a/llvm/lib/Object/Archive.cpp
+++ b/llvm/lib/Object/Archive.cpp
@@ -111,7 +111,7 @@ uint64_t Archive::Child::getSize() const {
 }
 
 uint64_t Archive::Child::getRawSize() const {
-  return Data.size();
+  return getHeader()->getSize();
 }
 
 Archive::Child Archive::Child::getNext() const {
diff --git a/llvm/test/tools/llvm-objdump/X86/macho-archive-headers.test b/llvm/test/tools/llvm-objdump/X86/macho-archive-headers.test
new file mode 100644
index 0000000..3d9043e
--- /dev/null
+++ b/llvm/test/tools/llvm-objdump/X86/macho-archive-headers.test
@@ -0,0 +1,10 @@
+RUN: llvm-objdump %p/Inputs/macho-universal-archive.x86_64.i386 -macho -archive-headers -arch all \
+RUN: | FileCheck %s
+
+# Note the date as printed by ctime(3) is time zone dependent and not checked.
+CHECK: Archive : {{.*}}/macho-universal-archive.x86_64.i386 (architecture x86_64)
+CHECK: -rw-r--r--124/11     44 {{.*}} __.SYMDEF SORTED
+CHECK: -rw-r--r--124/0     860 {{.*}} hello.o
+CHECK: Archive : {{.*}}/macho-universal-archive.x86_64.i386 (architecture i386)
+CHECK: -rw-r--r--124/11     60 {{.*}} __.SYMDEF SORTED
+CHECK: -rw-r--r--124/0     388 {{.*}} foo.o
diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp
index 51140c2..412055a 100644
--- a/llvm/tools/llvm-objdump/MachODump.cpp
+++ b/llvm/tools/llvm-objdump/MachODump.cpp
@@ -572,7 +572,7 @@ static void printArchiveChild(Archive::Child &C, bool verbose,
   outs() << format("%3d/", UID);
   unsigned GID = C.getGID();
   outs() << format("%-3d ", GID);
-  uint64_t Size = C.getRawSize() - sizeof(object::ArchiveMemberHeader);
+  uint64_t Size = C.getRawSize();
   outs() << format("%5d ", Size);
 
   StringRef RawLastModified = C.getRawLastModified();
-- 
2.7.4