[clang-offload-bundler] Initialize member names in unbundled archive (#3049)

Member names in the unbundled archive were not properly initialized
which could lead to random problems for tools working with these
archives later. This patch fixes this problem.

There is no LIT test in this patch because it is impossible to create
stable test which shows the problem.

Signed-off-by: Sergey Dmitriev [email protected]

Author: sndmitriev

clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp

@@ -993,8 +993,6 @@ class ArchiveFileHandler final : public FileHandler {
     }
 
     // Extracted objects data for archive mode.
-    SmallVector<std::string, 8u> ArNames;
-    SmallVector<SmallVector<char, 0u>, 8u> ArData;
     SmallVector<NewArchiveMember, 8u> ArMembers;
 
     // Read all children.
@@ -1057,17 +1055,17 @@ class ArchiveFileHandler final : public FileHandler {
             if (Error Err = OFH.ReadBundle(OS, *Buf))
               return Err;
           } else if (Mode == OutputType::Archive) {
-            auto &Name =
-                ArNames.emplace_back((TT + "." + *ChildNameOrErr).str());
-            auto &Data = ArData.emplace_back();
+            // Extract the bundle to a buffer.
+            SmallVector<char> Data;
             raw_svector_ostream ChildOS{Data};
-
-            // Extract the bundle.
             if (Error Err = OFH.ReadBundle(ChildOS, *Buf))
               return Err;
 
-            ArMembers.emplace_back(
-                MemoryBufferRef{StringRef(Data.data(), Data.size()), Name});
+            // Add new archive member.
+            NewArchiveMember &Member = ArMembers.emplace_back();
+            std::string Name = (TT + "." + *ChildNameOrErr).str();
+            Member.Buf = MemoryBuffer::getMemBufferCopy(ChildOS.str(), Name);
+            Member.MemberName = Member.Buf->getBufferIdentifier();
           }
           if (Error Err = OFH.ReadBundleEnd(*Buf))
             return Err;