Moved requiresStructuredCFG check to pass creation

Signed-off-by: Mikhail R. Gadelha <[email protected]>

Author: mikhailramalho

llvm/lib/CodeGen/BranchFolding.cpp

@@ -124,9 +124,6 @@ INITIALIZE_PASS(BranchFolderLegacy, DEBUG_TYPE, "Control Flow Optimizer", false,
 PreservedAnalyses BranchFolderPass::run(MachineFunction &MF,
                                         MachineFunctionAnalysisManager &MFAM) {
   MFPropsModifier _(*this, MF);
-  bool EnableTailMerge =
-      !MF.getTarget().requiresStructuredCFG() && this->EnableTailMerge;
-
   auto &MBPI = MFAM.getResult<MachineBranchProbabilityAnalysis>(MF);
   auto *PSI = MFAM.getResult<ModuleAnalysisManagerMachineFunctionProxy>(MF)
                   .getCachedResult<ProfileSummaryAnalysis>(

llvm/lib/CodeGen/TargetPassConfig.cpp

@@ -1518,7 +1518,8 @@ void TargetPassConfig::addMachineLateOptimization() {
   addPass(&MachineLateInstrsCleanupID);
 
   // Branch folding must be run after regalloc and prolog/epilog insertion.
-  addPass(createBranchFolderPass(getEnableTailMerge()));
+  addPass(createBranchFolderPass(!TM->requiresStructuredCFG() &&
+                                 getEnableTailMerge()));
 
   // Tail duplication.
   // Note that duplicating tail just increases code size and degrades