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

Use SmallVector while constructing ReturnInst. 

llvm-svn: 47619
This commit is contained in:
Devang Patel 2008-02-26 19:38:17 +00:00
parent 8af648ac55
commit a736c001b6
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/include/llvm/Instructions.h
View File

@ -1400,6 +1400,9 @@ public:
ReturnInst(const std::vector<Value *> &retVals);
ReturnInst(const std::vector<Value *> &retVals, Instruction *InsertBefore);
ReturnInst(const std::vector<Value *> &retVals, BasicBlock *InsertAtEnd);
ReturnInst(Value * const* retVals, unsigned N);
ReturnInst(Value * const* retVals, unsigned N, Instruction *InsertBefore);
ReturnInst(Value * const* retVals, unsigned N, BasicBlock *InsertAtEnd);
explicit ReturnInst(BasicBlock *InsertAtEnd);
virtual ~ReturnInst();

6
llvm/lib/Bitcode/Reader/BitcodeReader.cpp
View File

@ -21,6 +21,7 @@
#include "llvm/ParamAttrsList.h"
#include "llvm/AutoUpgrade.h"
#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/Support/MathExtras.h"
#include "llvm/Support/MemoryBuffer.h"
using namespace llvm;
@ -1344,7 +1345,7 @@ bool BitcodeReader::ParseFunctionBody(Function *F) {
break;
} else {
unsigned OpNum = 0;
std::vector<Value *> Vs;
SmallVector<Value *,4> Vs;
do {
Value *Op = NULL;
if (getValueTypePair(Record, OpNum, NextValueNo, Op))
@ -1352,7 +1353,8 @@ bool BitcodeReader::ParseFunctionBody(Function *F) {
Vs.push_back(Op);
} while(OpNum != Record.size());
I = new ReturnInst(Vs);
// SmallVector Vs has at least one element.
I = new ReturnInst(&Vs[0], Vs.size());
break;
}
}

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

@ -618,6 +618,24 @@ ReturnInst::ReturnInst(const std::vector<Value *> &retVals)
init(&retVals[0], retVals.size());
}
ReturnInst::ReturnInst(Value * const* retVals, unsigned N,
Instruction *InsertBefore)
: TerminatorInst(Type::VoidTy, Instruction::Ret, &RetVal, N, InsertBefore) {
if (N != 0)
init(retVals, N);
}
ReturnInst::ReturnInst(Value * const* retVals, unsigned N,
BasicBlock *InsertAtEnd)
: TerminatorInst(Type::VoidTy, Instruction::Ret, &RetVal, N, InsertAtEnd) {
if (N != 0)
init(retVals, N);
}
ReturnInst::ReturnInst(Value * const* retVals, unsigned N)
: TerminatorInst(Type::VoidTy, Instruction::Ret, &RetVal, N) {
if (N != 0)
init(retVals, N);
}
void ReturnInst::init(Value * const* retVals, unsigned N) {
assert (N > 0 && "Invalid operands numbers in ReturnInst init");