From: Reid Spencer <rspencer@reidspencer.com>
Date: Sat, 23 Dec 2006 10:21:26 +0000 (+0000)
Subject: Don't overload var names.
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=283e20708bbc7682cbcf1356abe1b59cda28b932;p=oota-llvm.git

Don't overload var names.


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

diff --git a/lib/VMCore/ConstantFold.cpp b/lib/VMCore/ConstantFold.cpp
index a7438fcde81..8fb02976fc4 100644
--- a/lib/VMCore/ConstantFold.cpp
+++ b/lib/VMCore/ConstantFold.cpp
@@ -883,11 +883,11 @@ static ICmpInst::Predicate evaluateICmpRelation(Constant *V1, Constant *V2,
       // null pointer, do the comparison with the pre-casted value.
       if (V2->isNullValue() &&
           (isa<PointerType>(CE1->getType()) || CE1->getType()->isIntegral())) {
-        bool isSigned = CE1->getOpcode() == Instruction::ZExt ? false :
+        bool sgnd = CE1->getOpcode() == Instruction::ZExt ? false :
           (CE1->getOpcode() == Instruction::SExt ? true :
            (CE1->getOpcode() == Instruction::PtrToInt ? false : isSigned));
         return evaluateICmpRelation(
-            CE1Op0, Constant::getNullValue(CE1Op0->getType()), isSigned);
+            CE1Op0, Constant::getNullValue(CE1Op0->getType()), sgnd);
       }
 
       // If the dest type is a pointer type, and the RHS is a constantexpr cast
@@ -898,11 +898,11 @@ static ICmpInst::Predicate evaluateICmpRelation(Constant *V1, Constant *V2,
         if (CE2->isCast() && isa<PointerType>(CE1->getType()) &&
             CE1->getOperand(0)->getType() == CE2->getOperand(0)->getType() &&
             CE1->getOperand(0)->getType()->isIntegral()) {
-          bool isSigned = CE1->getOpcode() == Instruction::ZExt ? false :
+          bool sgnd = CE1->getOpcode() == Instruction::ZExt ? false :
             (CE1->getOpcode() == Instruction::SExt ? true :
              (CE1->getOpcode() == Instruction::PtrToInt ? false : isSigned));
           return evaluateICmpRelation(CE1->getOperand(0), CE2->getOperand(0),
-              isSigned);
+              sgnd);
         }
       break;