[llvm-commits] [release_20] CVS: llvm/lib/Transforms/IPO/GlobalOpt.cpp

[Tanya Lattner]

Changes in directory llvm/lib/Transforms/IPO:

GlobalOpt.cpp updated: 1.105.2.1 -> 1.105.2.2
---
Log message:

Merge from mainline.


---
Diffs of the changes:  (+3 -2)

 GlobalOpt.cpp |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


Index: llvm/lib/Transforms/IPO/GlobalOpt.cpp
diff -u llvm/lib/Transforms/IPO/GlobalOpt.cpp:1.105.2.1 llvm/lib/Transforms/IPO/GlobalOpt.cpp:1.105.2.2
--- llvm/lib/Transforms/IPO/GlobalOpt.cpp:1.105.2.1	Fri May 18 01:02:03 2007
+++ llvm/lib/Transforms/IPO/GlobalOpt.cpp	Fri May 18 01:02:45 2007
@@ -623,9 +623,10 @@
       Loads.push_back(LI);
       Changed |= OptimizeAwayTrappingUsesOfValue(LI, LV);
     } else {
-      // If we get here we could have stores, loads, or phi nodes whose values
+      // If we get here we could have stores, selects, or phi nodes whose values
       // are loaded.
-      assert((isa<StoreInst>(*GUI) || isa<PHINode>(*GUI)) &&
+      assert((isa<StoreInst>(*GUI) || isa<PHINode>(*GUI) ||
+              isa<SelectInst>(*GUI)) &&
              "Only expect load and stores!");
     }