diff options
| -rw-r--r-- | lib/VMCore/Value.cpp | 7 | ||||
| -rw-r--r-- | lib/VMCore/Verifier.cpp | 26 | ||||
| -rw-r--r-- | test/Assembler/2005-01-31-CallingAggregateFunction.ll | 1 | ||||
| -rw-r--r-- | test/Assembler/2008-02-20-MultipleReturnValue.ll | 12 |
4 files changed, 38 insertions, 8 deletions
diff --git a/lib/VMCore/Value.cpp b/lib/VMCore/Value.cpp index 7b9d7f0..440e0a6 100644 --- a/lib/VMCore/Value.cpp +++ b/lib/VMCore/Value.cpp @@ -14,6 +14,7 @@ #include "llvm/Constant.h" #include "llvm/DerivedTypes.h" #include "llvm/InstrTypes.h" +#include "llvm/Instructions.h" #include "llvm/Module.h" #include "llvm/ValueSymbolTable.h" #include "llvm/Support/Debug.h" @@ -33,7 +34,11 @@ static inline const Type *checkType(const Type *Ty) { Value::Value(const Type *ty, unsigned scid) : SubclassID(scid), SubclassData(0), Ty(checkType(ty)), UseList(0), Name(0) { - if (!isa<Constant>(this) && !isa<BasicBlock>(this)) + if (isa<CallInst>(this)) + assert((Ty->isFirstClassType() || Ty == Type::VoidTy || + isa<OpaqueType>(ty) || Ty->getTypeID() == Type::StructTyID) && + "invalid CallInst type!"); + else if (!isa<Constant>(this) && !isa<BasicBlock>(this)) assert((Ty->isFirstClassType() || Ty == Type::VoidTy || isa<OpaqueType>(ty)) && "Cannot create non-first-class values except for constants!"); diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp index 4bd2ba6..27adc08 100644 --- a/lib/VMCore/Verifier.cpp +++ b/lib/VMCore/Verifier.cpp @@ -1071,7 +1071,8 @@ void Verifier::visitInstruction(Instruction &I) { // Check that the return value of the instruction is either void or a legal // value type. - Assert1(I.getType() == Type::VoidTy || I.getType()->isFirstClassType(), + Assert1(I.getType() == Type::VoidTy || I.getType()->isFirstClassType() + || (isa<CallInst>(I) && I.getType()->getTypeID() == Type::StructTyID), "Instruction returns a non-scalar type!", &I); // Check that all uses of the instruction, if they are instructions @@ -1091,11 +1092,24 @@ void Verifier::visitInstruction(Instruction &I) { // Check to make sure that only first-class-values are operands to // instructions. - Assert1(I.getOperand(i)->getType()->isFirstClassType() - || (isa<ReturnInst>(I) - && I.getOperand(i)->getType()->getTypeID() == Type::StructTyID), - "Instruction operands must be first-class values!", &I); - + if (!I.getOperand(i)->getType()->isFirstClassType()) { + if (isa<ReturnInst>(I) || isa<GetResultInst>(I)) + Assert1(I.getOperand(i)->getType()->getTypeID() == Type::StructTyID, + "Invalid ReturnInst operands!", &I); + else if (isa<CallInst>(I)) { + if (const PointerType *PT = dyn_cast<PointerType> + (I.getOperand(i)->getType())) { + const Type *ETy = PT->getElementType(); + Assert1(ETy->getTypeID() == Type::StructTyID, + "Invalid CallInst operands!", &I); + } + else + Assert1(0, "Invalid CallInst operands!", &I); + } + else + Assert1(0, "Instruction operands must be first-class values!", &I); + } + if (Function *F = dyn_cast<Function>(I.getOperand(i))) { // Check to make sure that the "address of" an intrinsic function is never // taken. diff --git a/test/Assembler/2005-01-31-CallingAggregateFunction.ll b/test/Assembler/2005-01-31-CallingAggregateFunction.ll index ebe2ee9..e6baf34 100644 --- a/test/Assembler/2005-01-31-CallingAggregateFunction.ll +++ b/test/Assembler/2005-01-31-CallingAggregateFunction.ll @@ -1,5 +1,4 @@ ; RUN: llvm-as < %s -o /dev/null -f -; XFAIL: * define void @test() { call {} @foo() diff --git a/test/Assembler/2008-02-20-MultipleReturnValue.ll b/test/Assembler/2008-02-20-MultipleReturnValue.ll new file mode 100644 index 0000000..a40fa3e --- /dev/null +++ b/test/Assembler/2008-02-20-MultipleReturnValue.ll @@ -0,0 +1,12 @@ +; RUN: llvm-as < %s -disable-output + +define {i32, i8} @foo(i32 %p) { + ret i32 1, i8 2 +} + +define i8 @f2(i32 %p) { + %c = call {i32, i8} @foo(i32 %p) + %d = getresult {i32, i8} %c, 1 + %e = add i8 %d, 1 + ret i8 %e +} |