commit 41365dcfd1b451fe69913ce0027cd81e5b299dcb
author Vladimir Marko <vmarko@google.com> Tue Jun 27 16:26:23 2023 +0200
committer Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Jun 27 16:25:20 2023 +0000
tree e867ab605c0ea6c41cbaf616bd7c68edfce4b812
parent cc19d4026302b76016d4b9fa769eefda67aa67dd

riscv64: Do not use nterp for methods in compact dex.

Test: buildbot-build.sh --target
Bug: 283082047
Change-Id: I14e8a59ef17544a2799640efbaaed2974d86146d

runtime/nterp_helpers.cc

diff --git a/runtime/nterp_helpers.cc b/runtime/nterp_helpers.cc
index d368109..bcedc35 100644
--- a/runtime/nterp_helpers.cc
+++ b/runtime/nterp_helpers.cc
@@ -235,6 +235,9 @@
     return false;
   }
   if (isa == InstructionSet::kRiscv64) {
+    if (method->GetDexFile()->IsCompactDexFile()) {
+      return false;  // Riscv64 nterp does not support compact dex yet.
+    }
     if (method->DexInstructionData().TriesSize() != 0u) {
       return false;  // Riscv64 nterp does not support exception handling yet.
     }