Regenerate.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47519 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/AsmParser/llvmAsmParser.cpp.cvs b/lib/AsmParser/llvmAsmParser.cpp.cvs
index 284990f91980d8715e663ed748e2e69952d2e735..3fcc87a9e2071da57a52872d298116ac7b32a07c 100644 (file)
--- 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 b36e85c4a6c25d165c5a1ab4a0f885ef32bfc7fd..084a328844e997eed6e7421d6bfc477c858ad1ab 100644 (file)
--- 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;
   }