averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

SIL: Made index_addr index operand dynamic.

Browse Source 
Instead of taking an integer constant index, index_addr now takes a value operand of builtin integer type, which makes more sense.

Swift SVN r5478
This commit is contained in:
Joe Groff
2013-06-05 16:49:41 +00:00
parent b8a2426673
commit ed6b5ad497
6 changed files with 44 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/swift/SIL/SILBuilder.h
View File

@@ -526,10 +526,9 @@ public:
// SIL-only instructions that don't have an AST analog
//===--------------------------------------------------------------------===//
IndexAddrInst *createIndexAddr(SILLocation loc, SILValue Operand,
unsigned Index) {
return insert(new (F.getModule())
IndexAddrInst(loc, Operand, Index));
IndexAddrInst *createIndexAddr(SILLocation loc,
SILValue Operand, SILValue Index) {
return insert(new (F.getModule()) IndexAddrInst(loc, Operand, Index));
}
//===--------------------------------------------------------------------===//

28
include/swift/SIL/SILInstruction.h
View File

@@ -1330,16 +1330,28 @@ public:
//===----------------------------------------------------------------------===//
/// IndexAddrInst - "%1 = index_addr %0, 42"
/// This takes an lvalue and indexes over the pointer, striding by the type of
/// the lvalue. This is used to index into arrays of uniform elements.
class IndexAddrInst : public UnaryInstructionBase<ValueKind::IndexAddrInst> {
unsigned Index;
/// IndexAddrInst - "%2 = index_addr %0 : $*T, %1 : $Builtin.Int64"
/// This takes an address and indexes it, striding by the pointed-
/// to type. This is used to index into arrays of uniform elements.
class IndexAddrInst : public SILInstruction {
enum { Base, Index };
FixedOperandList<2> Operands;
public:
IndexAddrInst(SILLocation Loc, SILValue Operand, unsigned Index)
: UnaryInstructionBase(Loc, Operand, Operand.getType()), Index(Index) {}
IndexAddrInst(SILLocation Loc, SILValue Operand, SILValue Index)
: SILInstruction(ValueKind::IndexAddrInst, Loc, Operand.getType()),
Operands{this, Operand, Index}
{}
unsigned getIndex() const { return Index; }
SILValue getBase() const { return Operands[Base].get(); }
SILValue getIndex() const { return Operands[Index].get(); }
ArrayRef<Operand> getAllOperands() const { return Operands.asArray(); }
SILType getType(unsigned i = 0) const { return ValueBase::getType(i); }
static bool classof(const ValueBase *V) {
return V->getKind() == ValueKind::IndexAddrInst;
}
};
//===----------------------------------------------------------------------===//