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

diff --git a/lib/Analysis/IPA/CallGraphSCCPass.cpp b/lib/Analysis/IPA/CallGraphSCCPass.cpp
index a7e9dd00e564139dafe3d4b0c79f9fd998ec590e..97a40089c3fc7645607225b7e94cf1496d505d36 100644 (file)
--- 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<CGPassManager *>(PMS.top());
 

diff --git a/lib/Analysis/LoopPass.cpp b/lib/Analysis/LoopPass.cpp
index a5496a01f0a9c8f511feb910e8e0b8b440695af5..f14a9baf98a9b32223f90b4b2fb82ed6adedeb9c 100644 (file)
--- 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<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());