Resolve build issue and address PR comments.

Author: david-salinas

llvm/include/llvm/Object/OffloadBundle.h

@@ -75,11 +75,8 @@ struct OffloadBundleEntry {
   uint64_t Size = 0u;
   uint64_t IDLength = 0u;
   std::string ID;
-  OffloadBundleEntry(uint64_t O, uint64_t S, uint64_t I, std::string T)
-      : Offset(O), Size(S), IDLength(I) {
-    ID.reserve(T.size());
-    ID = T;
-  }
+  OffloadBundleEntry(uint64_t O, uint64_t S, uint64_t I, StringRef T)
+      : Offset(O), Size(S), IDLength(I), ID(T.str()) {}
   void dumpInfo(raw_ostream &OS) {
     OS << "Offset = " << Offset << ", Size = " << Size
        << ", ID Length = " << IDLength << ", ID = " << ID << "\n";
@@ -96,8 +93,8 @@ class OffloadBundleFatBin {
   uint64_t Size = 0u;
   StringRef FileName;
   uint64_t NumberOfEntries;
-  SmallVector<OffloadBundleEntry> Entries;
   bool Decompressed;
+  SmallVector<OffloadBundleEntry> Entries;
 
 public:
   std::unique_ptr<MemoryBuffer> DecompressedBuffer;
@@ -128,7 +125,7 @@ class OffloadBundleFatBin {
 
   OffloadBundleFatBin(MemoryBufferRef Source, StringRef File,
                       bool Decompress = false)
-      : FileName(File), Decompressed(Decompress), NumberOfEntries(0),
+      : FileName(File), NumberOfEntries(0), Decompressed(Decompress),
         Entries(SmallVector<OffloadBundleEntry>()) {
     if (Decompress)
       DecompressedBuffer =

llvm/lib/Object/OffloadBundle.cpp

@@ -62,7 +62,7 @@ Error extractOffloadBundle(MemoryBufferRef Contents, uint64_t SectionOffset,
         return createFileError(FileName, EC);
 
       Expected<std::unique_ptr<MemoryBuffer>> DecompressedBufferOrErr =
-          CompressedOffloadBundle::decompress(**CodeOrErr, &nulls());
+          CompressedOffloadBundle::decompress(**CodeOrErr, nullptr);
       if (!DecompressedBufferOrErr)
         return createStringError(
             inconvertibleErrorCode(),
@@ -137,8 +137,7 @@ Error OffloadBundleFatBin::readEntries(StringRef Buffer,
       return errorCodeToError(object_error::parse_failed);
 
     auto Entry = std::make_unique<OffloadBundleEntry>(
-        EntryOffset + SectionOffset, EntrySize, EntryIDSize,
-        std::move(EntryID.str()));
+        EntryOffset + SectionOffset, EntrySize, EntryIDSize, EntryID);
 
     Entries.push_back(*Entry);
   }