diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp index 79e6bf3d24dff..62c3696741a5a 100644 --- a/clang/lib/CodeGen/BackendUtil.cpp +++ b/clang/lib/CodeGen/BackendUtil.cpp @@ -795,11 +795,12 @@ 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](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 af974818fec5f..edf9102151a42 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 { public: + struct Options { + std::vector placeholder; // TODO: cutoffs + }; + + explicit LowerAllowCheckPass(LowerAllowCheckPass::Options Opts) + : Opts(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 f923d5aabe0a0..0a75153de4810 100644 --- a/llvm/lib/Passes/PassBuilder.cpp +++ b/llvm/lib/Passes/PassBuilder.cpp @@ -821,6 +821,21 @@ Expected parseEmbedBitcodePassOptions(StringRef Params) { return Result; } +Expected +parseLowerAllowCheckPassOptions(StringRef Params) { + LowerAllowCheckPass::Options Result; + while (!Params.empty()) { + StringRef ParamName; + std::tie(ParamName, Params) = Params.split(';'); + + return make_error( + formatv("invalid LowerAllowCheck pass parameter '{0}' ", ParamName) + .str(), + inconvertibleErrorCode()); + } + return Result; +} + Expected parseMSanPassOptions(StringRef Params) { MemorySanitizerOptions Result; while (!Params.empty()) { diff --git a/llvm/lib/Passes/PassRegistry.def b/llvm/lib/Passes/PassRegistry.def index 1021d7fcd9247..284f15e4ad664 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); },