[llvm-commits] [llvm] r40051 - in /llvm/trunk/lib/Analysis: IPA/CallGraphSCCPass.cpp LoopPass.cpp

[Duncan Sands]

Author: baldrick
Date: Thu Jul 19 04:42:01 2007
New Revision: 40051

URL: http://llvm.org/viewvc/llvm-project?rev=40051&view=rev
Log:
Replace mysterious code causing a g++-4.2 warning
with hopefully correct code that pleases g++-4.2.

Modified:
    llvm/trunk/lib/Analysis/IPA/CallGraphSCCPass.cpp
    llvm/trunk/lib/Analysis/LoopPass.cpp

Modified: llvm/trunk/lib/Analysis/IPA/CallGraphSCCPass.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/IPA/CallGraphSCCPass.cpp?rev=40051&r1=40050&r2=40051&view=diff

==============================================================================
--- llvm/trunk/lib/Analysis/IPA/CallGraphSCCPass.cpp (original)
+++ llvm/trunk/lib/Analysis/IPA/CallGraphSCCPass.cpp Thu Jul 19 04:42:01 2007
@@ -153,12 +153,9 @@
 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());
 

Modified: llvm/trunk/lib/Analysis/LoopPass.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/LoopPass.cpp?rev=40051&r1=40050&r2=40051&view=diff

==============================================================================
--- llvm/trunk/lib/Analysis/LoopPass.cpp (original)
+++ llvm/trunk/lib/Analysis/LoopPass.cpp Thu Jul 19 04:42:01 2007
@@ -261,12 +261,9 @@
 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::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());