2 files changed, 11 insertions, 7 deletions
diff --git a/include/llvm/Object/Archive.h b/include/llvm/Object/Archive.h
index aac978c..0cd1867 100644
--- a/include/llvm/Object/Archive.h
+++ b/include/llvm/Object/Archive.h
@@ -36,10 +36,6 @@ struct ArchiveMemberHeader {
   uint64_t getSize() const;
 };
 
-static const ArchiveMemberHeader *ToHeader(const char *base) {
-  return reinterpret_cast<const ArchiveMemberHeader *>(base);
-}
-
 class Archive : public Binary {
   virtual void anchor();
 public:
@@ -50,6 +46,10 @@ public:
     /// \brief Offset from Data to the start of the file.
     uint16_t StartOfFile;
 
+    const ArchiveMemberHeader *getHeader() const {
+      return reinterpret_cast<const ArchiveMemberHeader *>(Data.data());
+    }
+
   public:
     Child(const Archive *Parent, const char *Start);
 
@@ -64,7 +64,7 @@ public:
     Child getNext() const;
 
     error_code getName(StringRef &Result) const;
-    StringRef getRawName() const { return ToHeader(Data.data())->getName(); }
+    StringRef getRawName() const { return getHeader()->getName(); }
     /// \return the size of the archive member without the header or padding.
     uint64_t getSize() const { return Data.size() - StartOfFile; }
 
diff --git a/lib/Object/Archive.cpp b/lib/Object/Archive.cpp
index c8a9692..14b21fd 100644
--- a/lib/Object/Archive.cpp
+++ b/lib/Object/Archive.cpp
@@ -61,12 +61,16 @@ uint64_t ArchiveMemberHeader::getSize() const {
   return ret;
 }
 
+static const ArchiveMemberHeader *toHeader(const char *base) {
+  return reinterpret_cast<const ArchiveMemberHeader *>(base);
+}
+
 Archive::Child::Child(const Archive *Parent, const char *Start)
     : Parent(Parent) {
   if (!Start)
     return;
 
-  const ArchiveMemberHeader *Header = ToHeader(Start);
+  const ArchiveMemberHeader *Header = toHeader(Start);
   Data = StringRef(Start, sizeof(ArchiveMemberHeader) + Header->getSize());
 
   // Setup StartOfFile and PaddingBytes.
@@ -270,7 +274,7 @@ Archive::child_iterator Archive::begin_children(bool skip_internal) const {
   const char *Loc = Data->getBufferStart() + strlen(Magic);
   Child c(this, Loc);
   // Skip internals at the beginning of an archive.
-  if (skip_internal && isInternalMember(*ToHeader(Loc)))
+  if (skip_internal && isInternalMember(*toHeader(Loc)))
     return c.getNext();
   return c;
 }