[MemorySSA] Rename all phi entries.

When renaming Phis incoming values, there may be multiple edges incoming
from the same block (switch). Rename all.

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

diff --git a/lib/Analysis/MemorySSA.cpp b/lib/Analysis/MemorySSA.cpp
index 91b2f1d03a1465c0b466412494b360f1e76c46bf..ac95017af17c53120d3ac644c070f9f5147a5b41 100644 (file)
--- a/lib/Analysis/MemorySSA.cpp
+++ b/lib/Analysis/MemorySSA.cpp
@@ -1088,9 +1088,14 @@ void MemorySSA::renameSuccessorPhis(BasicBlock *BB, MemoryAccess *IncomingVal,
     AccessList *Accesses = It->second.get();
     auto *Phi = cast<MemoryPhi>(&Accesses->front());
     if (RenameAllUses) {
-      int PhiIndex = Phi->getBasicBlockIndex(BB);
-      assert(PhiIndex != -1 && "Incomplete phi during partial rename");
-      Phi->setIncomingValue(PhiIndex, IncomingVal);
+      bool ReplacementDone = false;
+      for (unsigned I = 0, E = Phi->getNumIncomingValues(); I != E; ++I)
+        if (Phi->getIncomingBlock(I) == BB) {
+          Phi->setIncomingValue(I, IncomingVal);
+          ReplacementDone = true;
+        }
+      (void) ReplacementDone;
+      assert(ReplacementDone && "Incomplete phi during partial rename");
     } else
       Phi->addIncoming(IncomingVal, BB);
   }

diff --git a/test/Analysis/MemorySSA/renamephis.ll b/test/Analysis/MemorySSA/renamephis.ll
new file mode 100644 (file)
index 0000000..7d240d8
--- /dev/null
+++ b/test/Analysis/MemorySSA/renamephis.ll
@@ -0,0 +1,51 @@
+; RUN: opt -licm -enable-mssa-loop-dependency -verify-memoryssa -S %s | FileCheck %s
+; REQUIRES: asserts
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+@0 = external global { { [86 x i8]*, i32, i32 }, { i16, i16, [20 x i8] }*, i8, i8 }
+
+declare void @g()
+
+; Function Attrs: argmemonly nounwind willreturn
+declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture) #0
+
+; CHECK-LABEL: @f
+define void @f() align 2 {
+entry:
+  %P = alloca i32*, align 8
+  br label %cond.end.i.i.i.i
+
+cond.end.i.i.i.i:                                 ; preds = %cont20, %entry
+  br i1 undef, label %cont20, label %if.end
+
+cont20:                                           ; preds = %cond.end.i.i.i.i, %cond.end.i.i.i.i, %cond.end.i.i.i.i
+  store i32* undef, i32** %P, align 8
+  br label %cond.end.i.i.i.i
+
+if.end:                                           ; preds = %cond.end.i.i.i.i
+  br i1 undef, label %cond.exit, label %handler.type_mismatch2.i
+
+handler.type_mismatch2.i:                         ; preds = %if.end
+  tail call void @g()
+  unreachable
+
+cond.exit:             ; preds = %if.end
+  switch i8 undef, label %block.exit [
+    i8 81, label %sw.bb94
+    i8 12, label %cleanup
+    i8 74, label %cleanup
+  ]
+
+block.exit: ; preds = %cond.exit
+  unreachable
+
+sw.bb94:                                          ; preds = %cond.exit
+  call void @llvm.lifetime.end.p0i8(i64 8, i8* nonnull undef)
+  br label %cleanup
+
+cleanup:                                          ; preds = %sw.bb94, %cond.exit, %cond.exit
+  ret void
+}
+
+attributes #0 = { argmemonly nounwind willreturn }