Merge from mainline.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_20@37214 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 3 insertions, 2 deletions

diff --git a/lib/Transforms/IPO/GlobalOpt.cpp b/lib/Transforms/IPO/GlobalOpt.cpp
index 56f6390ea4b5..516ba4363ee5 100644
--- a/lib/Transforms/IPO/GlobalOpt.cpp
+++ b/lib/Transforms/IPO/GlobalOpt.cpp
@@ -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!");
     }