Skip to content

Commit 1515caf

Browse files
authored
Revert "[sanitizer][NFCI] Add Options parameter to LowerAllowCheckPass" (#122833)
Reverts #122765 Reason: buildbot breakage (https://lab.llvm.org/buildbot/#/builders/46/builds/10393) ``` z:\b\llvm-clang-x86_64-sie-win\build\bin\clang.exe -cc1 -internal-isystem Z:\b\llvm-clang-x86_64-sie-win\build\lib\clang\20\include -nostdsysteminc -triple x86_64-pc-linux-gnu -emit-llvm -o - Z:\b\llvm-clang-x86_64-sie-win\llvm-project\clang\test\CodeGen\allow-ubsan-check-inline.c -fsanitize=signed-integer-overflow -mllvm -ubsan-guard-checks -O3 -mllvm -lower-allow-check-random-rate=1 -Rpass=lower-allow-check -Rpass-missed=lower-allow-check -fno-inline 2>&1 | z:\b\llvm-clang-x86_64-sie-win\build\bin\filecheck.exe Z:\b\llvm-clang-x86_64-sie-win\llvm-project\clang\test\CodeGen\allow-ubsan-check-inline.c --check-prefixes=NOINL --implicit-check-not="remark:" # executed command: 'z:\b\llvm-clang-x86_64-sie-win\build\bin\clang.exe' -cc1 -internal-isystem 'Z:\b\llvm-clang-x86_64-sie-win\build\lib\clang\20\include' -nostdsysteminc -triple x86_64-pc-linux-gnu -emit-llvm -o - 'Z:\b\llvm-clang-x86_64-sie-win\llvm-project\clang\test\CodeGen\allow-ubsan-check-inline.c' -fsanitize=signed-integer-overflow -mllvm -ubsan-guard-checks -O3 -mllvm -lower-allow-check-random-rate=1 -Rpass=lower-allow-check -Rpass-missed=lower-allow-check -fno-inline # note: command had no output on stdout or stderr # error: command failed with exit status: 0xc0000409 # executed command: 'z:\b\llvm-clang-x86_64-sie-win\build\bin\filecheck.exe' 'Z:\b\llvm-clang-x86_64-sie-win\llvm-project\clang\test\CodeGen\allow-ubsan-check-inline.c' --check-prefixes=NOINL --implicit-check-not=remark: # .---command stderr------------ # | FileCheck error: '<stdin>' is empty. # | FileCheck command line: z:\b\llvm-clang-x86_64-sie-win\build\bin\filecheck.exe Z:\b\llvm-clang-x86_64-sie-win\llvm-project\clang\test\CodeGen\allow-ubsan-check-inline.c --check-prefixes=NOINL --implicit-check-not=remark: # `----------------------------- # error: command failed with exit status: 2 ```
1 parent 7d8b4eb commit 1515caf

File tree

4 files changed

+5
-33
lines changed

4 files changed

+5
-33
lines changed

clang/lib/CodeGen/BackendUtil.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -795,12 +795,11 @@ static void addSanitizers(const Triple &TargetTriple,
795795
}
796796

797797
if (LowerAllowCheckPass::IsRequested()) {
798-
LowerAllowCheckPass::Options Opts;
799798
// We want to call it after inline, which is about OptimizerEarlyEPCallback.
800-
PB.registerOptimizerEarlyEPCallback([&Opts](ModulePassManager &MPM,
801-
OptimizationLevel Level,
802-
ThinOrFullLTOPhase Phase) {
803-
MPM.addPass(createModuleToFunctionPassAdaptor(LowerAllowCheckPass(Opts)));
799+
PB.registerOptimizerEarlyEPCallback([](ModulePassManager &MPM,
800+
OptimizationLevel Level,
801+
ThinOrFullLTOPhase Phase) {
802+
MPM.addPass(createModuleToFunctionPassAdaptor(LowerAllowCheckPass()));
804803
});
805804
}
806805
}

llvm/include/llvm/Transforms/Instrumentation/LowerAllowCheckPass.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,9 @@ namespace llvm {
2424
// from the hot code.
2525
class LowerAllowCheckPass : public PassInfoMixin<LowerAllowCheckPass> {
2626
public:
27-
struct Options {
28-
std::vector<unsigned int> placeholder; // TODO: cutoffs
29-
};
30-
31-
explicit LowerAllowCheckPass(LowerAllowCheckPass::Options Opts)
32-
: Opts(Opts) {};
3327
PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
3428

3529
static bool IsRequested();
36-
37-
private:
38-
LowerAllowCheckPass::Options Opts;
3930
};
4031

4132
} // namespace llvm

llvm/lib/Passes/PassBuilder.cpp

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -821,21 +821,6 @@ Expected<EmbedBitcodeOptions> parseEmbedBitcodePassOptions(StringRef Params) {
821821
return Result;
822822
}
823823

824-
Expected<LowerAllowCheckPass::Options>
825-
parseLowerAllowCheckPassOptions(StringRef Params) {
826-
LowerAllowCheckPass::Options Result;
827-
while (!Params.empty()) {
828-
StringRef ParamName;
829-
std::tie(ParamName, Params) = Params.split(';');
830-
831-
return make_error<StringError>(
832-
formatv("invalid LowerAllowCheck pass parameter '{0}' ", ParamName)
833-
.str(),
834-
inconvertibleErrorCode());
835-
}
836-
return Result;
837-
}
838-
839824
Expected<MemorySanitizerOptions> parseMSanPassOptions(StringRef Params) {
840825
MemorySanitizerOptions Result;
841826
while (!Params.empty()) {

llvm/lib/Passes/PassRegistry.def

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,7 @@ FUNCTION_PASS("loop-load-elim", LoopLoadEliminationPass())
402402
FUNCTION_PASS("loop-simplify", LoopSimplifyPass())
403403
FUNCTION_PASS("loop-sink", LoopSinkPass())
404404
FUNCTION_PASS("loop-versioning", LoopVersioningPass())
405+
FUNCTION_PASS("lower-allow-check", LowerAllowCheckPass())
405406
FUNCTION_PASS("lower-atomic", LowerAtomicPass())
406407
FUNCTION_PASS("lower-constant-intrinsics", LowerConstantIntrinsicsPass())
407408
FUNCTION_PASS("lower-expect", LowerExpectIntrinsicPass())
@@ -552,10 +553,6 @@ FUNCTION_PASS_WITH_PARAMS(
552553
parseLoopVectorizeOptions,
553554
"no-interleave-forced-only;interleave-forced-only;no-vectorize-forced-only;"
554555
"vectorize-forced-only")
555-
FUNCTION_PASS_WITH_PARAMS(
556-
"lower-allow-check", "LowerAllowCheckPass",
557-
[](LowerAllowCheckPass::Options Opts) { return LowerAllowCheckPass(Opts); },
558-
parseLowerAllowCheckPassOptions, "")
559556
FUNCTION_PASS_WITH_PARAMS(
560557
"lower-matrix-intrinsics", "LowerMatrixIntrinsicsPass",
561558
[](bool Minimal) { return LowerMatrixIntrinsicsPass(Minimal); },

0 commit comments

Comments
 (0)