Cleanup: make std::pair usage slightly less indecipherable without actually naming...
authorAndrew Trick <atrick@apple.com>
Thu, 21 Jul 2011 17:37:39 +0000 (17:37 +0000)
committerAndrew Trick <atrick@apple.com>
Thu, 21 Jul 2011 17:37:39 +0000 (17:37 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@135684 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Transforms/Scalar/IndVarSimplify.cpp

index 3f810cdf5a25820342c0a7b5ed3acab4fd8c2eb7..f2c69a258cb3ca055adaa9652925b8d81821881e 100644 (file)
@@ -1389,23 +1389,24 @@ void IndVarSimplify::SimplifyIVUsersNoRewrite(Loop *L, SCEVExpander &Rewriter) {
       pushIVUsers(CurrIV, Simplified, SimpleIVUsers);
 
       while (!SimpleIVUsers.empty()) {
-        std::pair<Instruction*, Instruction*> Use =SimpleIVUsers.pop_back_val();
+        std::pair<Instruction*, Instruction*> UseOper =
+          SimpleIVUsers.pop_back_val();
         // Bypass back edges to avoid extra work.
-        if (Use.first == CurrIV) continue;
+        if (UseOper.first == CurrIV) continue;
 
-        if (EliminateIVUser(Use.first, Use.second)) {
-          pushIVUsers(Use.second, Simplified, SimpleIVUsers);
+        if (EliminateIVUser(UseOper.first, UseOper.second)) {
+          pushIVUsers(UseOper.second, Simplified, SimpleIVUsers);
           continue;
         }
-        if (CastInst *Cast = dyn_cast<CastInst>(Use.first)) {
+        if (CastInst *Cast = dyn_cast<CastInst>(UseOper.first)) {
           bool IsSigned = Cast->getOpcode() == Instruction::SExt;
           if (IsSigned || Cast->getOpcode() == Instruction::ZExt) {
             CollectExtend(Cast, IsSigned, WI, SE, TD);
           }
           continue;
         }
-        if (isSimpleIVUser(Use.first, L, SE)) {
-          pushIVUsers(Use.first, Simplified, SimpleIVUsers);
+        if (isSimpleIVUser(UseOper.first, L, SE)) {
+          pushIVUsers(UseOper.first, Simplified, SimpleIVUsers);
         }
       }
       if (WI.WidestNativeType) {