From f208b70fbc4dee78067b3c5bd6cb92aa3ba58a1e Mon Sep 17 00:00:00 2001
From: Vedant Kumar <vsk@apple.com>
Date: Wed, 4 Dec 2019 10:35:14 -0800
Subject: Revert "[Coverage] Revise format to reduce binary size"

This reverts commit e18531595bba495946aa52c0a16b9f9238cff8bc.

On Windows, there is an error:

http://lab.llvm.org:8011/builders/sanitizer-windows/builds/54963/steps/stage%201%20check/logs/stdio

error: C:\b\slave\sanitizer-windows\build\stage1\projects\compiler-rt\test\profile\Profile-x86_64\Output\instrprof-merging.cpp.tmp.v1.o: Failed to load coverage: Malformed coverage data
---
 .../ProfileData/Coverage/CoverageMappingWriter.cpp | 31 ++++------------------
 1 file changed, 5 insertions(+), 26 deletions(-)

(limited to 'llvm/lib/ProfileData/Coverage/CoverageMappingWriter.cpp')

diff --git a/llvm/lib/ProfileData/Coverage/CoverageMappingWriter.cpp b/llvm/lib/ProfileData/Coverage/CoverageMappingWriter.cpp
index f2069ed..d75854a 100644
--- a/llvm/lib/ProfileData/Coverage/CoverageMappingWriter.cpp
+++ b/llvm/lib/ProfileData/Coverage/CoverageMappingWriter.cpp
@@ -11,11 +11,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/ProfileData/InstrProf.h"
 #include "llvm/ProfileData/Coverage/CoverageMappingWriter.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/SmallVector.h"
-#include "llvm/Support/Compression.h"
 #include "llvm/Support/LEB128.h"
 #include "llvm/Support/raw_ostream.h"
 #include <algorithm>
@@ -36,31 +34,12 @@ CoverageFilenamesSectionWriter::CoverageFilenamesSectionWriter(
 #endif
 }
 
-void CoverageFilenamesSectionWriter::write(raw_ostream &OS, bool Compress) {
-  std::string FilenamesStr;
-  {
-    raw_string_ostream FilenamesOS{FilenamesStr};
-    for (const auto &Filename : Filenames) {
-      encodeULEB128(Filename.size(), FilenamesOS);
-      FilenamesOS << Filename;
-    }
-  }
-
-  SmallString<128> CompressedStr;
-  bool doCompression =
-      Compress && zlib::isAvailable() && DoInstrProfNameCompression;
-  if (doCompression)
-    cantFail(
-        zlib::compress(FilenamesStr, CompressedStr, zlib::BestSizeCompression));
-
-  // ::= <num-filenames>
-  //     <uncompressed-len>
-  //     <compressed-len-or-zero>
-  //     (<compressed-filenames> | <uncompressed-filenames>)
+void CoverageFilenamesSectionWriter::write(raw_ostream &OS) {
   encodeULEB128(Filenames.size(), OS);
-  encodeULEB128(FilenamesStr.size(), OS);
-  encodeULEB128(doCompression ? CompressedStr.size() : 0U, OS);
-  OS << (doCompression ? StringRef(CompressedStr) : StringRef(FilenamesStr));
+  for (const auto &Filename : Filenames) {
+    encodeULEB128(Filename.size(), OS);
+    OS << Filename;
+  }
 }
 
 namespace {
-- 
cgit v1.1