From 67e48ecc200bee6e4ac784c97446bb949fb20a9e Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Tue, 14 Dec 2021 11:00:05 +0000
Subject: More entrypoint handling cleanup.

- Move entrypoint initialization to instrumentation class.
- Move logic to know whether we should stay in the switch interpreter in
  the interpreter itself.

Test: test.py

Change-Id: I7e434ad0609b48c86ee601421d099934e8cd4d80
---
 runtime/stack.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime/stack.cc')

diff --git a/runtime/stack.cc b/runtime/stack.cc
index 7f1f47f2bc..e0b87de2cd 100644
--- a/runtime/stack.cc
+++ b/runtime/stack.cc
@@ -682,6 +682,7 @@ static void AssertPcIsWithinQuickCode(ArtMethod* method, uintptr_t pc)
   uintptr_t code_start = reinterpret_cast<uintptr_t>(code);
   CHECK(code_start <= pc && pc <= (code_start + code_size))
       << method->PrettyMethod()
+      << " " << Runtime::Current()->GetInstrumentation()->EntryPointString(code)
       << " pc=" << std::hex << pc
       << " code_start=" << code_start
       << " code_size=" << code_size;
-- 
cgit v1.2.3-59-g8ed1b