<div dir="ltr">Could we get this merged into 3.8?<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Jan 22, 2016 at 9:41 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: Fri Jan 22 23:41:29 2016<br>
New Revision: 258611<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=258611&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=258611&view=rev</a><br>
Log:<br>
[PruneEH] FuncletPads must not have undef operands<br>
<br>
Instead of RAUW with undef, replace the first non-token instruction with<br>
unreachable.<br>
<br>
This fixes PR26263.<br>
<br>
Added:<br>
    llvm/trunk/test/Transforms/PruneEH/pr26263.ll<br>
Modified:<br>
    llvm/trunk/lib/Transforms/IPO/PruneEH.cpp<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=258611&r1=258610&r2=258611&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/PruneEH.cpp?rev=258611&r1=258610&r2=258611&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Transforms/IPO/PruneEH.cpp (original)<br>
+++ llvm/trunk/lib/Transforms/IPO/PruneEH.cpp Fri Jan 22 23:41:29 2016<br>
@@ -228,10 +228,17 @@ void PruneEH::DeleteBasicBlock(BasicBloc<br>
   assert(pred_empty(BB) && "BB is not dead!");<br>
   CallGraph &CG = getAnalysis<CallGraphWrapperPass>().getCallGraph();<br>
<br>
+  Instruction *TokenInst = nullptr;<br>
+<br>
   CallGraphNode *CGN = CG[BB->getParent()];<br>
   for (BasicBlock::iterator I = BB->end(), E = BB->begin(); I != E; ) {<br>
     --I;<br>
<br>
+    if (I->getType()->isTokenTy()) {<br>
+      TokenInst = &*I;<br>
+      break;<br>
+    }<br>
+<br>
     if (auto CS = CallSite (&*I)) {<br>
       const Function *Callee = CS.getCalledFunction();<br>
       if (!Callee || !Intrinsic::isLeaf(Callee->getIntrinsicID()))<br>
@@ -244,11 +251,15 @@ void PruneEH::DeleteBasicBlock(BasicBloc<br>
       I->replaceAllUsesWith(UndefValue::get(I->getType()));<br>
   }<br>
<br>
-  // Get the list of successors of this block.<br>
-  std::vector<BasicBlock*> Succs(succ_begin(BB), succ_end(BB));<br>
+  if (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>
-  for (unsigned i = 0, e = Succs.size(); i != e; ++i)<br>
-    Succs[i]->removePredecessor(BB);<br>
+    for (unsigned i = 0, e = Succs.size(); i != e; ++i)<br>
+      Succs[i]->removePredecessor(BB);<br>
<br>
-  BB->eraseFromParent();<br>
+    BB->eraseFromParent();<br>
+  }<br>
 }<br>
<br>
Added: 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=258611&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PruneEH/pr26263.ll?rev=258611&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/PruneEH/pr26263.ll (added)<br>
+++ llvm/trunk/test/Transforms/PruneEH/pr26263.ll Fri Jan 22 23:41:29 2016<br>
@@ -0,0 +1,30 @@<br>
+; RUN: opt -prune-eh -S < %s | FileCheck %s<br>
+target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32"<br>
+target triple = "i386-pc-windows-msvc"<br>
+<br>
+declare void @neverthrows() nounwind<br>
+<br>
+define void @test1() personality i32 (...)* @__CxxFrameHandler3 {<br>
+  invoke void @neverthrows()<br>
+          to label %try.cont unwind label %cleanuppad<br>
+<br>
+try.cont:<br>
+  ret void<br>
+<br>
+cleanuppad:<br>
+  %cp = cleanuppad within none []<br>
+  br label %cleanupret<br>
+<br>
+cleanupret:<br>
+  cleanupret from %cp unwind to caller<br>
+}<br>
+<br>
+; CHECK-LABEL: define void @test1(<br>
+; CHECK: call void @neverthrows()<br>
+<br>
+; CHECK: %[[cp:.*]] = cleanuppad within none []<br>
+; CHECK-NEXT: unreachable<br>
+<br>
+; CHECK: cleanupret from %[[cp]] unwind to caller<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>