From: Alina Sbirlea <asbirlea@google.com>
Date: Thu, 5 Sep 2019 16:58:15 +0000 (+0000)
Subject: [MemorySSA] Verify MSSAUpdater exists.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87d9ec2a4021ad50b09e987a517e88a909dc18b5;p=llvm

[MemorySSA] Verify MSSAUpdater exists.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@371087 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Transforms/Utils/BasicBlockUtils.cpp b/lib/Transforms/Utils/BasicBlockUtils.cpp
index 45c0b026a47..d4c718df4a4 100644
--- a/lib/Transforms/Utils/BasicBlockUtils.cpp
+++ b/lib/Transforms/Utils/BasicBlockUtils.cpp
@@ -251,7 +251,8 @@ bool llvm::MergeBlockIntoPredecessor(BasicBlock *BB, DomTreeUpdater *DTU,
       for (auto &DVI : DbgValues) {
         auto R = DbgValueSet.insert({DVI->getVariable(), DVI->getExpression()});
         if (!R.second) {
-          MSSAU->removeMemoryAccess(DVI);
+          if (MSSAU)
+            MSSAU->removeMemoryAccess(DVI);
           DVI->eraseFromParent();
         }
       }