commit 282795ca98d955697823aea6fd9c6b3f51780045
author Nicolas Geoffray <ngeoffray@google.com> Fri Sep 24 18:16:41 2021 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Tue Sep 28 07:59:34 2021 +0000
tree b8d95a385c18684e8fa7481bae6088dfbe365581
parent 03ce70a18e860abe5ab2e2198cb928e43a732e9c

Don't do a recursive call when there are CHA guards.

Otherwise we would continue execute the method with invalid inlining
optimizations.

Test: 832-cha-recursive
Bug: 19381779
Change-Id: I57d73828d2a9c30f429cf32906f94244346c1310

compiler/optimizing/code_generator_arm64.cc

diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc
index 4830d65..2549546 100644
--- a/compiler/optimizing/code_generator_arm64.cc
+++ b/compiler/optimizing/code_generator_arm64.cc
@@ -4639,6 +4639,7 @@
   switch (invoke->GetCodePtrLocation()) {
     case CodePtrLocation::kCallSelf:
       {
+        DCHECK(!GetGraph()->HasShouldDeoptimizeFlag());
         // Use a scope to help guarantee that `RecordPcInfo()` records the correct pc.
         ExactAssemblyScope eas(GetVIXLAssembler(),
                                kInstructionSize,