diff options
| author | 2022-12-15 14:58:21 +0000 | |
|---|---|---|
| committer | 2022-12-16 14:43:35 +0000 | |
| commit | bf778f0cc4d91b93ebd877db0a3f4187d482be4b (patch) | |
| tree | 7ea2e53244331f01ae91ca6c41f8a77ca19fa26c /compiler/optimizing/nodes.cc | |
| parent | aa41e55d3f2c0cda1a39b8528097313e94492132 (diff) | |
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
Diffstat (limited to 'compiler/optimizing/nodes.cc')
| -rw-r--r-- | compiler/optimizing/nodes.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc index 8491c24b23..0e85838862 100644 --- a/compiler/optimizing/nodes.cc +++ b/compiler/optimizing/nodes.cc @@ -2788,6 +2788,9 @@ HInstruction* HGraph::InlineInto(HGraph* outer_graph, HInvoke* invoke) { if (HasTryCatch()) { outer_graph->SetHasTryCatch(true); } + if (HasMonitorOperations()) { + outer_graph->SetHasMonitorOperations(true); + } if (HasSIMD()) { outer_graph->SetHasSIMD(true); } |