[lto] Enable new PM when the PM config is non-empty

d0k · d0k · commit 715dc556b782 · 2021-02-15T20:49:09.000+01:00
This restores the behavior before 964f810, which broke 2 tests: LLVM :: tools/llvm-lto2/X86/pipeline.ll lld :: ELF/lto/ltopasses-custom.ll
diff --git a/llvm/lib/LTO/LTOBackend.cpp b/llvm/lib/LTO/LTOBackend.cpp
@@ -355,7 +355,7 @@ bool lto::opt(const Config &Conf, TargetMachine *TM, unsigned Task, Module &Mod,
                                /*Cmdline*/ CmdArgs);
   }
   // FIXME: Plumb the combined index into the new pass manager.
-  if (Conf.UseNewPM) {
+  if (Conf.UseNewPM || !Conf.OptPipeline.empty()) {
     runNewPMPasses(Conf, Mod, TM, Conf.OptLevel, IsThinLTO, ExportSummary,
                    ImportSummary);
   } else {

Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,7 @@ bool lto::opt(const Config &Conf, TargetMachine *TM, unsigned Task, Module &Mod,`
`355`	`355`	`/Cmdline/ CmdArgs);`
`356`	`356`	`}`
`357`	`357`	`// FIXME: Plumb the combined index into the new pass manager.`
`358`		`- if (Conf.UseNewPM) {`
	`358`	`+ if (Conf.UseNewPM \|\| !Conf.OptPipeline.empty()) {`
`359`	`359`	`runNewPMPasses(Conf, Mod, TM, Conf.OptLevel, IsThinLTO, ExportSummary,`
`360`	`360`	`ImportSummary);`
`361`	`361`	`} else {`