[PATCH] D84858: [llvm-libtool-darwin] Refactor ArchiveWriter

[Sameer Arora via Phabricator via llvm-commits]

sameerarora101 created this revision.
sameerarora101 added reviewers: jhenderson, MaskRay, alexshap, Ktwu, smeenai.
Herald added subscribers: llvm-commits, hiraditya.
Herald added a project: LLVM.
sameerarora101 requested review of this revision.

Refactoring function `writeArchive` in ArchiveWriter. Added a new
function `writeArchiveBuffer` that returns the archive in a memory
buffer instead of writing it out to the disk. This refactor is necessary
so as to allow `llvm-libtool-darwin` to write universal files containing
archives.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D84858

Files:
  llvm/include/llvm/Object/ArchiveWriter.h
  llvm/lib/Object/ArchiveWriter.cpp


Index: llvm/lib/Object/ArchiveWriter.cpp
===================================================================
--- llvm/lib/Object/ArchiveWriter.cpp
+++ llvm/lib/Object/ArchiveWriter.cpp
@@ -552,10 +552,11 @@
   return std::string(Relative.str());
 }
 
-Error writeArchive(StringRef ArcName, ArrayRef<NewArchiveMember> NewMembers,
-                   bool WriteSymtab, object::Archive::Kind Kind,
-                   bool Deterministic, bool Thin,
-                   std::unique_ptr<MemoryBuffer> OldArchiveBuf) {
+Expected<sys::fs::TempFile>
+writeArchiveInFD(StringRef ArcName, ArrayRef<NewArchiveMember> NewMembers,
+                 bool WriteSymtab, object::Archive::Kind Kind,
+                 bool Deterministic, bool Thin,
+                 std::unique_ptr<MemoryBuffer> OldArchiveBuf) {
   assert((!Thin || !isBSDLike(Kind)) && "Only the gnu format has a thin mode");
 
   SmallString<0> SymNamesBuf;
@@ -566,7 +567,7 @@
   Expected<std::vector<MemberData>> DataOrErr = computeMemberData(
       StringTable, SymNames, Kind, Thin, Deterministic, NewMembers);
   if (Error E = DataOrErr.takeError())
-    return E;
+    return std::move(E);
   std::vector<MemberData> &Data = *DataOrErr;
 
   if (!StringTableBuf.empty())
@@ -639,7 +640,43 @@
   // closed before we attempt to rename.
   OldArchiveBuf.reset();
 
+  return Temp;
+}
+
+Error writeArchive(StringRef ArcName, ArrayRef<NewArchiveMember> NewMembers,
+                   bool WriteSymtab, object::Archive::Kind Kind,
+                   bool Deterministic, bool Thin,
+                   std::unique_ptr<MemoryBuffer> OldArchiveBuf) {
+
+  Expected<sys::fs::TempFile> Temp =
+      writeArchiveInFD(ArcName, NewMembers, WriteSymtab, Kind, Deterministic,
+                       Thin, std::move(OldArchiveBuf));
+  if (!Temp)
+    return Temp.takeError();
+
   return Temp->keep(ArcName);
 }
 
+Error writeArchiveBuffer(StringRef ArcName,
+                         ArrayRef<NewArchiveMember> NewMembers,
+                         bool WriteSymtab, object::Archive::Kind Kind,
+                         bool Deterministic, bool Thin,
+                         std::unique_ptr<MemoryBuffer> &ReturnBuffer,
+                         std::unique_ptr<MemoryBuffer> OldArchiveBuf) {
+
+  Expected<sys::fs::TempFile> Temp =
+      writeArchiveInFD(ArcName, NewMembers, WriteSymtab, Kind, Deterministic,
+                       Thin, std::move(OldArchiveBuf));
+  if (!Temp)
+    return Temp.takeError();
+
+  ErrorOr<std::unique_ptr<MemoryBuffer>> Ret =
+      MemoryBuffer::getOpenFile(Temp->FD, ArcName, -1);
+  if (std::error_code EC = Ret.getError())
+    return errorCodeToError(EC);
+
+  ReturnBuffer = std::move(Ret.get());
+  return Temp->discard();
+}
+
 } // namespace llvm
Index: llvm/include/llvm/Object/ArchiveWriter.h
===================================================================
--- llvm/include/llvm/Object/ArchiveWriter.h
+++ llvm/include/llvm/Object/ArchiveWriter.h
@@ -39,6 +39,13 @@
                    bool WriteSymtab, object::Archive::Kind Kind,
                    bool Deterministic, bool Thin,
                    std::unique_ptr<MemoryBuffer> OldArchiveBuf = nullptr);
+
+Error writeArchiveBuffer(StringRef ArcName,
+                         ArrayRef<NewArchiveMember> NewMembers,
+                         bool WriteSymtab, object::Archive::Kind Kind,
+                         bool Deterministic, bool Thin,
+                         std::unique_ptr<MemoryBuffer> &ReturnBuffer,
+                         std::unique_ptr<MemoryBuffer> OldArchiveBuf = nullptr);
 }
 
 #endif


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D84858.281619.patch
Type: text/x-patch
Size: 3570 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200729/67d2a5be/attachment.bin>