Regenerate.

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

diff --git a/tools/llvm-upgrade/UpgradeParser.cpp b/tools/llvm-upgrade/UpgradeParser.cpp
index a863a8981fdcf1622bb8fc8c91019ddc7e55bbfb..96cae3b3e6084938b40ed827b45aa4fb36098027 100644 (file)
--- a/tools/llvm-upgrade/UpgradeParser.cpp
+++ b/tools/llvm-upgrade/UpgradeParser.cpp
@@ -546,7 +546,7 @@ static std::string getCastUpgrade(
     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

diff --git a/tools/llvm-upgrade/UpgradeParser.cpp.cvs b/tools/llvm-upgrade/UpgradeParser.cpp.cvs
index a863a8981fdcf1622bb8fc8c91019ddc7e55bbfb..96cae3b3e6084938b40ed827b45aa4fb36098027 100644 (file)
--- a/tools/llvm-upgrade/UpgradeParser.cpp.cvs
+++ b/tools/llvm-upgrade/UpgradeParser.cpp.cvs
@@ -546,7 +546,7 @@ static std::string getCastUpgrade(
     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

diff --git a/tools/llvm-upgrade/UpgradeParser.y.cvs b/tools/llvm-upgrade/UpgradeParser.y.cvs
index 126a37542e686cb4e1d87c433681a4acc2c6de0a..5a4118d8d74d7693bc450bd42e1e2b1b4b24e0dc 100644 (file)
--- a/tools/llvm-upgrade/UpgradeParser.y.cvs
+++ b/tools/llvm-upgrade/UpgradeParser.y.cvs
@@ -188,7 +188,7 @@ static std::string getCastUpgrade(
     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