https://github.com/thurstond updated https://github.com/llvm/llvm-project/pull/122994
>From afc18adfbc4671cd39356abd0945eae057b6ad28 Mon Sep 17 00:00:00 2001 From: Thurston Dang <thurs...@google.com> Date: Tue, 14 Jan 2025 19:13:51 +0000 Subject: [PATCH 1/3] Reapply "[sanitizer][NFCI] Add Options parameter to LowerAllowCheckPass" (#122833) This reverts commit 1515caf7a59dc20cb932b724b2ef5c1d1a593427 (https://github.com/llvm/llvm-project/pull/122833) i.e., relands 7d8b4eb0ead277f41ff69525ed807f9f6e227f37 (https://github.com/llvm/llvm-project/pull/122765), with the addition of std::move to fix a stack use-after-scope error. --- clang/lib/CodeGen/BackendUtil.cpp | 10 ++++++---- .../Instrumentation/LowerAllowCheckPass.h | 9 +++++++++ llvm/lib/Passes/PassBuilder.cpp | 15 +++++++++++++++ llvm/lib/Passes/PassRegistry.def | 5 ++++- 4 files changed, 34 insertions(+), 5 deletions(-) diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp index 3951ad01497ccac..337c4b4d7a06157 100644 --- a/clang/lib/CodeGen/BackendUtil.cpp +++ b/clang/lib/CodeGen/BackendUtil.cpp @@ -795,11 +795,13 @@ static void addSanitizers(const Triple &TargetTriple, } if (LowerAllowCheckPass::IsRequested()) { + LowerAllowCheckPass::Options Opts; // We want to call it after inline, which is about OptimizerEarlyEPCallback. - PB.registerOptimizerEarlyEPCallback([](ModulePassManager &MPM, - OptimizationLevel Level, - ThinOrFullLTOPhase Phase) { - MPM.addPass(createModuleToFunctionPassAdaptor(LowerAllowCheckPass())); + PB.registerOptimizerEarlyEPCallback([Opts = std::move(Opts)](ModulePassManager &MPM, + OptimizationLevel Level, + ThinOrFullLTOPhase Phase) { + MPM.addPass(createModuleToFunctionPassAdaptor( + LowerAllowCheckPass(Opts))); }); } } diff --git a/llvm/include/llvm/Transforms/Instrumentation/LowerAllowCheckPass.h b/llvm/include/llvm/Transforms/Instrumentation/LowerAllowCheckPass.h index af974818fec5f31..3ee907606e12b83 100644 --- a/llvm/include/llvm/Transforms/Instrumentation/LowerAllowCheckPass.h +++ b/llvm/include/llvm/Transforms/Instrumentation/LowerAllowCheckPass.h @@ -24,9 +24,18 @@ namespace llvm { // from the hot code. class LowerAllowCheckPass : public PassInfoMixin<LowerAllowCheckPass> { public: + struct Options { + std::vector<unsigned int> placeholder; // TODO: cutoffs + }; + + explicit LowerAllowCheckPass(LowerAllowCheckPass::Options Opts) + : Opts(std::move(Opts)) {}; PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); static bool IsRequested(); + +private: + LowerAllowCheckPass::Options Opts; }; } // namespace llvm diff --git a/llvm/lib/Passes/PassBuilder.cpp b/llvm/lib/Passes/PassBuilder.cpp index f698a3df08ef78f..1e97cef22045d4f 100644 --- a/llvm/lib/Passes/PassBuilder.cpp +++ b/llvm/lib/Passes/PassBuilder.cpp @@ -821,6 +821,21 @@ Expected<EmbedBitcodeOptions> parseEmbedBitcodePassOptions(StringRef Params) { return Result; } +Expected<LowerAllowCheckPass::Options> +parseLowerAllowCheckPassOptions(StringRef Params) { + LowerAllowCheckPass::Options Result; + while (!Params.empty()) { + StringRef ParamName; + std::tie(ParamName, Params) = Params.split(';'); + + return make_error<StringError>( + formatv("invalid LowerAllowCheck pass parameter '{0}' ", ParamName) + .str(), + inconvertibleErrorCode()); + } + return Result; +} + Expected<MemorySanitizerOptions> parseMSanPassOptions(StringRef Params) { MemorySanitizerOptions Result; while (!Params.empty()) { diff --git a/llvm/lib/Passes/PassRegistry.def b/llvm/lib/Passes/PassRegistry.def index a93a995655a1476..0eb050c8adb047f 100644 --- a/llvm/lib/Passes/PassRegistry.def +++ b/llvm/lib/Passes/PassRegistry.def @@ -402,7 +402,6 @@ FUNCTION_PASS("loop-load-elim", LoopLoadEliminationPass()) FUNCTION_PASS("loop-simplify", LoopSimplifyPass()) FUNCTION_PASS("loop-sink", LoopSinkPass()) FUNCTION_PASS("loop-versioning", LoopVersioningPass()) -FUNCTION_PASS("lower-allow-check", LowerAllowCheckPass()) FUNCTION_PASS("lower-atomic", LowerAtomicPass()) FUNCTION_PASS("lower-constant-intrinsics", LowerConstantIntrinsicsPass()) FUNCTION_PASS("lower-expect", LowerExpectIntrinsicPass()) @@ -553,6 +552,10 @@ FUNCTION_PASS_WITH_PARAMS( parseLoopVectorizeOptions, "no-interleave-forced-only;interleave-forced-only;no-vectorize-forced-only;" "vectorize-forced-only") +FUNCTION_PASS_WITH_PARAMS( + "lower-allow-check", "LowerAllowCheckPass", + [](LowerAllowCheckPass::Options Opts) { return LowerAllowCheckPass(Opts); }, + parseLowerAllowCheckPassOptions, "") FUNCTION_PASS_WITH_PARAMS( "lower-matrix-intrinsics", "LowerMatrixIntrinsicsPass", [](bool Minimal) { return LowerMatrixIntrinsicsPass(Minimal); }, >From 3bc2d41e372c9c10168cab3cca353a1218136951 Mon Sep 17 00:00:00 2001 From: Vitaly Buka <vitalyb...@gmail.com> Date: Wed, 15 Jan 2025 08:41:50 -0800 Subject: [PATCH 2/3] Capture codegen opts, as sanitizer callbacks --- clang/lib/CodeGen/BackendUtil.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp index 337c4b4d7a06157..553880e3178aa52 100644 --- a/clang/lib/CodeGen/BackendUtil.cpp +++ b/clang/lib/CodeGen/BackendUtil.cpp @@ -795,11 +795,11 @@ static void addSanitizers(const Triple &TargetTriple, } if (LowerAllowCheckPass::IsRequested()) { - LowerAllowCheckPass::Options Opts; // We want to call it after inline, which is about OptimizerEarlyEPCallback. - PB.registerOptimizerEarlyEPCallback([Opts = std::move(Opts)](ModulePassManager &MPM, + PB.registerOptimizerEarlyEPCallback([&](ModulePassManager &MPM, OptimizationLevel Level, ThinOrFullLTOPhase Phase) { + LowerAllowCheckPass::Options Opts; MPM.addPass(createModuleToFunctionPassAdaptor( LowerAllowCheckPass(Opts))); }); >From c94bee3eb519951441a0bfebe53ffe42fcc82e78 Mon Sep 17 00:00:00 2001 From: Vitaly Buka <vitalyb...@gmail.com> Date: Wed, 15 Jan 2025 08:44:43 -0800 Subject: [PATCH 3/3] format --- clang/lib/CodeGen/BackendUtil.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp index 553880e3178aa52..f60f8672e6a0b8d 100644 --- a/clang/lib/CodeGen/BackendUtil.cpp +++ b/clang/lib/CodeGen/BackendUtil.cpp @@ -797,11 +797,10 @@ static void addSanitizers(const Triple &TargetTriple, if (LowerAllowCheckPass::IsRequested()) { // We want to call it after inline, which is about OptimizerEarlyEPCallback. PB.registerOptimizerEarlyEPCallback([&](ModulePassManager &MPM, - OptimizationLevel Level, - ThinOrFullLTOPhase Phase) { + OptimizationLevel Level, + ThinOrFullLTOPhase Phase) { LowerAllowCheckPass::Options Opts; - MPM.addPass(createModuleToFunctionPassAdaptor( - LowerAllowCheckPass(Opts))); + MPM.addPass(createModuleToFunctionPassAdaptor(LowerAllowCheckPass(Opts))); }); } } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits