<div dir="ltr">Could we get this merged into 3.8?</div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Jan 22, 2016 at 10:00 PM, David Majnemer via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: majnemer<br>
Date: Sat Jan 23 00:00:44 2016<br>
New Revision: 258616<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=258616&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=258616&view=rev</a><br>
Log:<br>
[PruneEH] Don't try to insert a terminator after another terminator<br>
<br>
LLVM's BasicBlock has a single terminator, it is not valid to have two.<br>
<br>
Modified:<br>
    llvm/trunk/lib/Transforms/IPO/PruneEH.cpp<br>
    llvm/trunk/test/Transforms/PruneEH/pr26263.ll<br>
<br>
Modified: llvm/trunk/lib/Transforms/IPO/PruneEH.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/PruneEH.cpp?rev=258616&r1=258615&r2=258616&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/PruneEH.cpp?rev=258616&r1=258615&r2=258616&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Transforms/IPO/PruneEH.cpp (original)<br>
+++ llvm/trunk/lib/Transforms/IPO/PruneEH.cpp Sat Jan 23 00:00:44 2016<br>
@@ -252,7 +252,8 @@ void PruneEH::DeleteBasicBlock(BasicBloc<br>
   }<br>
<br>
   if (TokenInst) {<br>
-    changeToUnreachable(TokenInst->getNextNode(), /*UseLLVMTrap=*/false);<br>
+    if (!isa<TerminatorInst>(TokenInst))<br>
+      changeToUnreachable(TokenInst->getNextNode(), /*UseLLVMTrap=*/false);<br>
   } else {<br>
     // Get the list of successors of this block.<br>
     std::vector<BasicBlock *> Succs(succ_begin(BB), succ_end(BB));<br>
<br>
Modified: llvm/trunk/test/Transforms/PruneEH/pr26263.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PruneEH/pr26263.ll?rev=258616&r1=258615&r2=258616&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PruneEH/pr26263.ll?rev=258616&r1=258615&r2=258616&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/PruneEH/pr26263.ll (original)<br>
+++ llvm/trunk/test/Transforms/PruneEH/pr26263.ll Sat Jan 23 00:00:44 2016<br>
@@ -27,4 +27,30 @@ cleanupret:<br>
<br>
 ; CHECK: cleanupret from %[[cp]] unwind to caller<br>
<br>
+define void @test2() personality i32 (...)* @__CxxFrameHandler3 {<br>
+  invoke void @neverthrows()<br>
+          to label %try.cont unwind label %catchswitch<br>
+<br>
+try.cont:<br>
+  ret void<br>
+<br>
+catchswitch:<br>
+  %cs = catchswitch within none [label %catchpad] unwind to caller<br>
+<br>
+catchpad:<br>
+  %cp = catchpad within %cs []<br>
+  unreachable<br>
+<br>
+ret:<br>
+  ret void<br>
+}<br>
+<br>
+; CHECK-LABEL: define void @test2(<br>
+; CHECK: call void @neverthrows()<br>
+<br>
+; CHECK: %[[cs:.*]] = catchswitch within none [label<br>
+<br>
+; CHECK: catchpad within %[[cs]] []<br>
+; CHECK-NEXT: unreachable<br>
+<br>
 declare i32 @__CxxFrameHandler3(...)<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>