6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-01 00:33:09 +00:00
Code Issues Projects Releases Wiki Activity

Fix some bugs with the handling of indices in insertvalue/extractvalue.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@51820 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dan Gohman 2008-05-31 19:09:08 +00:00
parent 517e1f5cd7
commit 35651cdf0b
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/llvm/Instructions.h
View File

@ -1590,10 +1590,8 @@ public:
}
static const Type *getIndexedType(const Type *Ptr, unsigned Idx);
inline op_iterator idx_begin() { return op_begin()+1; }
inline const_op_iterator idx_begin() const { return op_begin()+1; }
inline op_iterator idx_end() { return op_end(); }
inline const_op_iterator idx_end() const { return op_end(); }
inline const unsigned *idx_begin() const { return Indices.begin(); }
inline const unsigned *idx_end() const { return Indices.end(); }
Value *getAggregateOperand() {
return getOperand(0);
@ -1606,11 +1604,11 @@ public:
}
unsigned getNumIndices() const { // Note: always non-negative
return getNumOperands() - 1;
return Indices.size();
}
bool hasIndices() const {
return getNumOperands() > 1;
return true;
}
// Methods for support type inquiry through isa, cast, and dyn_cast:
@ -1762,10 +1760,8 @@ public:
return reinterpret_cast<const PointerType*>(Instruction::getType());
}
inline unsigned *idx_begin() { return Indices.begin(); }
inline const unsigned *idx_begin() const { return Indices.begin(); }
inline unsigned *idx_end() { return Indices.end(); }
inline const unsigned *idx_end() const { return Indices.end(); }
inline const unsigned *idx_begin() const { return Indices.begin(); }
inline const unsigned *idx_end() const { return Indices.end(); }
Value *getAggregateOperand() {
return getOperand(0);
@ -1788,11 +1784,11 @@ public:
}
unsigned getNumIndices() const { // Note: always non-negative
return getNumOperands() - 2;
return Indices.size();
}
bool hasIndices() const {
return getNumOperands() > 2;
return true;
}
// Methods for support type inquiry through isa, cast, and dyn_cast:

6
lib/VMCore/Constants.cpp
View File

@ -551,7 +551,7 @@ public:
Op<0>() = Agg;
}
/// Indicies - These identify which value to extract.
/// Indices - These identify which value to extract.
const SmallVector<unsigned, 4> Indices;
/// Transparently provide more efficient getOperand methods.
@ -577,7 +577,7 @@ public:
Op<1>() = Val;
}
/// Indicies - These identify the position for the insertion.
/// Indices - These identify the position for the insertion.
const SmallVector<unsigned, 4> Indices;
/// Transparently provide more efficient getOperand methods.
@ -2339,7 +2339,7 @@ Constant *ConstantExpr::getExtractValueTy(const Type *ReqTy, Constant *Agg,
// Look up the constant in the table first to ensure uniqueness
std::vector<Constant*> ArgVec;
ArgVec.push_back(Agg);
SmallVector<unsigned, 4> Indices;
SmallVector<unsigned, 4> Indices(Idxs, Idxs + NumIdx);
const ExprMapKeyType Key(Instruction::ExtractValue, ArgVec, 0, Indices);
return ExprConstants->getOrCreate(ReqTy, Key);
}