[llvm] r357303 - [WebAssembly] Handle END_LOOP in unreachable BB in CFGStackify

[Heejin Ahn via llvm-commits]

Author: aheejin
Date: Fri Mar 29 12:36:51 2019
New Revision: 357303

URL: http://llvm.org/viewvc/llvm-project?rev=357303&view=rev
Log:
[WebAssembly] Handle END_LOOP in unreachable BB in CFGStackify

Summary:
This fixes crashes when a BB in which an END_LOOP is to be placed is
unreachable and does not have any predecessors. Fixes PR41307.

Reviewers: dschuff

Subscribers: yurydelendik, sbc100, jgravelle-google, sunfish, llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D60004

Added:
    llvm/trunk/test/CodeGen/WebAssembly/cfg-stackify-dbg.mir
Modified:
    llvm/trunk/lib/Target/WebAssembly/WebAssemblyCFGStackify.cpp

Modified: llvm/trunk/lib/Target/WebAssembly/WebAssemblyCFGStackify.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/WebAssembly/WebAssemblyCFGStackify.cpp?rev=357303&r1=357302&r2=357303&view=diff
==============================================================================
--- llvm/trunk/lib/Target/WebAssembly/WebAssemblyCFGStackify.cpp (original)
+++ llvm/trunk/lib/Target/WebAssembly/WebAssemblyCFGStackify.cpp Fri Mar 29 12:36:51 2019
@@ -411,7 +411,9 @@ void WebAssemblyCFGStackify::placeLoopMa
   // Mark the end of the loop (using arbitrary debug location that branched to
   // the loop end as its location).
   InsertPos = getEarliestInsertPos(AfterLoop, BeforeSet, AfterSet);
-  DebugLoc EndDL = (*AfterLoop->pred_rbegin())->findBranchDebugLoc();
+  DebugLoc EndDL = AfterLoop->pred_empty()
+                       ? DebugLoc()
+                       : (*AfterLoop->pred_rbegin())->findBranchDebugLoc();
   MachineInstr *End =
       BuildMI(*AfterLoop, InsertPos, EndDL, TII.get(WebAssembly::END_LOOP));
   registerScope(Begin, End);

Added: llvm/trunk/test/CodeGen/WebAssembly/cfg-stackify-dbg.mir
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/WebAssembly/cfg-stackify-dbg.mir?rev=357303&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/WebAssembly/cfg-stackify-dbg.mir (added)
+++ llvm/trunk/test/CodeGen/WebAssembly/cfg-stackify-dbg.mir Fri Mar 29 12:36:51 2019
@@ -0,0 +1,27 @@
+# RUN: llc -mtriple=wasm32-unknown-unknown -run-pass wasm-cfg-stackify %s -o - | FileCheck %s
+
+# This tests if END_LOOP marker is placed correctly when the BB it is to be
+# placed is unreachable. Regression test for PR41307.
+
+# CHECK-LABEL: unreachable_test
+name: unreachable_test
+liveins:
+  - { reg: '$arguments' }
+body: |
+  bb.0:
+    successors: %bb.1
+
+  bb.1:
+  ; predecessors: %bb.0, %bb.2
+    successors: %bb.2
+
+  bb.2:
+  ; predecessors: %bb.1
+    successors: %bb.1
+    BR %bb.1, implicit-def dead $arguments
+
+  ; CHECK: bb.3
+  ; CHECK: END_LOOP
+  bb.3:
+    UNREACHABLE implicit-def $arguments
+...