Specify GetResultInst index as an unsigned.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47390 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AsmParser/llvmAsmParser.y b/lib/AsmParser/llvmAsmParser.y
index 9e9da47..effe097 100644
--- a/lib/AsmParser/llvmAsmParser.y
+++ b/lib/AsmParser/llvmAsmParser.y
@@ -3132,7 +3132,7 @@
$$ = new StoreInst($3, tmpVal, $1, $7);
delete $5;
}
-| GETRESULT Types LocalName ',' ConstVal {
+| GETRESULT Types LocalName ',' EUINT64VAL {
ValID TmpVID = ValID::createLocalName(*$3);
Value *TmpVal = getVal($2->get(), TmpVID);
if (!GetResultInst::isValidOperands(TmpVal, $5))
diff --git a/lib/VMCore/Instructions.cpp b/lib/VMCore/Instructions.cpp
index 65bc183..d700902 100644
--- a/lib/VMCore/Instructions.cpp
+++ b/lib/VMCore/Instructions.cpp
@@ -2705,23 +2705,25 @@
// GetResultInst Implementation
//===----------------------------------------------------------------------===//
-GetResultInst::GetResultInst(Value *Aggr, Value *Index,
+GetResultInst::GetResultInst(Value *Aggregate, unsigned Index,
const std::string &Name,
Instruction *InsertBef)
: Instruction(Aggr->getType(),
- GetResult, Ops, 2, InsertBef) {
- assert(isValidOperands(Aggr, Index) && "Invalid GetResultInst operands!");
- Ops[0].init(Aggr, this);
- Ops[1].init(Index, this);
+ GetResult, &Aggr, 1, InsertBef) {
+ assert(isValidOperands(Aggregate, Index) && "Invalid GetResultInst operands!");
+ Aggr.init(Aggregate, this);
+ Idx = Index;
setName(Name);
}
-bool GetResultInst::isValidOperands(const Value *Aggr, const Value *Index) {
- if (!Aggr || !Index)
+bool GetResultInst::isValidOperands(const Value *Aggregate, unsigned Index) {
+ if (!Aggregate)
return false;
- if (!isa<StructType>(Aggr->getType()) || Index->getType() != Type::Int32Ty)
- return false;
- return true;
+ if (const StructType *STy = dyn_cast<StructType>(Aggregate->getType()))
+ if (Index < STy->getNumElements())
+ return true;
+
+ return false;
}