diff options
| author | 2016-04-27 21:03:42 +0000 | |
|---|---|---|
| committer | 2016-04-28 15:18:10 -0700 | |
| commit | d23d7d145c86975acbcc75505b8a323337066ac0 (patch) | |
| tree | a62d4397dd54fa1ee65ce870e3c0b0b965f43868 /runtime/stack.cc | |
| parent | 85e47976a483844177eb486d6e501fa070fbe6e2 (diff) | |
Revert "Write conflict tables in image"
Some strange issues on angler.
This reverts commit cda9386add68d94697449c6cb08b356747e55c21.
(cherry picked from commit 8e2478d23e89a7022c93ddc608dcbba7b29b91e6)
Change-Id: Iffd25c5fb732ff72b58c787c107dc33c56f8c8d4
Diffstat (limited to 'runtime/stack.cc')
| -rw-r--r-- | runtime/stack.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/runtime/stack.cc b/runtime/stack.cc index 45aeb92793..56ef5aaa90 100644 --- a/runtime/stack.cc +++ b/runtime/stack.cc @@ -678,10 +678,8 @@ void StackVisitor::SanityCheckFrame() const { if (space->IsImageSpace()) { auto* image_space = space->AsImageSpace(); const auto& header = image_space->GetImageHeader(); - const ImageSection& methods = header.GetMethodsSection(); - const ImageSection& runtime_methods = header.GetRuntimeMethodsSection(); - const size_t offset = reinterpret_cast<const uint8_t*>(method) - image_space->Begin(); - if (methods.Contains(offset) || runtime_methods.Contains(offset)) { + const auto* methods = &header.GetMethodsSection(); + if (methods->Contains(reinterpret_cast<const uint8_t*>(method) - image_space->Begin())) { in_image = true; break; } |