commit bf778f0cc4d91b93ebd877db0a3f4187d482be4b
author Santiago Aboy Solanes <solanes@google.com> Thu Dec 15 14:58:21 2022 +0000
committer Santiago Aboy Solanes <solanes@google.com> Fri Dec 16 14:43:35 2022 +0000
tree 7ea2e53244331f01ae91ca6c41f8a77ca19fa26c
parent aa41e55d3f2c0cda1a39b8528097313e94492132

Set HasMonitorOperations in the outer graph when inlining

If the callee graph has monitor operations, the outer graph will
have them too when inlining.

If we don't do this, e.g. we will skip adding the needed vreg info
https://cs.android.com/android/platform/superproject/+/master:art/compiler/optimizing/code_generator.cc;l=1193;drc=434d968b4af0bc8af9889170250bee3e08839bea.

Test: art/test/testrunner/testrunner.py --host --64 --optimizing -b
Change-Id: I97817ea93c12727bb7d198fb5abea21c32d181c9

compiler/optimizing/nodes.cc

diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc
index 8491c24..0e85838 100644
--- a/compiler/optimizing/nodes.cc
+++ b/compiler/optimizing/nodes.cc
@@ -2788,6 +2788,9 @@
   if (HasTryCatch()) {
     outer_graph->SetHasTryCatch(true);
   }
+  if (HasMonitorOperations()) {
+    outer_graph->SetHasMonitorOperations(true);
+  }
   if (HasSIMD()) {
     outer_graph->SetHasSIMD(true);
   }