From 60f28bff4c9df9c52b85b63a13d29db601970ebc Mon Sep 17 00:00:00 2001
From: Duncan Sands <baldrick@free.fr>
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.

llvm-svn: 40051
---
 llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp |  9 +++------
 llvm/lib/Analysis/LoopPass.cpp             | 18 ++++++------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp b/llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp
index a7e9dd00e564..97a40089c3fc 100644
--- a/llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp
+++ b/llvm/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<CGPassManager *>(PMS.top());
 
diff --git a/llvm/lib/Analysis/LoopPass.cpp b/llvm/lib/Analysis/LoopPass.cpp
index a5496a01f0a9..f14a9baf98a9 100644
--- a/llvm/lib/Analysis/LoopPass.cpp
+++ b/llvm/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<LPPassManager *>(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<LPPassManager *>(PMS.top());