From 20d824b7dfea987775586d9de56c7448cc2cc44d Mon Sep 17 00:00:00 2001 From: Duncan Sands Date: Thu, 19 Jul 2007 09:42:01 +0000 Subject: [PATCH] Replace mysterious code causing a g++-4.2 warning with hopefully correct code that pleases g++-4.2. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@40051 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Analysis/IPA/CallGraphSCCPass.cpp | 9 +++------ lib/Analysis/LoopPass.cpp | 18 ++++++------------ 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/lib/Analysis/IPA/CallGraphSCCPass.cpp b/lib/Analysis/IPA/CallGraphSCCPass.cpp index a7e9dd00e56..97a40089c3f 100644 --- a/lib/Analysis/IPA/CallGraphSCCPass.cpp +++ b/lib/Analysis/IPA/CallGraphSCCPass.cpp @@ -153,12 +153,9 @@ bool CGPassManager::doFinalization(CallGraph &CG) { void CallGraphSCCPass::assignPassManager(PMStack &PMS, PassManagerType PreferredType) { // Find CGPassManager - while (!PMS.empty()) { - if (PMS.top()->getPassManagerType() > PMT_CallGraphPassManager) - PMS.pop(); - else; - break; - } + while (!PMS.empty() && + PMS.top()->getPassManagerType() > PMT_CallGraphPassManager) + PMS.pop(); CGPassManager *CGP = dynamic_cast(PMS.top()); diff --git a/lib/Analysis/LoopPass.cpp b/lib/Analysis/LoopPass.cpp index a5496a01f0a..f14a9baf98a 100644 --- a/lib/Analysis/LoopPass.cpp +++ b/lib/Analysis/LoopPass.cpp @@ -261,12 +261,9 @@ bool LPPassManager::runOnFunction(Function &F) { void LoopPass::preparePassManager(PMStack &PMS) { // Find LPPassManager - while (!PMS.empty()) { - if (PMS.top()->getPassManagerType() > PMT_LoopPassManager) - PMS.pop(); - else; - break; - } + while (!PMS.empty() && + PMS.top()->getPassManagerType() > PMT_LoopPassManager) + PMS.pop(); LPPassManager *LPPM = dynamic_cast(PMS.top()); @@ -281,12 +278,9 @@ void LoopPass::preparePassManager(PMStack &PMS) { void LoopPass::assignPassManager(PMStack &PMS, PassManagerType PreferredType) { // Find LPPassManager - while (!PMS.empty()) { - if (PMS.top()->getPassManagerType() > PMT_LoopPassManager) - PMS.pop(); - else; - break; - } + while (!PMS.empty() && + PMS.top()->getPassManagerType() > PMT_LoopPassManager) + PMS.pop(); LPPassManager *LPPM = dynamic_cast(PMS.top()); -- 2.34.1