Reland '[InstructionCombining] Fixed null check after dereferencing warning. NFCI.'

2019-11-03 20:34:54 +01:00 · 2019-11-03 20:34:54 +01:00 · 058b5028de
parent 5b37c018d5
commit 058b5028de
1 changed files with 5 additions and 2 deletions
--- a/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
@ -1724,8 +1724,11 @@ Instruction *InstCombiner::visitGetElementPtrInst(GetElementPtrInst &GEP) {

            // The first two arguments can vary for any GEP, the rest have to be
            // static for struct slots
-            if (J > 1 && CurTy->isStructTy())
-              return nullptr;
+            if (J > 1) {
+              assert(CurTy && "No current type?");
+              if (CurTy->isStructTy())
+                return nullptr;
+            }

            DI = J;
          } else {