replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[IR] Remove TerminateInst's "NameStr" argument 

TerminateInst can't have a name because it doesn't produce a result.  No
functionality change is intended, this is just a cleanup.

llvm-svn: 244276
This commit is contained in:
David Majnemer 2015-08-06 21:08:36 +00:00
parent a102e6a0e3
commit 2a2b242f4b
2 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
llvm/include/llvm/IR/Instructions.h
View File

@ -3862,16 +3862,16 @@ DEFINE_TRANSPARENT_OPERAND_ACCESSORS(CatchPadInst, Value)
class TerminatePadInst : public TerminatorInst { class TerminatePadInst : public TerminatorInst {
private: private:
void init(BasicBlock *BB, ArrayRef<Value *> Args, const Twine &NameStr); void init(BasicBlock *BB, ArrayRef<Value *> Args);
TerminatePadInst(const TerminatePadInst &TPI); TerminatePadInst(const TerminatePadInst &TPI);
explicit TerminatePadInst(LLVMContext &C, BasicBlock *BB, explicit TerminatePadInst(LLVMContext &C, BasicBlock *BB,
ArrayRef<Value *> Args, unsigned Values, ArrayRef<Value *> Args, unsigned Values,
const Twine &NameStr, Instruction *InsertBefore); Instruction *InsertBefore);
explicit TerminatePadInst(LLVMContext &C, BasicBlock *BB, explicit TerminatePadInst(LLVMContext &C, BasicBlock *BB,
ArrayRef<Value *> Args, unsigned Values, ArrayRef<Value *> Args, unsigned Values,
const Twine &NameStr, BasicBlock *InsertAtEnd); BasicBlock *InsertAtEnd);
protected: protected:
// Note: Instruction needs to be a friend here to call cloneImpl. // Note: Instruction needs to be a friend here to call cloneImpl.
@ -3880,24 +3880,20 @@ protected:
public: public:
static TerminatePadInst *Create(LLVMContext &C, BasicBlock *BB = nullptr, static TerminatePadInst *Create(LLVMContext &C, BasicBlock *BB = nullptr,
ArrayRef<Value *> Args = None, ArrayRef<Value *> Args = None,
const Twine &NameStr = "", Instruction *InsertBefore = nullptr) {
Instruction *InsertBefore = nullptr) {
unsigned Values = unsigned(Args.size()); unsigned Values = unsigned(Args.size());
if (BB) if (BB)
++Values; ++Values;
return new (Values) return new (Values) TerminatePadInst(C, BB, Args, Values, InsertBefore);
TerminatePadInst(C, BB, Args, Values, NameStr, InsertBefore);
} }
static TerminatePadInst *Create(LLVMContext &C, BasicBlock *BB, static TerminatePadInst *Create(LLVMContext &C, BasicBlock *BB,
ArrayRef<Value *> Args, ArrayRef<Value *> Args,
const Twine &NameStr, BasicBlock *InsertAtEnd) {
BasicBlock *InsertAtEnd) {
unsigned Values = unsigned(Args.size()); unsigned Values = unsigned(Args.size());
if (BB) if (BB)
++Values; ++Values;
return new (Values) return new (Values) TerminatePadInst(C, BB, Args, Values, InsertAtEnd);
TerminatePadInst(C, BB, Args, Values, NameStr, InsertAtEnd);
} }
/// Provide fast operand accessors /// Provide fast operand accessors

18
llvm/lib/IR/Instructions.cpp
View File

@ -882,15 +882,13 @@ void CatchPadInst::setSuccessorV(unsigned Idx, BasicBlock *B) {
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// TerminatePadInst Implementation // TerminatePadInst Implementation
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
void TerminatePadInst::init(BasicBlock *BB, ArrayRef<Value *> Args, void TerminatePadInst::init(BasicBlock *BB, ArrayRef<Value *> Args) {
const Twine &NameStr) {
SubclassOptionalData = 0; SubclassOptionalData = 0;
if (BB) if (BB)
setInstructionSubclassData(getSubclassDataFromInstruction() | 1); setInstructionSubclassData(getSubclassDataFromInstruction() | 1);
if (BB) if (BB)
Op<-1>() = BB; Op<-1>() = BB;
std::copy(Args.begin(), Args.end(), op_begin()); std::copy(Args.begin(), Args.end(), op_begin());
setName(NameStr);
} }
TerminatePadInst::TerminatePadInst(const TerminatePadInst &TPI) TerminatePadInst::TerminatePadInst(const TerminatePadInst &TPI)
@ -904,23 +902,21 @@ TerminatePadInst::TerminatePadInst(const TerminatePadInst &TPI)
} }
TerminatePadInst::TerminatePadInst(LLVMContext &C, BasicBlock *BB, TerminatePadInst::TerminatePadInst(LLVMContext &C, BasicBlock *BB,
ArrayRef<Value *> Args, unsigned Values, ArrayRef<Value *> Args, unsigned Values,
const Twine &NameStr, Instruction *InsertBefore)
Instruction *InsertBefore)
: TerminatorInst(Type::getVoidTy(C), Instruction::TerminatePad, : TerminatorInst(Type::getVoidTy(C), Instruction::TerminatePad,
OperandTraits<TerminatePadInst>::op_end(this) - Values, OperandTraits<TerminatePadInst>::op_end(this) - Values,
Values, InsertBefore) { Values, InsertBefore) {
init(BB, Args, NameStr); init(BB, Args);
} }
TerminatePadInst::TerminatePadInst(LLVMContext &C, BasicBlock *BB, TerminatePadInst::TerminatePadInst(LLVMContext &C, BasicBlock *BB,
ArrayRef<Value *> Args, unsigned Values, ArrayRef<Value *> Args, unsigned Values,
const Twine &NameStr, BasicBlock *InsertAtEnd)
BasicBlock *InsertAtEnd)
: TerminatorInst(Type::getVoidTy(C), Instruction::TerminatePad, : TerminatorInst(Type::getVoidTy(C), Instruction::TerminatePad,
OperandTraits<TerminatePadInst>::op_end(this) - Values, OperandTraits<TerminatePadInst>::op_end(this) - Values,
Values, InsertAtEnd) { Values, InsertAtEnd) {
init(BB, Args, NameStr); init(BB, Args);
} }
BasicBlock *TerminatePadInst::getSuccessorV(unsigned Idx) const { BasicBlock *TerminatePadInst::getSuccessorV(unsigned Idx) const {