diff options
| author | Josh Gao <jmgao@google.com> | 2020-04-21 17:05:32 -0700 |
|---|---|---|
| committer | Josh Gao <jmgao@google.com> | 2020-04-29 17:20:24 -0700 |
| commit | 38d00b80a072374792bb159e558195eeb8cbd271 (patch) | |
| tree | 998768a77d6ee19c2dc47ea89ee1d223bbdad0e3 /libfdtrack | |
| parent | cbc67b305119dd1720a7eb03595482851c4ffcf6 (diff) | |
fdtrack: don't destroy traces.
There's a bad interaction with malloc_debug when the libraries are being
destroyed.
Bug: https://issuetracker.google.com/154439915
Test: treehugger
Change-Id: Ib47c8139c3a88dd52865ea93654b2926bd708729
Diffstat (limited to 'libfdtrack')
| -rw-r--r-- | libfdtrack/fdtrack.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libfdtrack/fdtrack.cpp b/libfdtrack/fdtrack.cpp index 8d9d61d10..d37157799 100644 --- a/libfdtrack/fdtrack.cpp +++ b/libfdtrack/fdtrack.cpp @@ -60,7 +60,7 @@ static constexpr size_t kFdTableSize = 4096; static constexpr size_t kStackDepth = 10; static bool installed = false; -static std::array<FdEntry, kFdTableSize> stack_traces; +static std::array<FdEntry, kFdTableSize> stack_traces [[clang::no_destroy]]; static unwindstack::LocalUnwinder& Unwinder() { static android::base::NoDestructor<unwindstack::LocalUnwinder> unwinder; return *unwinder.get(); |