Merge pull request swiftlang#7938 from rastogishubham/zlibstuffstable

rastogishubham · web-flow · commit a0e5f4bebdd1 · 2024-01-05T15:23:13.000-08:00
Cherry-pick PR swiftlang#7929 into stable/20230725
diff --git a/llvm/lib/MCCAS/MCCASObjectV1.cpp b/llvm/lib/MCCAS/MCCASObjectV1.cpp
@@ -1894,13 +1894,17 @@ struct DIEDataWriter : public DataWriter {
 /// is described by some DIEAbbrevRef block.
 struct DistinctDataWriter : public DataWriter {
   Expected<DIEDistinctDataRef> getCASNode(MCCASBuilder &CASBuilder) {
+#if LLVM_ENABLE_ZLIB
     SmallVector<uint8_t> CompressedBuff;
     compression::zlib::compress(arrayRefFromStringRef(toStringRef(Data)),
                                 CompressedBuff);
     // Reserve 8 bytes for ULEB to store the size of the uncompressed data.
     CompressedBuff.append(8, 0);
     encodeULEB128(Data.size(), CompressedBuff.end() - 8, 8 /*Pad to*/);
     return DIEDistinctDataRef::create(CASBuilder, toStringRef(CompressedBuff));
+#else
+    return DIEDistinctDataRef::create(CASBuilder, toStringRef(Data));
+#endif
   }
 };
 
@@ -3392,16 +3396,19 @@ Error mccasformats::v1::visitDebugInfo(
     return LoadedTopRef.takeError();
 
   StringRef DistinctData = LoadedTopRef->DistinctData.getData();
+#if LLVM_ENABLE_ZLIB
   ArrayRef<uint8_t> BuffRef = arrayRefFromStringRef(DistinctData);
   auto UncompressedSize = decodeULEB128(BuffRef.data() + BuffRef.size() - 8);
   BuffRef = BuffRef.drop_back(8);
   SmallVector<uint8_t> OutBuff;
   if (auto E =
           compression::zlib::decompress(BuffRef, OutBuff, UncompressedSize))
     return E;
-  auto UncompressedDistinctData = toStringRef(OutBuff);
-  BinaryStreamReader DistinctReader(UncompressedDistinctData,
-                                    support::endianness::little);
+  DistinctData = toStringRef(OutBuff);
+  BinaryStreamReader DistinctReader(DistinctData, support::endianness::little);
+#else
+  BinaryStreamReader DistinctReader(DistinctData, support::endianness::little);
+#endif
   ArrayRef<char> HeaderData;
 
   auto BeginOffset = DistinctReader.getOffset();
@@ -3423,15 +3430,9 @@ Error mccasformats::v1::visitDebugInfo(
   HeaderCallback(toStringRef(HeaderData));
 
   append_range(TotAbbrevEntries, LoadedTopRef->AbbrevEntries);
-  DIEVisitor Visitor{DwarfVersion,
-                     {},
-                     TotAbbrevEntries,
-                     DistinctReader,
-                     UncompressedDistinctData,
-                     HeaderCallback,
-                     StartTagCallback,
-                     AttrCallback,
-                     EndTagCallback,
+  DIEVisitor Visitor{DwarfVersion,     {},           TotAbbrevEntries,
+                     DistinctReader,   DistinctData, HeaderCallback,
+                     StartTagCallback, AttrCallback, EndTagCallback,
                      NewBlockCallback};
   return Visitor.visitDIERef(LoadedTopRef->RootDIE);
 }
