commit 6bec6b2a56970adf68201925330a84424892d5c9
author Nicolas Geoffray <ngeoffray@google.com> Tue Oct 13 19:14:15 2015 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Tue Oct 13 19:14:15 2015 +0100
tree 2539412bebac2938d06ff20fa71d1a02b3b4c946
parent f91b0e03d4b31bdb96757cf56cecc2cfeacbbbc4

Fix braino in ArtCode refactoring.

AssertPcIsWithinQuickCode is tricky. Will clean-up in
next changes.

Change-Id: Ie97d3d4a54cb568ea33e645e7d6d9a0c337e9c6a

runtime/art_code.cc

diff --git a/runtime/art_code.cc b/runtime/art_code.cc
index b999ec8..ad0b170 100644
--- a/runtime/art_code.cc
+++ b/runtime/art_code.cc
@@ -286,8 +286,10 @@
     return;
   }
 
-  uint32_t code_size = reinterpret_cast<const OatQuickMethodHeader*>(code)[-1].code_size_;
-  CHECK(PcIsWithinQuickCode(pc))
+  uint32_t code_size = reinterpret_cast<const OatQuickMethodHeader*>(
+      EntryPointToCodePointer(code))[-1].code_size_;
+  uintptr_t code_start = reinterpret_cast<uintptr_t>(code);
+  CHECK(code_start <= pc && pc <= (code_start + code_size))
       << PrettyMethod(method_)
       << " pc=" << std::hex << pc
       << " code=" << code