[PATCH] D59358: [CodeGenPrepare] avoid crashing from replacing a phi twice

[Jesper Antonsson via Phabricator via llvm-commits]

JesperAntonsson created this revision.
JesperAntonsson added reviewers: skatkov, aprantl.
Herald added a subscriber: jdoerfert.
Herald added a project: LLVM.

This is a fix to bug 41052:
https://bugs.llvm.org/show_bug.cgi?id=41052

While trying to optimize a memory instruction in a dead basic block, we end up registering the same phi for replacement twice. This patch avoids registering more than the first replacement candidate for a phi.


Repository:
  rL LLVM

https://reviews.llvm.org/D59358

Files:
  lib/CodeGen/CodeGenPrepare.cpp
  test/CodeGen/X86/codegen-prepare-replacephi.mir


Index: test/CodeGen/X86/codegen-prepare-replacephi.mir
===================================================================
--- /dev/null
+++ test/CodeGen/X86/codegen-prepare-replacephi.mir
@@ -0,0 +1,45 @@
+# RUN: llc -run-pass=codegenprepare -o - %s | FileCheck %s
+
+# This testcase without the accompanying fix triggers the assert
+# "Replacement PHI node is already replaced."
+
+--- |
+  define void @f1() {
+  entry:
+    %arrayidx = getelementptr inbounds [2 x i16], [2 x i16]* undef, i16 0, i16 2
+    %0 = bitcast i16* %arrayidx to i32*
+    %1 = bitcast [2 x i16]* undef to i32*
+    br label %for.cond
+
+  for.cond:
+    %2 = phi i32* [ %0, %entry ], [ %7, %cleanup ]
+    %3 = phi i32* [ %0, %entry ], [ %9, %cleanup ]
+    br label %for.body
+
+  for.body:
+    %4 = phi i32* [ %3, %for.cond ], [ %9, %cleanup ]
+    %5 = phi i32* [ %2, %for.cond ], [ %9, %cleanup ]
+    %6 = phi i32* [ %2, %for.cond ], [ %9, %cleanup ]
+    br i1 false, label %for.cond2, label %if.then
+
+  if.then:
+    store i32 undef, i32* %4, align 1
+    unreachable
+
+  for.cond2:
+    %7 = phi i32* [ %6, %for.body ], [ %7, %if.then5 ], [ %1, %for.cond2 ]
+    %8 = phi i32* [ %5, %for.body ], [ %8, %if.then5 ], [ %1, %for.cond2 ]
+    %9 = phi i32* [ %4, %for.body ], [ %8, %if.then5 ], [ %1, %for.cond2 ]
+    br i1 undef, label %for.cond2, label %if.then5
+
+  if.then5:
+    br i1 undef, label %cleanup, label %for.cond2
+
+  cleanup:
+    br i1 true, label %for.cond, label %for.body
+  }
+
+...
+
+# Sanity check to verify that something got through.
+# CHECK-LABEL: entry:
Index: lib/CodeGen/CodeGenPrepare.cpp
===================================================================
--- lib/CodeGen/CodeGenPrepare.cpp
+++ lib/CodeGen/CodeGenPrepare.cpp
@@ -3278,6 +3278,8 @@
                     PhiNodeSet &PhiNodesToMatch) {
     SmallVector<PHIPair, 8> WorkList;
     Matcher.insert({ PHI, Candidate });
+    SmallSet<PHINode *, 8> MatchedPHIs;
+    MatchedPHIs.insert(PHI);
     WorkList.push_back({ PHI, Candidate });
     SmallSet<PHIPair, 8> Visited;
     while (!WorkList.empty()) {
@@ -3310,8 +3312,10 @@
         if (Matcher.count({ FirstPhi, SecondPhi }))
           continue;
         // So the values are different and does not match. So we need them to
-        // match.
-        Matcher.insert({ FirstPhi, SecondPhi });
+        // match. (But we register no more than one match per PHI node, so that
+        // we won't later try to replace them twice.)
+        if (!MatchedPHIs.insert(FirstPhi).second)
+          Matcher.insert({ FirstPhi, SecondPhi });
         // But me must check it.
         WorkList.push_back({ FirstPhi, SecondPhi });
       }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D59358.190602.patch
Type: text/x-patch
Size: 2669 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190314/b82576c7/attachment.bin>