[llvm-commits] CVS: llvm/tools/llvm-upgrade/UpgradeParser.y UpgradeLexer.l

[Reid Spencer]

Changes in directory llvm/tools/llvm-upgrade:

UpgradeParser.y updated: 1.39 -> 1.40
UpgradeLexer.l updated: 1.13 -> 1.14
---
Log message:

Can't generate "bool" any more. Change to i1


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

 UpgradeLexer.l  |    2 +-
 UpgradeParser.y |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)


Index: llvm/tools/llvm-upgrade/UpgradeParser.y
diff -u llvm/tools/llvm-upgrade/UpgradeParser.y:1.39 llvm/tools/llvm-upgrade/UpgradeParser.y:1.40
--- llvm/tools/llvm-upgrade/UpgradeParser.y:1.39	Fri Jan 12 18:22:40 2007
+++ llvm/tools/llvm-upgrade/UpgradeParser.y	Fri Jan 12 22:39:47 2007
@@ -1783,7 +1783,7 @@
     *$1 = getCompareOp(*$1, $2);
     *$1 += " " + $2->getNewTy() + " " + Name1 + ", " + Name2;
     $$.val = $1;
-    $$.type = TypeInfo::get("bool",BoolTy);
+    $$.type = TypeInfo::get("i1",BoolTy);
     $3.destroy(); $5.destroy();
   }
   | ICMP IPredicates Types ValueRef ',' ValueRef {
@@ -1791,7 +1791,7 @@
     std::string Name2 = getUniqueName($6.val, $3);
     *$1 += " " + *$2 + " " + $3->getNewTy() + " " + Name1 + "," + Name2;
     $$.val = $1;
-    $$.type = TypeInfo::get("bool",BoolTy);
+    $$.type = TypeInfo::get("i1",BoolTy);
     delete $2; $4.destroy(); $6.destroy();
   }
   | FCMP FPredicates Types ValueRef ',' ValueRef {
@@ -1799,7 +1799,7 @@
     std::string Name2 = getUniqueName($6.val, $3);
     *$1 += " " + *$2 + " " + $3->getNewTy() + " " + Name1 + "," + Name2;
     $$.val = $1;
-    $$.type = TypeInfo::get("bool",BoolTy);
+    $$.type = TypeInfo::get("i1",BoolTy);
     delete $2; $4.destroy(); $6.destroy();
   }
   | ShiftOps ResolvedVal ',' ResolvedVal {
@@ -1884,7 +1884,7 @@
       size_t pos = (*$6)[1].val->find(' ');
       assert(pos != std::string::npos && "no space?");
       *$$.val += (*$6)[1].val->substr(pos+1);
-      $$.type = TypeInfo::get("bool", BoolTy);
+      $$.type = TypeInfo::get("i1", BoolTy);
     } else {
       static unsigned upgradeCount = 1;
       if (*$4.val == "%llvm.va_start" || *$4.val == "%llvm.va_end") {


Index: llvm/tools/llvm-upgrade/UpgradeLexer.l
diff -u llvm/tools/llvm-upgrade/UpgradeLexer.l:1.13 llvm/tools/llvm-upgrade/UpgradeLexer.l:1.14
--- llvm/tools/llvm-upgrade/UpgradeLexer.l:1.13	Fri Jan  5 11:18:58 2007
+++ llvm/tools/llvm-upgrade/UpgradeLexer.l	Fri Jan 12 22:39:47 2007
@@ -145,7 +145,7 @@
 x86_fastcallcc  { RET_TOK( X86_FASTCALLCC_TOK); }
 
 void            { RET_TY(VOID,VoidTy,"void",false); }
-bool            { RET_TY(BOOL,BoolTy,"bool",false); }
+bool            { RET_TY(BOOL,BoolTy,"i1",false); }
 sbyte           { RET_TY(SBYTE,SByteTy,"i8",true); }
 ubyte           { RET_TY(UBYTE,UByteTy,"i8",false); }
 short           { RET_TY(SHORT,ShortTy,"i16",true); }