Respect -Z verify-llvm-ir and other flags that add extra passes when combined with -C no-prepopulate-passes in the new LLVM Pass Manager.

luqmana · luqmana · commit 84fb481bf51e · 2022-04-10T15:40:16.000-04:00
diff --git a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp
@@ -995,6 +995,13 @@ LLVMRustOptimizeWithNewPassManager(
         break;
       }
     }
+  } else {
+    // We're not building any of the default pipelines but we still want to
+    // add the verifier, instrumentation, etc passes if they were requested
+    for (const auto &C : PipelineStartEPCallbacks)
+      C(MPM, OptLevel);
+    for (const auto &C : OptimizerLastEPCallbacks)
+      C(MPM, OptLevel);
   }
 
   if (ExtraPassesLen) {

Original file line number	Diff line number	Diff line change
`@@ -995,6 +995,13 @@ LLVMRustOptimizeWithNewPassManager(`
`995`	`995`	`break;`
`996`	`996`	`}`
`997`	`997`	`}`
	`998`	`+ } else {`
	`999`	`+ // We're not building any of the default pipelines but we still want to`
	`1000`	`+ // add the verifier, instrumentation, etc passes if they were requested`
	`1001`	`+ for (const auto &C : PipelineStartEPCallbacks)`
	`1002`	`+ C(MPM, OptLevel);`
	`1003`	`+ for (const auto &C : OptimizerLastEPCallbacks)`
	`1004`	`+ C(MPM, OptLevel);`
`998`	`1005`	`}`
`999`	`1006`
`1000`	`1007`	`if (ExtraPassesLen) {`