From d23d7d145c86975acbcc75505b8a323337066ac0 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Wed, 27 Apr 2016 21:03:42 +0000 Subject: Revert "Write conflict tables in image" Some strange issues on angler. This reverts commit cda9386add68d94697449c6cb08b356747e55c21. (cherry picked from commit 8e2478d23e89a7022c93ddc608dcbba7b29b91e6) Change-Id: Iffd25c5fb732ff72b58c787c107dc33c56f8c8d4 --- runtime/stack.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'runtime/stack.cc') 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(method) - image_space->Begin(); - if (methods.Contains(offset) || runtime_methods.Contains(offset)) { + const auto* methods = &header.GetMethodsSection(); + if (methods->Contains(reinterpret_cast(method) - image_space->Begin())) { in_image = true; break; } -- cgit v1.2.3-59-g8ed1b