Fix the Archive::Child::getRawSize() method used by llvm-objdump’s -archive-headers...

and tweak its use in llvm-objdump.  Add back the test case for the -archive-headers option.

llvm-svn: 226332

diff --git a/llvm/include/llvm/Object/Archive.h b/llvm/include/llvm/Object/Archive.h
index 71906d1..e3b7a2a 100644 (file)
--- 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 (file)
--- 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 (file)
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 (file)
--- 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();