[llvm-commits] CVS: llvm/tools/llvm-upgrade/UpgradeParser.cpp UpgradeParser.cpp.cvs UpgradeParser.y.cvs

[Reid Spencer]

Changes in directory llvm/tools/llvm-upgrade:

UpgradeParser.cpp updated: 1.25 -> 1.26
UpgradeParser.cpp.cvs updated: 1.23 -> 1.24
UpgradeParser.y.cvs updated: 1.22 -> 1.23
---
Log message:

Regenerate.


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

 UpgradeParser.cpp     |    2 +-
 UpgradeParser.cpp.cvs |    2 +-
 UpgradeParser.y.cvs   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


Index: llvm/tools/llvm-upgrade/UpgradeParser.cpp
diff -u llvm/tools/llvm-upgrade/UpgradeParser.cpp:1.25 llvm/tools/llvm-upgrade/UpgradeParser.cpp:1.26
--- llvm/tools/llvm-upgrade/UpgradeParser.cpp:1.25	Sat Dec  9 10:57:22 2006
+++ llvm/tools/llvm-upgrade/UpgradeParser.cpp	Sat Dec  9 13:41:25 2006
@@ -546,7 +546,7 @@
     SrcTy.destroy();
     SrcTy.newTy = new std::string("ulong");
     SrcTy.oldTy = ULongTy;
-  } else if (DstTy.oldTy == BoolTy) {
+  } else if (DstTy.oldTy == BoolTy && SrcTy.oldTy != BoolTy) {
     // cast ptr %x to  bool was previously defined as setne ptr %x, null
     // The ptrtoint semantic is to truncate, not compare so we must retain
     // the original intent by replace the cast with a setne


Index: llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs
diff -u llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs:1.23 llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs:1.24
--- llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs:1.23	Sat Dec  9 10:57:22 2006
+++ llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs	Sat Dec  9 13:41:25 2006
@@ -546,7 +546,7 @@
     SrcTy.destroy();
     SrcTy.newTy = new std::string("ulong");
     SrcTy.oldTy = ULongTy;
-  } else if (DstTy.oldTy == BoolTy) {
+  } else if (DstTy.oldTy == BoolTy && SrcTy.oldTy != BoolTy) {
     // cast ptr %x to  bool was previously defined as setne ptr %x, null
     // The ptrtoint semantic is to truncate, not compare so we must retain
     // the original intent by replace the cast with a setne


Index: llvm/tools/llvm-upgrade/UpgradeParser.y.cvs
diff -u llvm/tools/llvm-upgrade/UpgradeParser.y.cvs:1.22 llvm/tools/llvm-upgrade/UpgradeParser.y.cvs:1.23
--- llvm/tools/llvm-upgrade/UpgradeParser.y.cvs:1.22	Sat Dec  9 10:57:22 2006
+++ llvm/tools/llvm-upgrade/UpgradeParser.y.cvs	Sat Dec  9 13:41:25 2006
@@ -188,7 +188,7 @@
     SrcTy.destroy();
     SrcTy.newTy = new std::string("ulong");
     SrcTy.oldTy = ULongTy;
-  } else if (DstTy.oldTy == BoolTy) {
+  } else if (DstTy.oldTy == BoolTy && SrcTy.oldTy != BoolTy) {
     // cast ptr %x to  bool was previously defined as setne ptr %x, null
     // The ptrtoint semantic is to truncate, not compare so we must retain
     // the original intent by replace the cast with a setne