diff options
| -rw-r--r-- | lib/AsmParser/llvmAsmParser.y | 3 | ||||
| -rw-r--r-- | lib/VMCore/Function.cpp | 3 | ||||
| -rw-r--r-- | lib/VMCore/Verifier.cpp | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/lib/AsmParser/llvmAsmParser.y b/lib/AsmParser/llvmAsmParser.y index 8e4450138e..ca2924bb49 100644 --- a/lib/AsmParser/llvmAsmParser.y +++ b/lib/AsmParser/llvmAsmParser.y @@ -1395,6 +1395,9 @@ FunctionHeaderH : TypesV Name '(' ArgList ')' { UnEscapeLexed($2); std::string FunctionName($2); + if (!(*$1)->isFirstClassType() && *$1 != Type::VoidTy) + ThrowException("LLVM functions cannot return aggregate types!"); + std::vector<const Type*> ParamTypeList; if ($4) { // If there are arguments... for (std::vector<std::pair<PATypeHolder*,char*> >::iterator I = $4->begin(); diff --git a/lib/VMCore/Function.cpp b/lib/VMCore/Function.cpp index 9a4ac6711c..b5586721e8 100644 --- a/lib/VMCore/Function.cpp +++ b/lib/VMCore/Function.cpp @@ -95,6 +95,9 @@ Function::Function(const FunctionType *Ty, LinkageTypes Linkage, ArgumentList.setParent(this); SymTab = new SymbolTable(); + assert((getReturnType()->isFirstClassType() ||getReturnType() == Type::VoidTy) + && "LLVM functions cannot return aggregate values!"); + // Create the arguments vector, all arguments start out unnamed. for (unsigned i = 0, e = Ty->getNumParams(); i != e; ++i) { assert(Ty->getParamType(i) != Type::VoidTy && diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp index 1d441d1dd5..98288f4142 100644 --- a/lib/VMCore/Verifier.cpp +++ b/lib/VMCore/Verifier.cpp @@ -241,6 +241,9 @@ void Verifier::visitFunction(Function &F) { Assert2(FT->getNumParams() == NumArgs, "# formal arguments must match # of arguments for function type!", &F, FT); + Assert1(F.getReturnType()->isFirstClassType() || + F.getReturnType() == Type::VoidTy, + "Functions cannot return aggregate values!", &F); // Check that the argument values match the function type for this function... unsigned i = 0; |