[PATCH] D61164: [X86] If PreprocessISelDAG reorders a load before a call, make sure we remove dead nodes from the graph

[Craig Topper via Phabricator via llvm-commits]

craig.topper updated this revision to Diff 197179.
craig.topper added a comment.

Remove dead nodes unconditionally


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

https://reviews.llvm.org/D61164

Files:
  llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
  llvm/test/CodeGen/X86/fold-call-3.ll


Index: llvm/test/CodeGen/X86/fold-call-3.ll
===================================================================
--- llvm/test/CodeGen/X86/fold-call-3.ll
+++ llvm/test/CodeGen/X86/fold-call-3.ll
@@ -1,5 +1,7 @@
 ; RUN: llc < %s -mtriple=x86_64-apple-darwin | grep call | grep 560
 ; rdar://6522427
+; This command line used to crash due to dangling nodes left after PreprocessISelDAG
+; RUN: llc < %s -mtriple=x86_64-apple-darwin -pre-RA-sched=linearize
 
 	%"struct.clang::Action" = type { %"struct.clang::ActionBase" }
 	%"struct.clang::ActionBase" = type { i32 (...)** }
Index: llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
===================================================================
--- llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
+++ llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
@@ -907,6 +907,11 @@
     ++I;
     CurDAG->DeleteNode(N);
   }
+
+  // The load+call transform above can leave some dead nodes in the graph. Make
+  // sure we remove them. Its possible some of the other transforms do to so
+  // just remove dead nodes unconditionally.
+  CurDAG->RemoveDeadNodes();
 }
 
 // Look for a redundant movzx/movsx that can occur after an 8-bit divrem.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D61164.197179.patch
Type: text/x-patch
Size: 1157 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190429/afeee2c9/attachment.bin>