[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 -> 1.105.2.1
---
Log message:

Merge from mainline.


---
Diffs of the changes:  (+4 -1)

 GlobalOpt.cpp |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)


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