[llvm] a6255e4 - Revert "[LLVM] Add flags to crash the opt/codegen pipeline" (#200977)
via llvm-commits
llvm-commits at lists.llvm.org
Mon Jun 1 18:11:06 PDT 2026
Author: Arthur Eubanks
Date: 2026-06-02T01:11:01Z
New Revision: a6255e47bfc5dad9729dc0e0c7d1cda65b52adf5
URL: https://github.com/llvm/llvm-project/commit/a6255e47bfc5dad9729dc0e0c7d1cda65b52adf5
DIFF: https://github.com/llvm/llvm-project/commit/a6255e47bfc5dad9729dc0e0c7d1cda65b52adf5.diff
LOG: Revert "[LLVM] Add flags to crash the opt/codegen pipeline" (#200977)
Reverts llvm/llvm-project#200967
Test failing on some buildbots:
https://lab.llvm.org/buildbot/#/builders/11/builds/41237
Added:
Modified:
llvm/lib/CodeGen/TargetPassConfig.cpp
llvm/lib/Passes/PassBuilder.cpp
llvm/lib/Passes/PassBuilderPipelines.cpp
llvm/lib/Transforms/Utils/CMakeLists.txt
llvm/utils/gn/secondary/llvm/lib/Transforms/Utils/BUILD.gn
Removed:
llvm/include/llvm/Transforms/Utils/TriggerCrashPass.h
llvm/lib/Transforms/Utils/TriggerCrashPass.cpp
llvm/test/Other/trigger-crash-flags.ll
################################################################################
diff --git a/llvm/include/llvm/Transforms/Utils/TriggerCrashPass.h b/llvm/include/llvm/Transforms/Utils/TriggerCrashPass.h
deleted file mode 100644
index c1131655b93bd..0000000000000
--- a/llvm/include/llvm/Transforms/Utils/TriggerCrashPass.h
+++ /dev/null
@@ -1,39 +0,0 @@
-//===- TriggerCrashPass.h - Trigger Crash Passes ----------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM Exceptions
-//
-//===----------------------------------------------------------------------===//
-//
-// This file provides passes that trigger crashes for testing purposes.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TRANSFORMS_UTILS_TRIGGERCRASHPASS_H
-#define LLVM_TRANSFORMS_UTILS_TRIGGERCRASHPASS_H
-
-#include "llvm/IR/Function.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/PassManager.h"
-#include "llvm/Pass.h"
-
-namespace llvm {
-
-class TriggerCrashModulePass
- : public OptionalPassInfoMixin<TriggerCrashModulePass> {
-public:
- PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
-};
-
-class TriggerCrashFunctionPass
- : public OptionalPassInfoMixin<TriggerCrashFunctionPass> {
-public:
- PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
-};
-
-FunctionPass *createTriggerCrashFunctionPass();
-
-} // namespace llvm
-
-#endif // LLVM_TRANSFORMS_UTILS_TRIGGERCRASHPASS_H
diff --git a/llvm/lib/CodeGen/TargetPassConfig.cpp b/llvm/lib/CodeGen/TargetPassConfig.cpp
index 6231ab1ba0734..096e9a6f2b1dc 100644
--- a/llvm/lib/CodeGen/TargetPassConfig.cpp
+++ b/llvm/lib/CodeGen/TargetPassConfig.cpp
@@ -50,7 +50,6 @@
#include "llvm/Transforms/ObjCARC.h"
#include "llvm/Transforms/Scalar.h"
#include "llvm/Transforms/Utils.h"
-#include "llvm/Transforms/Utils/TriggerCrashPass.h"
#include <cassert>
#include <optional>
#include <string>
@@ -100,11 +99,6 @@ static cl::opt<bool> DisableConstantHoisting("disable-constant-hoisting",
cl::Hidden, cl::desc("Disable ConstantHoisting"));
static cl::opt<bool> DisableCGP("disable-cgp", cl::Hidden,
cl::desc("Disable Codegen Prepare"));
-
-static cl::opt<bool>
- TriggerCrash("codegen-pipeline-trigger-crash", cl::init(false), cl::Hidden,
- cl::desc("Trigger crash in codegen pipeline"));
-
static cl::opt<bool> DisableCopyProp("disable-copyprop", cl::Hidden,
cl::desc("Disable Copy Propagation pass"));
static cl::opt<bool> DisablePartialLibcallInlining("disable-partial-libcall-inlining",
@@ -1092,10 +1086,6 @@ bool TargetPassConfig::addISelPasses() {
addPass(createPreISelIntrinsicLoweringPass());
addPass(createExpandIRInstsPass(getOptLevel()));
addIRPasses();
-
- if (TriggerCrash)
- addPass(createTriggerCrashFunctionPass());
-
addCodeGenPrepare();
addPassesToHandleExceptions();
addISelPrepare();
diff --git a/llvm/lib/Passes/PassBuilder.cpp b/llvm/lib/Passes/PassBuilder.cpp
index 9498b3d2bbd0c..395dd4f14577f 100644
--- a/llvm/lib/Passes/PassBuilder.cpp
+++ b/llvm/lib/Passes/PassBuilder.cpp
@@ -386,7 +386,6 @@
#include "llvm/Transforms/Utils/StripGCRelocates.h"
#include "llvm/Transforms/Utils/StripNonLineTableDebugInfo.h"
#include "llvm/Transforms/Utils/SymbolRewriter.h"
-#include "llvm/Transforms/Utils/TriggerCrashPass.h"
#include "llvm/Transforms/Utils/UnifyFunctionExitNodes.h"
#include "llvm/Transforms/Utils/UnifyLoopExits.h"
#include "llvm/Transforms/Vectorize/LoadStoreVectorizer.h"
@@ -424,6 +423,28 @@ bool applyMIRDebugify(DIBuilder &DIB, Function &F, ModuleAnalysisManager &AM) {
});
}
+// Passes for testing crashes.
+// DO NOT USE THIS EXCEPT FOR TESTING!
+class TriggerCrashModulePass
+ : public OptionalPassInfoMixin<TriggerCrashModulePass> {
+public:
+ PreservedAnalyses run(Module &, ModuleAnalysisManager &) {
+ abort();
+ return PreservedAnalyses::all();
+ }
+ static StringRef name() { return "TriggerCrashModulePass"; }
+};
+
+class TriggerCrashFunctionPass
+ : public OptionalPassInfoMixin<TriggerCrashFunctionPass> {
+public:
+ PreservedAnalyses run(Function &, FunctionAnalysisManager &) {
+ abort();
+ return PreservedAnalyses::all();
+ }
+ static StringRef name() { return "TriggerCrashFunctionPass"; }
+};
+
// A pass for testing message reporting of -verify-each failures.
// DO NOT USE THIS EXCEPT FOR TESTING!
class TriggerVerifierErrorPass
diff --git a/llvm/lib/Passes/PassBuilderPipelines.cpp b/llvm/lib/Passes/PassBuilderPipelines.cpp
index d0cf63028e303..a2ebd9730d51b 100644
--- a/llvm/lib/Passes/PassBuilderPipelines.cpp
+++ b/llvm/lib/Passes/PassBuilderPipelines.cpp
@@ -151,7 +151,6 @@
#include "llvm/Transforms/Utils/NameAnonGlobals.h"
#include "llvm/Transforms/Utils/RelLookupTableConverter.h"
#include "llvm/Transforms/Utils/SimplifyCFGOptions.h"
-#include "llvm/Transforms/Utils/TriggerCrashPass.h"
#include "llvm/Transforms/Vectorize/LoopVectorize.h"
#include "llvm/Transforms/Vectorize/SLPVectorizer.h"
#include "llvm/Transforms/Vectorize/VectorCombine.h"
@@ -197,10 +196,6 @@ static cl::opt<bool> EnablePostPGOLoopRotation(
"enable-post-pgo-loop-rotation", cl::init(true), cl::Hidden,
cl::desc("Run the loop rotation transformation after PGO instrumentation"));
-static cl::opt<bool>
- TriggerCrash("opt-pipeline-trigger-crash", cl::init(false), cl::Hidden,
- cl::desc("Trigger crash in optimization pipeline"));
-
static cl::opt<bool> EnableGlobalAnalyses(
"enable-global-analyses", cl::init(true), cl::Hidden,
cl::desc("Enable inter-procedural analyses"));
@@ -1781,9 +1776,6 @@ PassBuilder::buildPerModuleDefaultPipeline(OptimizationLevel Level,
// Force any function attributes we want the rest of the pipeline to observe.
MPM.addPass(ForceFunctionAttrsPass());
- if (TriggerCrash)
- MPM.addPass(createModuleToFunctionPassAdaptor(TriggerCrashFunctionPass()));
-
if (PGOOpt && PGOOpt->DebugInfoForProfiling)
MPM.addPass(createModuleToFunctionPassAdaptor(AddDiscriminatorsPass()));
diff --git a/llvm/lib/Transforms/Utils/CMakeLists.txt b/llvm/lib/Transforms/Utils/CMakeLists.txt
index 1c8647eef5d0c..8fe0476ab1a32 100644
--- a/llvm/lib/Transforms/Utils/CMakeLists.txt
+++ b/llvm/lib/Transforms/Utils/CMakeLists.txt
@@ -91,7 +91,6 @@ add_llvm_component_library(LLVMTransformUtils
SplitModuleByCategory.cpp
StripNonLineTableDebugInfo.cpp
SymbolRewriter.cpp
- TriggerCrashPass.cpp
UnifyFunctionExitNodes.cpp
UnifyLoopExits.cpp
Utils.cpp
diff --git a/llvm/lib/Transforms/Utils/TriggerCrashPass.cpp b/llvm/lib/Transforms/Utils/TriggerCrashPass.cpp
deleted file mode 100644
index 3afe743a74d9d..0000000000000
--- a/llvm/lib/Transforms/Utils/TriggerCrashPass.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-//===- TriggerCrashPass.cpp -----------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM Exceptions
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Transforms/Utils/TriggerCrashPass.h"
-#include <cstdlib>
-
-using namespace llvm;
-
-PreservedAnalyses TriggerCrashModulePass::run(Module &,
- ModuleAnalysisManager &) {
- abort();
- return PreservedAnalyses::all();
-}
-
-PreservedAnalyses TriggerCrashFunctionPass::run(Function &,
- FunctionAnalysisManager &) {
- abort();
- return PreservedAnalyses::all();
-}
-
-namespace {
-class TriggerCrashFunctionLegacyPass : public FunctionPass {
-public:
- static char ID;
- TriggerCrashFunctionLegacyPass() : FunctionPass(ID) {}
- bool runOnFunction(Function &F) override {
- abort();
- return false;
- }
- StringRef getPassName() const override { return "TriggerCrashFunctionPass"; }
-};
-} // namespace
-
-char TriggerCrashFunctionLegacyPass::ID = 0;
-
-FunctionPass *llvm::createTriggerCrashFunctionPass() {
- return new TriggerCrashFunctionLegacyPass();
-}
diff --git a/llvm/test/Other/trigger-crash-flags.ll b/llvm/test/Other/trigger-crash-flags.ll
deleted file mode 100644
index 6c84b6ab52ec2..0000000000000
--- a/llvm/test/Other/trigger-crash-flags.ll
+++ /dev/null
@@ -1,13 +0,0 @@
-; RUN: not --crash opt -O2 -opt-pipeline-trigger-crash %s -disable-output 2>&1 | \
-; RUN: FileCheck %s --check-prefix=OPT
-;
-; RUN: not --crash llc -codegen-pipeline-trigger-crash %s -o /dev/null 2>&1 | \
-; RUN: FileCheck %s --check-prefix=CODEGEN
-
-; OPT: trigger-crash-function
-
-; CODEGEN: TriggerCrashFunctionPass
-
-define void @foo() {
- ret void
-}
diff --git a/llvm/utils/gn/secondary/llvm/lib/Transforms/Utils/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Transforms/Utils/BUILD.gn
index e814623eb99f3..0b61f8f21e130 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Transforms/Utils/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Transforms/Utils/BUILD.gn
@@ -99,7 +99,6 @@ static_library("Utils") {
"StripGCRelocates.cpp",
"StripNonLineTableDebugInfo.cpp",
"SymbolRewriter.cpp",
- "TriggerCrashPass.cpp",
"UnifyFunctionExitNodes.cpp",
"UnifyLoopExits.cpp",
"Utils.cpp",
More information about the llvm-commits
mailing list