[PATCH] D67562: [MemorySSA] Update MSSA for non-conventional AA.

[Alina Sbirlea via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
asbirlea marked an inline comment as done.
Closed by commit rL372137: [MemorySSA] Update MSSA for non-conventional AA. (authored by asbirlea, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D67562?vs=220381&id=220522#toc

Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D67562/new/

https://reviews.llvm.org/D67562

Files:
  llvm/trunk/lib/Analysis/MemorySSA.cpp
  llvm/trunk/test/Analysis/MemorySSA/loop-rotate-disablebasicaa.ll


Index: llvm/trunk/lib/Analysis/MemorySSA.cpp
===================================================================
--- llvm/trunk/lib/Analysis/MemorySSA.cpp
+++ llvm/trunk/lib/Analysis/MemorySSA.cpp
@@ -1736,9 +1736,15 @@
   // FIXME: Replace this special casing with a more accurate modelling of
   // assume's control dependency.
   if (IntrinsicInst *II = dyn_cast<IntrinsicInst>(I))
-    if (II->getIntrinsicID() == Intrinsic::assume || isa<DbgInfoIntrinsic>(II))
+    if (II->getIntrinsicID() == Intrinsic::assume)
       return nullptr;
 
+  // Using a nonstandard AA pipelines might leave us with unexpected modref
+  // results for I, so add a check to not model instructions that may not read
+  // from or write to memory. This is necessary for correctness.
+  if (!I->mayReadFromMemory() && !I->mayWriteToMemory())
+    return nullptr;
+
   bool Def, Use;
   if (Template) {
     Def = dyn_cast_or_null<MemoryDef>(Template) != nullptr;
Index: llvm/trunk/test/Analysis/MemorySSA/loop-rotate-disablebasicaa.ll
===================================================================
--- llvm/trunk/test/Analysis/MemorySSA/loop-rotate-disablebasicaa.ll
+++ llvm/trunk/test/Analysis/MemorySSA/loop-rotate-disablebasicaa.ll
@@ -0,0 +1,26 @@
+; RUN: opt -disable-basicaa -print-memoryssa -disable-output %s 2>&1 | FileCheck %s
+
+; Note: if @foo is modelled as a MemoryDef, this test will assert with -loop-rotate, due to MemorySSA not
+; being preserved when moving instructions that may not read from or write to memory.
+
+; CHECK-LABEL: @main
+; CHECK-NOT: MemoryDef
+define void @main() {
+entry:
+  br label %for.cond120
+
+for.cond120:                                      ; preds = %for.body127, %entry
+  call void @foo()
+  br i1 undef, label %for.body127, label %for.cond.cleanup126
+
+for.cond.cleanup126:                              ; preds = %for.cond120
+  unreachable
+
+for.body127:                                      ; preds = %for.cond120
+  %0 = load i16**, i16*** undef, align 1
+  br label %for.cond120
+}
+
+declare void @foo() readnone
+
+


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D67562.220522.patch
Type: text/x-patch
Size: 2065 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190917/ab1cf627/attachment.bin>