summaryrefslogtreecommitdiff
path: root/libbacktrace/UnwindStackMap.h
diff options
context:
space:
mode:
authorDavid Srbecky <dsrbecky@google.com>2018-02-23 18:06:13 +0000
committerDavid Srbecky <dsrbecky@google.com>2019-03-29 14:01:32 +0000
commit91dc724d5ba73d60cc0f7c2b01e559e899ff3a87 (patch)
treefac7af5e6c483517979497b2c3e17a58bc7df5c0 /libbacktrace/UnwindStackMap.h
parentd2a07ef525b8413f93c7e951ac3a2a78d09339ad (diff)
downloadunwinding-91dc724d5ba73d60cc0f7c2b01e559e899ff3a87.tar.gz
Check for data races when reading JIT/DEX entries.
Update the entries only when the list is modified by the runtime. Check that the list wasn't concurrently modified when being read. Bug: 124287208 Test: libunwindstack_test Test: art/test.py -b --host -r -t 137-cfi Change-Id: I87ba70322053a01b3d5be1fdf6310e1dc21bb084
Diffstat (limited to 'libbacktrace/UnwindStackMap.h')
-rw-r--r--libbacktrace/UnwindStackMap.h14
1 files changed, 0 insertions, 14 deletions
diff --git a/libbacktrace/UnwindStackMap.h b/libbacktrace/UnwindStackMap.h
index e19b605..9bb9709 100644
--- a/libbacktrace/UnwindStackMap.h
+++ b/libbacktrace/UnwindStackMap.h
@@ -27,9 +27,6 @@
#include <backtrace/Backtrace.h>
#include <backtrace/BacktraceMap.h>
-#if !defined(NO_LIBDEXFILE_SUPPORT)
-#include <unwindstack/DexFiles.h>
-#endif
#include <unwindstack/Elf.h>
#include <unwindstack/JitDebug.h>
#include <unwindstack/Maps.h>
@@ -53,12 +50,6 @@ class UnwindStackMap : public BacktraceMap {
const std::shared_ptr<unwindstack::Memory>& process_memory() { return process_memory_; }
- unwindstack::JitDebug* GetJitDebug() { return jit_debug_.get(); }
-
-#if !defined(NO_LIBDEXFILE_SUPPORT)
- unwindstack::DexFiles* GetDexFiles() { return dex_files_.get(); }
-#endif
-
void SetArch(unwindstack::ArchEnum arch) { arch_ = arch; }
protected:
@@ -66,11 +57,6 @@ class UnwindStackMap : public BacktraceMap {
std::unique_ptr<unwindstack::Maps> stack_maps_;
std::shared_ptr<unwindstack::Memory> process_memory_;
- std::unique_ptr<unwindstack::JitDebug> jit_debug_;
-#if !defined(NO_LIBDEXFILE_SUPPORT)
- std::unique_ptr<unwindstack::DexFiles> dex_files_;
-#endif
-
unwindstack::ArchEnum arch_ = unwindstack::ARCH_UNKNOWN;
};