1 files changed, 6 insertions, 6 deletions
diff --git a/compiler/optimizing/optimization.cc b/compiler/optimizing/optimization.cc
index bd8fbdf1d2..c876254050 100644
--- a/compiler/optimizing/optimization.cc
+++ b/compiler/optimizing/optimization.cc
@@ -40,6 +40,7 @@
 
 #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"
@@ -57,7 +58,6 @@
 #include "loop_optimization.h"
 #include "reference_type_propagation.h"
 #include "scheduler.h"
-#include "select_generator.h"
 #include "sharpening.h"
 #include "side_effects_analysis.h"
 #include "write_barrier_elimination.h"
@@ -88,8 +88,8 @@ const char* OptimizationPassName(OptimizationPass pass) {
       return HDeadCodeElimination::kDeadCodeEliminationPassName;
     case OptimizationPass::kInliner:
       return HInliner::kInlinerPassName;
-    case OptimizationPass::kSelectGenerator:
-      return HSelectGenerator::kSelectGeneratorPassName;
+    case OptimizationPass::kCodeFlowSimplifier:
+      return HCodeFlowSimplifier::kCodeFlowSimplifierPassName;
     case OptimizationPass::kAggressiveInstructionSimplifier:
     case OptimizationPass::kInstructionSimplifier:
       return InstructionSimplifier::kInstructionSimplifierPassName;
@@ -146,6 +146,7 @@ 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);
@@ -159,7 +160,6 @@ OptimizationPass OptimizationPassByName(const std::string& pass_name) {
   X(OptimizationPass::kLoopOptimization);
   X(OptimizationPass::kReferenceTypePropagation);
   X(OptimizationPass::kScheduling);
-  X(OptimizationPass::kSelectGenerator);
   X(OptimizationPass::kSideEffectsAnalysis);
 #ifdef ART_ENABLE_CODEGEN_arm
   X(OptimizationPass::kInstructionSimplifierArm);
@@ -266,8 +266,8 @@ ArenaVector<HOptimization*> ConstructOptimizations(
                                        pass_name);
         break;
       }
-      case OptimizationPass::kSelectGenerator:
-        opt = new (allocator) HSelectGenerator(graph, stats, pass_name);
+      case OptimizationPass::kCodeFlowSimplifier:
+        opt = new (allocator) HCodeFlowSimplifier(graph, stats, pass_name);
         break;
       case OptimizationPass::kInstructionSimplifier:
         opt = new (allocator) InstructionSimplifier(graph, codegen, stats, pass_name);