[PATCH] D127947: [AST] Don't assert instruction reads/writes memory (PR51333)

[Nikita Popov via Phabricator via llvm-commits]

This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG560e694d48a6: [AST] Don't assert instruction reads/writes memory (PR51333) (authored by nikic).

Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D127947

Files:
  llvm/lib/Analysis/AliasSetTracker.cpp
  llvm/test/Transforms/LICM/pr51333.ll


Index: llvm/test/Transforms/LICM/pr51333.ll
===================================================================
--- /dev/null
+++ llvm/test/Transforms/LICM/pr51333.ll
@@ -0,0 +1,31 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
+; RUN: opt -S -passes='early-cse<memssa>,loop-mssa(licm)' < %s | FileCheck %s
+
+; This used to assert because was have a MemoryDef for what turns out to be
+; a readnone call after EarlyCSE.
+
+ at fn_ptr = external global void ()*, align 1
+
+define void @test() {
+; CHECK-LABEL: @test(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    br label [[DO_BODY:%.*]]
+; CHECK:       do.body:
+; CHECK-NEXT:    store void ()* @readnone_fn, void ()** @fn_ptr, align 8
+; CHECK-NEXT:    call void @readnone_fn()
+; CHECK-NEXT:    call void @foo()
+; CHECK-NEXT:    br label [[DO_BODY]]
+;
+entry:
+  br label %do.body
+
+do.body:
+  store void ()* @readnone_fn, void ()** @fn_ptr
+  %fn = load void ()*, void ()** @fn_ptr
+  call void %fn()
+  call void @foo()
+  br label %do.body
+}
+
+declare void @foo()
+declare void @readnone_fn() readnone
Index: llvm/lib/Analysis/AliasSetTracker.cpp
===================================================================
--- llvm/lib/Analysis/AliasSetTracker.cpp
+++ llvm/lib/Analysis/AliasSetTracker.cpp
@@ -233,8 +233,8 @@
   if (AliasAny)
     return true;
 
-  assert(Inst->mayReadOrWriteMemory() &&
-         "Instruction must either read or write memory.");
+  if (!Inst->mayReadOrWriteMemory())
+    return false;
 
   for (unsigned i = 0, e = UnknownInsts.size(); i != e; ++i) {
     if (auto *UnknownInst = getUnknownInst(i)) {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D127947.441694.patch
Type: text/x-patch
Size: 1618 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220701/5b95db7d/attachment.bin>