#include "llvm/Pass.h"
#include "llvm/Module.h"
#include "llvm/ModuleProvider.h"
-#include "llvm/ParameterAttributes.h"
+#include "llvm/ParamAttrsList.h"
#include "llvm/DerivedTypes.h"
#include "llvm/InlineAsm.h"
#include "llvm/IntrinsicInst.h"
void visitUserOp2(Instruction &I) { visitUserOp1(I); }
void visitIntrinsicFunctionCall(Intrinsic::ID ID, CallInst &CI);
void visitAllocationInst(AllocationInst &AI);
+ void visitGetResultInst(GetResultInst &GRI);
void VerifyCallSite(CallSite CS);
void VerifyIntrinsicPrototype(Intrinsic::ID ID, Function *F,
unsigned Count, ...);
- void VerifyAttrs(uint16_t Attrs, const Type *Ty, bool isReturnValue,
- const Value *V);
+ void VerifyAttrs(ParameterAttributes Attrs, const Type *Ty,
+ bool isReturnValue, const Value *V);
void VerifyFunctionAttrs(const FunctionType *FT, const ParamAttrsList *Attrs,
const Value *V);
// VerifyAttrs - Check the given parameter attributes for an argument or return
// value of the specified type. The value V is printed in error messages.
-void Verifier::VerifyAttrs(uint16_t Attrs, const Type *Ty, bool isReturnValue,
- const Value *V) {
+void Verifier::VerifyAttrs(ParameterAttributes Attrs, const Type *Ty,
+ bool isReturnValue, const Value *V) {
if (Attrs == ParamAttr::None)
return;
if (isReturnValue) {
- uint16_t RetI = Attrs & ParamAttr::ParameterOnly;
+ ParameterAttributes RetI = Attrs & ParamAttr::ParameterOnly;
Assert1(!RetI, "Attribute " + ParamAttrsList::getParamAttrsText(RetI) +
"does not apply to return values!", V);
} else {
- uint16_t ParmI = Attrs & ParamAttr::ReturnOnly;
+ ParameterAttributes ParmI = Attrs & ParamAttr::ReturnOnly;
Assert1(!ParmI, "Attribute " + ParamAttrsList::getParamAttrsText(ParmI) +
"only applies to return values!", V);
}
for (unsigned i = 0;
i < array_lengthof(ParamAttr::MutuallyIncompatible); ++i) {
- uint16_t MutI = Attrs & ParamAttr::MutuallyIncompatible[i];
+ ParameterAttributes MutI = Attrs & ParamAttr::MutuallyIncompatible[i];
Assert1(!(MutI & (MutI - 1)), "Attributes " +
ParamAttrsList::getParamAttrsText(MutI) + "are incompatible!", V);
}
- uint16_t TypeI = Attrs & ParamAttr::typeIncompatible(Ty);
+ ParameterAttributes TypeI = Attrs & ParamAttr::typeIncompatible(Ty);
Assert1(!TypeI, "Wrong type for attribute " +
ParamAttrsList::getParamAttrsText(TypeI), V);
}
bool SawNest = false;
for (unsigned Idx = 0; Idx <= FT->getNumParams(); ++Idx) {
- uint16_t Attr = Attrs->getParamAttrs(Idx);
+ ParameterAttributes Attr = Attrs->getParamAttrs(Idx);
VerifyAttrs(Attr, FT->getParamType(Idx-1), !Idx, V);
"# formal arguments must match # of arguments for function type!",
&F, FT);
Assert1(F.getReturnType()->isFirstClassType() ||
- F.getReturnType() == Type::VoidTy,
+ F.getReturnType() == Type::VoidTy ||
+ isa<StructType>(F.getReturnType()),
"Functions cannot return aggregate values!", &F);
- Assert1(!F.isStructReturn() || FT->getReturnType() == Type::VoidTy,
- "Invalid struct-return function!", &F);
+ Assert1(!F.hasStructRetAttr() || F.getReturnType() == Type::VoidTy,
+ "Invalid struct return type!", &F);
const ParamAttrsList *Attrs = F.getParamAttrs();
void Verifier::visitReturnInst(ReturnInst &RI) {
Function *F = RI.getParent()->getParent();
- if (RI.getNumOperands() == 0)
+ unsigned N = RI.getNumOperands();
+ if (N == 0)
Assert2(F->getReturnType() == Type::VoidTy,
"Found return instr that returns void in Function of non-void "
"return type!", &RI, F->getReturnType());
- else
+ else if (N == 1)
Assert2(F->getReturnType() == RI.getOperand(0)->getType(),
"Function return type does not match operand "
"type of return inst!", &RI, F->getReturnType());
+ else if (const StructType *STy = dyn_cast<StructType>(F->getReturnType())) {
+ for (unsigned i = 0; i < N; i++)
+ Assert2(STy->getElementType(i) == RI.getOperand(i)->getType(),
+ "Function return type does not match operand "
+ "type of return inst!", &RI, F->getReturnType());
+ } else
+ Assert1(0, "Invalid return type!", &RI);
// Check to make sure that the return value has necessary properties for
// terminators...
if (Attrs && FTy->isVarArg())
// Check attributes on the varargs part.
for (unsigned Idx = 1 + FTy->getNumParams(); Idx <= CS.arg_size(); ++Idx) {
- uint16_t Attr = Attrs->getParamAttrs(Idx);
+ ParameterAttributes Attr = Attrs->getParamAttrs(Idx);
VerifyAttrs(Attr, CS.getArgument(Idx-1)->getType(), false, I);
- uint16_t VArgI = Attr & ParamAttr::VarArgsIncompatible;
+ ParameterAttributes VArgI = Attr & ParamAttr::VarArgsIncompatible;
Assert1(!VArgI, "Attribute " + ParamAttrsList::getParamAttrsText(VArgI) +
"cannot be used for vararg call arguments!", I);
}
}
void Verifier::visitAllocationInst(AllocationInst &AI) {
- const PointerType *Ptr = AI.getType();
- Assert(Ptr->getAddressSpace() == 0,
- "Allocation instruction pointer not in the generic address space!");
+ const PointerType *PTy = AI.getType();
+ Assert1(PTy->getAddressSpace() == 0,
+ "Allocation instruction pointer not in the generic address space!",
+ &AI);
+ Assert1(PTy->getElementType()->isSized(), "Cannot allocate unsized type",
+ &AI);
visitInstruction(AI);
}
+void Verifier::visitGetResultInst(GetResultInst &GRI) {
+ Assert1(GRI.isValidOperands(GRI.getAggregateValue(), GRI.getIndex()),
+ "Invalid GetResultInst operands!", &GRI);
+ visitInstruction(GRI);
+}
+
/// verifyInstruction - Verify that an instruction is well formed.
///
!DT->dominates(&BB->getParent()->getEntryBlock(), BB),
"Only PHI nodes may reference their own value!", &I);
}
+
+ // Verify that if this is a terminator that it is at the end of the block.
+ if (isa<TerminatorInst>(I))
+ Assert1(BB->getTerminator() == &I, "Terminator not at end of block!", &I);
+
// Check that void typed values don't have names
Assert1(I.getType() != Type::VoidTy || !I.hasName(),
// 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) || isa<InvokeInst>(I))
+ && isa<StructType>(I.getType())),
"Instruction returns a non-scalar type!", &I);
// Check that all uses of the instruction, if they are instructions
// Check to make sure that only first-class-values are operands to
// instructions.
- Assert1(I.getOperand(i)->getType()->isFirstClassType(),
- "Instruction operands must be first-class values!", &I);
-
+ if (!I.getOperand(i)->getType()->isFirstClassType()) {
+ if (isa<ReturnInst>(I) || isa<GetResultInst>(I))
+ Assert1(isa<StructType>(I.getOperand(i)->getType()),
+ "Invalid ReturnInst operands!", &I);
+ else if (isa<CallInst>(I) || isa<InvokeInst>(I)) {
+ if (const PointerType *PT = dyn_cast<PointerType>
+ (I.getOperand(i)->getType())) {
+ const Type *ETy = PT->getElementType();
+ Assert1(isa<StructType>(ETy), "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.
projects / oota-llvm.git / blobdiff