Author: Vitaly Buka Date: 2022-09-06T15:02:11-07:00 New Revision: 93600eb50ceeec83c488ded24fa0fd25f997fec6
URL: https://github.com/llvm/llvm-project/commit/93600eb50ceeec83c488ded24fa0fd25f997fec6 DIFF: https://github.com/llvm/llvm-project/commit/93600eb50ceeec83c488ded24fa0fd25f997fec6.diff LOG: [NFC][asan] Rename ModuleAddressSanitizerPass Added: Modified: clang/lib/CodeGen/BackendUtil.cpp llvm/include/llvm/Transforms/Instrumentation/AddressSanitizer.h llvm/lib/Passes/PassRegistry.def llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp llvm/test/Instrumentation/SanitizerCoverage/tracing-comdat.ll llvm/tools/opt/NewPMDriver.cpp Removed: ################################################################################ diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp index 4181ac10d0849..5b379dc4ac62c 100644 --- a/clang/lib/CodeGen/BackendUtil.cpp +++ b/clang/lib/CodeGen/BackendUtil.cpp @@ -673,8 +673,8 @@ static void addSanitizers(const Triple &TargetTriple, Opts.Recover = CodeGenOpts.SanitizeRecover.has(Mask); Opts.UseAfterScope = CodeGenOpts.SanitizeAddressUseAfterScope; Opts.UseAfterReturn = CodeGenOpts.getSanitizeAddressUseAfterReturn(); - MPM.addPass(ModuleAddressSanitizerPass( - Opts, UseGlobalGC, UseOdrIndicator, DestructorKind)); + MPM.addPass(AddressSanitizerPass(Opts, UseGlobalGC, UseOdrIndicator, + DestructorKind)); } }; ASanPass(SanitizerKind::Address, false); diff --git a/llvm/include/llvm/Transforms/Instrumentation/AddressSanitizer.h b/llvm/include/llvm/Transforms/Instrumentation/AddressSanitizer.h index f56ec6ff682f8..7558568b0c1e9 100644 --- a/llvm/include/llvm/Transforms/Instrumentation/AddressSanitizer.h +++ b/llvm/include/llvm/Transforms/Instrumentation/AddressSanitizer.h @@ -33,13 +33,11 @@ struct AddressSanitizerOptions { /// /// This adds 'asan.module_ctor' to 'llvm.global_ctors'. This pass may also /// run intependently of the function address sanitizer. -class ModuleAddressSanitizerPass - : public PassInfoMixin<ModuleAddressSanitizerPass> { +class AddressSanitizerPass : public PassInfoMixin<AddressSanitizerPass> { public: - ModuleAddressSanitizerPass( - const AddressSanitizerOptions &Options, bool UseGlobalGC = true, - bool UseOdrIndicator = false, - AsanDtorKind DestructorKind = AsanDtorKind::Global); + AddressSanitizerPass(const AddressSanitizerOptions &Options, + bool UseGlobalGC = true, bool UseOdrIndicator = false, + AsanDtorKind DestructorKind = AsanDtorKind::Global); PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM); void printPipeline(raw_ostream &OS, function_ref<StringRef(StringRef)> MapClassName2PassName); diff --git a/llvm/lib/Passes/PassRegistry.def b/llvm/lib/Passes/PassRegistry.def index 31cb7f8ace1b6..c8c09f69bf7c0 100644 --- a/llvm/lib/Passes/PassRegistry.def +++ b/llvm/lib/Passes/PassRegistry.def @@ -146,10 +146,10 @@ MODULE_PASS_WITH_PARAMS("hwasan", }, parseHWASanPassOptions, "kernel;recover") -MODULE_PASS_WITH_PARAMS("asan-module", - "ModuleAddressSanitizerPass", +MODULE_PASS_WITH_PARAMS("asan", + "AddressSanitizerPass", [](AddressSanitizerOptions Opts) { - return ModuleAddressSanitizerPass(Opts); + return AddressSanitizerPass(Opts); }, parseASanPassOptions, "kernel") diff --git a/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp b/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp index 8805d379d9ae3..37c698975509e 100644 --- a/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp +++ b/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp @@ -1110,9 +1110,9 @@ struct FunctionStackPoisoner : public InstVisitor<FunctionStackPoisoner> { } // end anonymous namespace -void ModuleAddressSanitizerPass::printPipeline( +void AddressSanitizerPass::printPipeline( raw_ostream &OS, function_ref<StringRef(StringRef)> MapClassName2PassName) { - static_cast<PassInfoMixin<ModuleAddressSanitizerPass> *>(this)->printPipeline( + static_cast<PassInfoMixin<AddressSanitizerPass> *>(this)->printPipeline( OS, MapClassName2PassName); OS << "<"; if (Options.CompileKernel) @@ -1120,14 +1120,14 @@ void ModuleAddressSanitizerPass::printPipeline( OS << ">"; } -ModuleAddressSanitizerPass::ModuleAddressSanitizerPass( +AddressSanitizerPass::AddressSanitizerPass( const AddressSanitizerOptions &Options, bool UseGlobalGC, bool UseOdrIndicator, AsanDtorKind DestructorKind) : Options(Options), UseGlobalGC(UseGlobalGC), UseOdrIndicator(UseOdrIndicator), DestructorKind(DestructorKind) {} -PreservedAnalyses ModuleAddressSanitizerPass::run(Module &M, - ModuleAnalysisManager &MAM) { +PreservedAnalyses AddressSanitizerPass::run(Module &M, + ModuleAnalysisManager &MAM) { ModuleAddressSanitizer ModuleSanitizer(M, Options.CompileKernel, Options.Recover, UseGlobalGC, UseOdrIndicator, DestructorKind); diff --git a/llvm/test/Instrumentation/SanitizerCoverage/tracing-comdat.ll b/llvm/test/Instrumentation/SanitizerCoverage/tracing-comdat.ll index 4b704f451c5e9..3b0fbaea7be6c 100644 --- a/llvm/test/Instrumentation/SanitizerCoverage/tracing-comdat.ll +++ b/llvm/test/Instrumentation/SanitizerCoverage/tracing-comdat.ll @@ -2,7 +2,7 @@ ; Make sure asan does not instrument __sancov_gen_ ; RUN: opt < %s -passes='module(sancov-module)' -sanitizer-coverage-level=3 -sanitizer-coverage-trace-pc-guard -S | FileCheck %s -; RUN: opt < %s -passes='module(sancov-module,asan-module)' -sanitizer-coverage-level=3 -sanitizer-coverage-trace-pc-guard -S | FileCheck %s +; RUN: opt < %s -passes='module(sancov-module,asan)' -sanitizer-coverage-level=3 -sanitizer-coverage-trace-pc-guard -S | FileCheck %s target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" $Foo = comdat any diff --git a/llvm/tools/opt/NewPMDriver.cpp b/llvm/tools/opt/NewPMDriver.cpp index 61d0e121fc5a9..e3699f09c8e3d 100644 --- a/llvm/tools/opt/NewPMDriver.cpp +++ b/llvm/tools/opt/NewPMDriver.cpp @@ -381,7 +381,7 @@ bool llvm::runPassPipeline(StringRef Arg0, Module &M, TargetMachine *TM, ArrayRef<PassBuilder::PipelineElement>) { AddressSanitizerOptions Opts; if (Name == "asan-pipeline") { - MPM.addPass(ModuleAddressSanitizerPass(Opts)); + MPM.addPass(AddressSanitizerPass(Opts)); return true; } return false; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
