summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYabin Cui <yabinc@google.com>2018-03-08 19:46:56 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-03-08 19:46:56 +0000
commit674e6e8de2211b2856377e229c348762e82c695e (patch)
tree4deeb7d2eefdd0c15948e2de85753b27029fca33
parent27ce6edfb81875dceb1b01b2d634900ab214c4ee (diff)
parent31f21a282356c1a5aca5109abe3db1d68f5c880d (diff)
downloadextras-android-o-mr1-iot-preview-7.tar.gz
Merge "simpleperf: Fix cached map in OfflineUnwinder."android-o-mr1-iot-preview-7o-mr1-iot-preview-7
-rw-r--r--simpleperf/OfflineUnwinder.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/simpleperf/OfflineUnwinder.cpp b/simpleperf/OfflineUnwinder.cpp
index ae33cafd..9d561447 100644
--- a/simpleperf/OfflineUnwinder.cpp
+++ b/simpleperf/OfflineUnwinder.cpp
@@ -131,7 +131,7 @@ bool OfflineUnwinder::UnwindCallChain(const ThreadEntry& thread, const RegSet& r
auto map_it = cached_maps_.find(thread.pid);
CachedMap& cached_map = (map_it == cached_maps_.end() ? cached_maps_[thread.pid]
: map_it->second);
- if (cached_map.version < thread.maps->version) {
+ if (!cached_map.map || cached_map.version < thread.maps->version) {
std::vector<backtrace_map_t> bt_maps(thread.maps->maps.size());
size_t map_index = 0;
for (auto& map : thread.maps->maps) {