commit 78c5aa44a31c69b3bce122cb3084789724f96677
author Nicolas Geoffray <ngeoffray@google.com> Mon Feb 06 16:17:18 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 06 16:17:18 2023 +0000
tree 258fbe77c993db37c989f676e363f5653bf71472
parent 84494935157d0098d1692aed392aaffc8394998d
parent bfb2591159eb3f48c29ddd78cc3102c89f57b442

Another fix at setting entrypoints in the runtime image. am: bfb2591159

Original change: https://android-review.googlesource.com/c/platform/art/+/2422727

Change-Id: Id91bf3733c965da6ce90477f46533c9283b6a892
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

runtime/runtime_image.cc

diff --git a/runtime/runtime_image.cc b/runtime/runtime_image.cc
index 9131fda..661a35c 100644
--- a/runtime/runtime_image.cc
+++ b/runtime/runtime_image.cc
@@ -740,12 +740,12 @@
       StubType stub;
       if (method->IsNative()) {
         stub = StubType::kQuickGenericJNITrampoline;
-      } else if (cls->IsVerified() &&
-                 method->SkipAccessChecks() &&
-                 !method->NeedsClinitCheckBeforeCall()) {
-        stub = StubType::kNterpTrampoline;
-      } else {
+      } else if (!cls->IsVerified()) {
         stub = StubType::kQuickToInterpreterBridge;
+      } else if (method->NeedsClinitCheckBeforeCall()) {
+        stub = StubType::kQuickResolutionTrampoline;
+      } else {
+        stub = StubType::kNterpTrampoline;
       }
       const std::vector<gc::space::ImageSpace*>& image_spaces =
           Runtime::Current()->GetHeap()->GetBootImageSpaces();