From 089c5fc39d68b5670e20733f13a0bb472c71e27f Mon Sep 17 00:00:00 2001
From: Santiago Aboy Solanes <solanes@google.com>
Date: Fri, 2 Feb 2024 09:21:03 +0000
Subject: CompilerOptions refactor after aosp/2808063

* Updated comments
* Made constants constexpr
* Renamed kBaselineMaxCodeUnits to include "Inline"

Test: art/test/testrunner/testrunner.py --host --64 --optimizing -b
Change-Id: I37569b3d9e5eecfd65a505a79945bbe5b290fbbf
---
 compiler/optimizing/builder.cc | 4 ++--
 compiler/optimizing/inliner.cc | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'compiler/optimizing')

diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc
index 9233ea4fcd..1dea39626c 100644
--- a/compiler/optimizing/builder.cc
+++ b/compiler/optimizing/builder.cc
@@ -120,8 +120,8 @@ GraphAnalysisResult HGraphBuilder::BuildGraph() {
     return kAnalysisInvalidBytecode;
   }
 
-  // 2) Decide whether to skip this method based on its code size and number
-  //    of branches.
+  // 2) Decide whether to skip compiling this method based on e.g. the compiler filter and method's
+  // code size.
   if (SkipCompilation()) {
     return kAnalysisSkipped;
   }
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc
index 91f49c8ed8..fd3e787fc8 100644
--- a/compiler/optimizing/inliner.cc
+++ b/compiler/optimizing/inliner.cc
@@ -1553,7 +1553,7 @@ bool HInliner::IsInliningEncouraged(const HInvoke* invoke_instruction,
   }
 
   size_t inline_max_code_units = graph_->IsCompilingBaseline()
-      ? CompilerOptions::kBaselineMaxCodeUnits
+      ? CompilerOptions::kBaselineInlineMaxCodeUnits
       : codegen_->GetCompilerOptions().GetInlineMaxCodeUnits();
   if (accessor.InsnsSizeInCodeUnits() > inline_max_code_units) {
     LOG_FAIL(stats_, MethodCompilationStat::kNotInlinedCodeItem)
-- 
cgit v1.2.3-59-g8ed1b