From a305fe75450348677a228f7d0f1cc53b2504b562 Mon Sep 17 00:00:00 2001 From: Andrew Trick Date: Thu, 21 Jul 2011 17:37:39 +0000 Subject: [PATCH] Cleanup: make std::pair usage slightly less indecipherable without actually naming variables! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@135684 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/Scalar/IndVarSimplify.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/Transforms/Scalar/IndVarSimplify.cpp b/lib/Transforms/Scalar/IndVarSimplify.cpp index 3f810cdf5a2..f2c69a258cb 100644 --- a/lib/Transforms/Scalar/IndVarSimplify.cpp +++ b/lib/Transforms/Scalar/IndVarSimplify.cpp @@ -1389,23 +1389,24 @@ void IndVarSimplify::SimplifyIVUsersNoRewrite(Loop *L, SCEVExpander &Rewriter) { pushIVUsers(CurrIV, Simplified, SimpleIVUsers); while (!SimpleIVUsers.empty()) { - std::pair Use =SimpleIVUsers.pop_back_val(); + std::pair 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(Use.first)) { + if (CastInst *Cast = dyn_cast(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) {