[llvm-commits] CVS: llvm/lib/AsmParser/llvmAsmParser.y

[Reid Spencer]

Changes in directory llvm/lib/AsmParser:

llvmAsmParser.y updated: 1.296 -> 1.297
---
Log message:

Permit icmp and fcmp to have packed operands.
Make an error message a little more useful.


---
Diffs of the changes:  (+2 -5)

 llvmAsmParser.y |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)


Index: llvm/lib/AsmParser/llvmAsmParser.y
diff -u llvm/lib/AsmParser/llvmAsmParser.y:1.296 llvm/lib/AsmParser/llvmAsmParser.y:1.297
--- llvm/lib/AsmParser/llvmAsmParser.y:1.296	Tue Jan  2 15:53:43 2007
+++ llvm/lib/AsmParser/llvmAsmParser.y	Wed Jan  3 18:05:48 2007
@@ -1602,7 +1602,8 @@
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
     if ($1->get() != $2->getType())
-      GEN_ERROR("Mismatched types for constant expression!");
+      GEN_ERROR("Mismatched types for constant expression: " + 
+        (*$1)->getDescription() + " and " + $2->getType()->getDescription());
     $$ = $2;
     delete $1;
     CHECK_FOR_ERROR
@@ -2548,8 +2549,6 @@
   | ICMP IPredicates Types ValueRef ',' ValueRef  {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*$3)->getDescription());
-    if (isa<PackedType>((*$3).get()))
-      GEN_ERROR("Packed types not supported by icmp instruction");
     Value* tmpVal1 = getVal(*$3, $4);
     CHECK_FOR_ERROR
     Value* tmpVal2 = getVal(*$3, $6);
@@ -2561,8 +2560,6 @@
   | FCMP FPredicates Types ValueRef ',' ValueRef  {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*$3)->getDescription());
-    if (isa<PackedType>((*$3).get()))
-      GEN_ERROR("Packed types not supported by fcmp instruction");
     Value* tmpVal1 = getVal(*$3, $4);
     CHECK_FOR_ERROR
     Value* tmpVal2 = getVal(*$3, $6);