Index: lib/CodeGen/BackendUtil.cpp
===================================================================
--- lib/CodeGen/BackendUtil.cpp
+++ lib/CodeGen/BackendUtil.cpp
@@ -263,12 +263,14 @@
   const CodeGenOptions &CGOpts = BuilderWrapper.getCGOpts();
   bool Recover = CGOpts.SanitizeRecover.has(SanitizerKind::HWAddress);
   PM.add(createHWAddressSanitizerPass(/*CompileKernel*/ false, Recover));
+  PM.add(createHWAddressSanitizerModulePass(/*CompileKernel*/ false));
 }
 
 static void addKernelHWAddressSanitizerPasses(const PassManagerBuilder &Builder,
                                             legacy::PassManagerBase &PM) {
   PM.add(createHWAddressSanitizerPass(
       /*CompileKernel*/ true, /*Recover*/ true));
+  PM.add(createHWAddressSanitizerModulePass(/*CompileKernel*/ true));
 }
 
 static void addGeneralOptsForMemorySanitizer(const PassManagerBuilder &Builder,