Merge pull request #26171 from compnerd/r366153

Revert "Updating usage of SanitizerCoverage."

Author: compnerd

lib/IRGen/IRGen.cpp

@@ -71,7 +71,6 @@
 #include "llvm/Transforms/IPO/PassManagerBuilder.h"
 #include "llvm/Transforms/Instrumentation.h"
 #include "llvm/Transforms/Instrumentation/AddressSanitizer.h"
-#include "llvm/Transforms/Instrumentation/SanitizerCoverage.h"
 #include "llvm/Transforms/Instrumentation/ThreadSanitizer.h"
 #include "llvm/Transforms/ObjCARC.h"
 
@@ -140,9 +139,7 @@ static void addSanitizerCoveragePass(const PassManagerBuilder &Builder,
                                      legacy::PassManagerBase &PM) {
   const PassManagerBuilderWrapper &BuilderWrapper =
       static_cast<const PassManagerBuilderWrapper &>(Builder);
-  PM.add(createModuleSanitizerCoverageLegacyPassPass(
-      BuilderWrapper.IRGOpts.SanitizeCoverage));
-  PM.add(createSanitizerCoverageLegacyPassPass(
+  PM.add(createSanitizerCoverageModulePass(
       BuilderWrapper.IRGOpts.SanitizeCoverage));
 }