Commit a5bea192 authored by Tanya Lattner's avatar Tanya Lattner
Browse files

Merge from mainline. 

llvm-svn: 37214
parent 28c87da1

llvm/lib/Transforms/IPO/GlobalOpt.cpp

+3 −2
Original line number Diff line number Diff line
@@ -623,9 +623,10 @@ static bool OptimizeAwayTrappingUsesOfLoads(GlobalVariable *GV, Constant *LV) { 
      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!");

    }