Snap for 12969164 from f3c480ffeb31af6c99858b5608ed610018062dae to 25Q2-release

Change-Id: I2c4aabe02793d21090d9f1c9e3a04f3dd1933364

1 files changed, 6 insertions, 6 deletions

diff --git a/compiler/optimizing/optimization.cc b/compiler/optimizing/optimization.cc
index c876254050..31780739bc 100644
--- a/compiler/optimizing/optimization.cc
+++ b/compiler/optimizing/optimization.cc
@@ -40,10 +40,10 @@
 
 #include "bounds_check_elimination.h"
 #include "cha_guard_optimization.h"
-#include "code_flow_simplifier.h"
 #include "code_sinking.h"
 #include "constant_folding.h"
 #include "constructor_fence_redundancy_elimination.h"
+#include "control_flow_simplifier.h"
 #include "dead_code_elimination.h"
 #include "dex/code_item_accessors-inl.h"
 #include "driver/compiler_options.h"
@@ -88,8 +88,8 @@ const char* OptimizationPassName(OptimizationPass pass) {
       return HDeadCodeElimination::kDeadCodeEliminationPassName;
     case OptimizationPass::kInliner:
       return HInliner::kInlinerPassName;
-    case OptimizationPass::kCodeFlowSimplifier:
-      return HCodeFlowSimplifier::kCodeFlowSimplifierPassName;
+    case OptimizationPass::kControlFlowSimplifier:
+      return HControlFlowSimplifier::kControlFlowSimplifierPassName;
     case OptimizationPass::kAggressiveInstructionSimplifier:
     case OptimizationPass::kInstructionSimplifier:
       return InstructionSimplifier::kInstructionSimplifierPassName;
@@ -146,10 +146,10 @@ const char* OptimizationPassName(OptimizationPass pass) {
 OptimizationPass OptimizationPassByName(const std::string& pass_name) {
   X(OptimizationPass::kBoundsCheckElimination);
   X(OptimizationPass::kCHAGuardOptimization);
-  X(OptimizationPass::kCodeFlowSimplifier);
   X(OptimizationPass::kCodeSinking);
   X(OptimizationPass::kConstantFolding);
   X(OptimizationPass::kConstructorFenceRedundancyElimination);
+  X(OptimizationPass::kControlFlowSimplifier);
   X(OptimizationPass::kDeadCodeElimination);
   X(OptimizationPass::kGlobalValueNumbering);
   X(OptimizationPass::kInductionVarAnalysis);
@@ -266,8 +266,8 @@ ArenaVector<HOptimization*> ConstructOptimizations(
                                        pass_name);
         break;
       }
-      case OptimizationPass::kCodeFlowSimplifier:
-        opt = new (allocator) HCodeFlowSimplifier(graph, stats, pass_name);
+      case OptimizationPass::kControlFlowSimplifier:
+        opt = new (allocator) HControlFlowSimplifier(graph, stats, pass_name);
         break;
       case OptimizationPass::kInstructionSimplifier:
         opt = new (allocator) InstructionSimplifier(graph, codegen, stats, pass_name);