Revert "[sanitizer] Add compress_stack_depot flag"
This is failing on clang-s390x-linux,
https://lab.llvm.org/buildbot/#/builders/94/builds/6748.
This reverts commit bf18253b0ee543f98119e5ab6a5b57d05c24d314.
GitOrigin-RevId: f9d585d0dd5751be302f33fd129bbd8c11641f54
diff --git a/lib/sanitizer_common/sanitizer_flags.inc b/lib/sanitizer_common/sanitizer_flags.inc
index 8295537..95da82b 100644
--- a/lib/sanitizer_common/sanitizer_flags.inc
+++ b/lib/sanitizer_common/sanitizer_flags.inc
@@ -191,8 +191,6 @@
"Format string used to render stack frames. "
"See sanitizer_stacktrace_printer.h for the format description. "
"Use DEFAULT to get default format.")
-COMMON_FLAG(int, compress_stack_depot, 0,
- "Compress stack depot to save memory.")
COMMON_FLAG(bool, no_huge_pages_for_shadow, true,
"If true, the shadow is not allowed to use huge pages. ")
COMMON_FLAG(bool, strict_string_checks, false,
diff --git a/lib/sanitizer_common/sanitizer_stackdepot.cpp b/lib/sanitizer_common/sanitizer_stackdepot.cpp
index 6c281e4..527221b 100644
--- a/lib/sanitizer_common/sanitizer_stackdepot.cpp
+++ b/lib/sanitizer_common/sanitizer_stackdepot.cpp
@@ -72,25 +72,12 @@
return stackStore.Allocated() + useCounts.MemoryUsage();
}
-static void CompressStackStore() {
- u64 start = MonotonicNanoTime();
- uptr diff = stackStore.Pack(static_cast<StackStore::Compression>(
- common_flags()->compress_stack_depot));
- if (!diff)
- return;
- u64 finish = MonotonicNanoTime();
- uptr total = stackStore.Allocated();
- VPrintf(1, "%s: StackDepot released %zu KiB out of %zu KiB in %llu ms\n",
- SanitizerToolName, diff >> 10, total >> 10,
- (finish - start) / 1000000);
-}
-
void StackDepotNode::store(u32 id, const args_type &args, hash_type hash) {
stack_hash = hash;
uptr pack = 0;
store_id = stackStore.Store(args, &pack);
- if (pack && common_flags()->compress_stack_depot)
- CompressStackStore();
+ if (pack)
+ stackStore.Pack(StackStore::Compression::None);
}
StackDepotNode::args_type StackDepotNode::load(u32 id) const {
diff --git a/test/sanitizer_common/TestCases/compress_stack_depot.cpp b/test/sanitizer_common/TestCases/compress_stack_depot.cpp
deleted file mode 100644
index 6df3b2c..0000000
--- a/test/sanitizer_common/TestCases/compress_stack_depot.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-// RUN: %clangxx %s -fsanitize-memory-track-origins=1 -o %t
-// RUN: %env_tool_opts="compress_stack_depot=0:malloc_context_size=128:verbosity=1" %run %t 2>&1 | FileCheck %s --implicit-check-not="StackDepot released"
-// RUN: %env_tool_opts="compress_stack_depot=1:malloc_context_size=128:verbosity=1" %run %t 2>&1 | FileCheck %s --check-prefixes=COMPRESS
-
-// Ubsan does not store stacks.
-// UNSUPPORTED: ubsan
-
-#include <memory>
-
-__attribute__((noinline)) void a(unsigned v);
-__attribute__((noinline)) void b(unsigned v);
-
-std::unique_ptr<int[]> p;
-
-__attribute__((noinline)) void a(unsigned v) {
- int x;
- v >>= 1;
- if (!v) {
- p.reset(new int[100]);
- p[1] = x;
- return;
- }
- if (v & 1)
- b(v);
- else
- a(v);
-}
-
-__attribute__((noinline)) void b(unsigned v) { return a(v); }
-
-int main(int argc, char *argv[]) {
- for (unsigned i = 0; i < 100000; ++i)
- a(i + (i << 16));
- return 0;
-}
-
-// COMPRESS: StackDepot released {{[0-9]+}}
