[llvm] ef9956f - [IR] Rename FuncletPadInst::getNumArgOperands to arg_size (NFC)
Kazu Hirata via llvm-commits
llvm-commits at lists.llvm.org
Mon Oct 17 10:15:16 PDT 2022
Author: Kazu Hirata
Date: 2022-10-17T10:15:10-07:00
New Revision: ef9956f4347c0450084228199dc427e6a8a0b1bb
URL: https://github.com/llvm/llvm-project/commit/ef9956f4347c0450084228199dc427e6a8a0b1bb
DIFF: https://github.com/llvm/llvm-project/commit/ef9956f4347c0450084228199dc427e6a8a0b1bb.diff
LOG: [IR] Rename FuncletPadInst::getNumArgOperands to arg_size (NFC)
This patch renames FuncletPadInst::getNumArgOperands to arg_size for
consistency with CallBase, where getNumArgOperands was removed in
favor of arg_size in commit 3e1c787b3160bed4146d3b2b5f922aeed3caafd7
Differential Revision: https://reviews.llvm.org/D136048
Added:
Modified:
llvm/include/llvm/IR/InstrTypes.h
llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
llvm/lib/CodeGen/MachineFunction.cpp
llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
llvm/lib/CodeGen/WasmEHPrepare.cpp
llvm/lib/CodeGen/WinEHPrepare.cpp
llvm/lib/IR/AsmWriter.cpp
llvm/lib/IR/Core.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/IR/InstrTypes.h b/llvm/include/llvm/IR/InstrTypes.h
index dc46c8a43c8b5..60390b18632ea 100644
--- a/llvm/include/llvm/IR/InstrTypes.h
+++ b/llvm/include/llvm/IR/InstrTypes.h
@@ -2378,9 +2378,9 @@ class FuncletPadInst : public Instruction {
/// Provide fast operand accessors
DECLARE_TRANSPARENT_OPERAND_ACCESSORS(Value);
- /// getNumArgOperands - Return the number of funcletpad arguments.
+ /// arg_size - Return the number of funcletpad arguments.
///
- unsigned getNumArgOperands() const { return getNumOperands() - 1; }
+ unsigned arg_size() const { return getNumOperands() - 1; }
/// Convenience accessors
diff --git a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
index f66bc2d1dcc35..d33ef5a13ecf7 100644
--- a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
+++ b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
@@ -2983,7 +2983,7 @@ void ModuleBitcodeWriter::writeInstruction(const Instruction &I,
: bitc::FUNC_CODE_INST_CLEANUPPAD;
pushValue(FuncletPad.getParentPad(), InstID, Vals);
- unsigned NumArgOperands = FuncletPad.getNumArgOperands();
+ unsigned NumArgOperands = FuncletPad.arg_size();
Vals.push_back(NumArgOperands);
for (unsigned Op = 0; Op != NumArgOperands; ++Op)
pushValueAndType(FuncletPad.getArgOperand(Op), InstID, Vals);
diff --git a/llvm/lib/CodeGen/MachineFunction.cpp b/llvm/lib/CodeGen/MachineFunction.cpp
index 26b20d969568b..78b49c9236629 100644
--- a/llvm/lib/CodeGen/MachineFunction.cpp
+++ b/llvm/lib/CodeGen/MachineFunction.cpp
@@ -779,7 +779,7 @@ MCSymbol *MachineFunction::addLandingPad(MachineBasicBlock *LandingPad) {
}
} else if (const auto *CPI = dyn_cast<CatchPadInst>(FirstI)) {
- for (unsigned I = CPI->getNumArgOperands(); I != 0; --I) {
+ for (unsigned I = CPI->arg_size(); I != 0; --I) {
Value *TypeInfo = CPI->getArgOperand(I - 1)->stripPointerCasts();
addCatchTypeInfo(LandingPad, dyn_cast<GlobalValue>(TypeInfo));
}
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index 14507aeb7bcd4..5dd6cc6225573 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -1193,11 +1193,11 @@ static void mapWasmLandingPadIndex(MachineBasicBlock *MBB,
// In case of single catch (...), we don't emit LSDA, so we don't need
// this information.
bool IsSingleCatchAllClause =
- CPI->getNumArgOperands() == 1 &&
+ CPI->arg_size() == 1 &&
cast<Constant>(CPI->getArgOperand(0))->isNullValue();
// cathchpads for longjmp use an empty type list, e.g. catchpad within %0 []
// and they don't need LSDA info
- bool IsCatchLongjmp = CPI->getNumArgOperands() == 0;
+ bool IsCatchLongjmp = CPI->arg_size() == 0;
if (!IsSingleCatchAllClause && !IsCatchLongjmp) {
// Create a mapping from landing pad label to landing pad index.
bool IntrFound = false;
diff --git a/llvm/lib/CodeGen/WasmEHPrepare.cpp b/llvm/lib/CodeGen/WasmEHPrepare.cpp
index aa6645227edb7..14831ab325d6b 100644
--- a/llvm/lib/CodeGen/WasmEHPrepare.cpp
+++ b/llvm/lib/CodeGen/WasmEHPrepare.cpp
@@ -253,7 +253,7 @@ bool WasmEHPrepare::prepareEHPads(Function &F) {
auto *CPI = cast<CatchPadInst>(BB->getFirstNonPHI());
// In case of a single catch (...), we don't need to emit a personalify
// function call
- if (CPI->getNumArgOperands() == 1 &&
+ if (CPI->arg_size() == 1 &&
cast<Constant>(CPI->getArgOperand(0))->isNullValue())
prepareEHPad(BB, false);
else
diff --git a/llvm/lib/CodeGen/WinEHPrepare.cpp b/llvm/lib/CodeGen/WinEHPrepare.cpp
index baca4109ebf52..8f5d9e9b296c1 100644
--- a/llvm/lib/CodeGen/WinEHPrepare.cpp
+++ b/llvm/lib/CodeGen/WinEHPrepare.cpp
@@ -556,8 +556,8 @@ void llvm::calculateClrEHStateNumbers(const Function *Fn,
// Create the entry for this cleanup with the appropriate handler
// properties. Finally and fault handlers are distinguished by arity.
ClrHandlerType HandlerType =
- (Cleanup->getNumArgOperands() ? ClrHandlerType::Fault
- : ClrHandlerType::Finally);
+ (Cleanup->arg_size() ? ClrHandlerType::Fault
+ : ClrHandlerType::Finally);
int CleanupState = addClrEHHandler(FuncInfo, HandlerParentState, -1,
HandlerType, 0, Pad->getParent());
// Queue any child EH pads on the worklist.
diff --git a/llvm/lib/IR/AsmWriter.cpp b/llvm/lib/IR/AsmWriter.cpp
index d9443f43ae14f..21e662bed6b25 100644
--- a/llvm/lib/IR/AsmWriter.cpp
+++ b/llvm/lib/IR/AsmWriter.cpp
@@ -4090,8 +4090,7 @@ void AssemblyWriter::printInstruction(const Instruction &I) {
Out << " within ";
writeOperand(FPI->getParentPad(), /*PrintType=*/false);
Out << " [";
- for (unsigned Op = 0, NumOps = FPI->getNumArgOperands(); Op < NumOps;
- ++Op) {
+ for (unsigned Op = 0, NumOps = FPI->arg_size(); Op < NumOps; ++Op) {
if (Op > 0)
Out << ", ";
writeOperand(FPI->getArgOperand(Op), /*PrintType=*/true);
diff --git a/llvm/lib/IR/Core.cpp b/llvm/lib/IR/Core.cpp
index b267f8288b690..45676a4617061 100644
--- a/llvm/lib/IR/Core.cpp
+++ b/llvm/lib/IR/Core.cpp
@@ -2806,7 +2806,7 @@ LLVMValueRef LLVMIsATerminatorInst(LLVMValueRef Inst) {
unsigned LLVMGetNumArgOperands(LLVMValueRef Instr) {
if (FuncletPadInst *FPI = dyn_cast<FuncletPadInst>(unwrap(Instr))) {
- return FPI->getNumArgOperands();
+ return FPI->arg_size();
}
return unwrap<CallBase>(Instr)->arg_size();
}
More information about the llvm-commits
mailing list