diff options
| -rw-r--r-- | lib/AsmParser/llvmAsmParser.cpp.cvs | 2 | ||||
| -rw-r--r-- | lib/AsmParser/llvmAsmParser.y.cvs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/AsmParser/llvmAsmParser.cpp.cvs b/lib/AsmParser/llvmAsmParser.cpp.cvs index 284990f919..3fcc87a9e2 100644 --- a/lib/AsmParser/llvmAsmParser.cpp.cvs +++ b/lib/AsmParser/llvmAsmParser.cpp.cvs @@ -4194,7 +4194,7 @@ yyreduce: { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (1)].TypeVal))->getDescription()); - if (!(*(yyvsp[(1) - (1)].TypeVal))->isFirstClassType() && (*(yyvsp[(1) - (1)].TypeVal))->getTypeID() != Type::StructTyID) + if (!(*(yyvsp[(1) - (1)].TypeVal))->isFirstClassType() && !isa<StructType>((yyvsp[(1) - (1)].TypeVal)->get())) GEN_ERROR("LLVM functions cannot return aggregate types"); (yyval.TypeVal) = (yyvsp[(1) - (1)].TypeVal); ;} diff --git a/lib/AsmParser/llvmAsmParser.y.cvs b/lib/AsmParser/llvmAsmParser.y.cvs index b36e85c4a6..084a328844 100644 --- a/lib/AsmParser/llvmAsmParser.y.cvs +++ b/lib/AsmParser/llvmAsmParser.y.cvs @@ -1462,7 +1462,7 @@ ResultTypes : Types { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription()); - if (!(*$1)->isFirstClassType() && (*$1)->getTypeID() != Type::StructTyID) + if (!(*$1)->isFirstClassType() && !isa<StructType>($1->get())) GEN_ERROR("LLVM functions cannot return aggregate types"); $$ = $1; } |