On 25 September 2012 14:15, Nick Lewycky <span dir="ltr"><<a href="mailto:nicholas@mxc.ca" target="_blank">nicholas@mxc.ca</a>></span> wrote:<br><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">

Author: nicholas<br>
Date: Tue Sep 25 16:15:50 2012<br>
New Revision: 164634<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=164634&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=164634&view=rev</a><br>
Log:<br>
Don't try to promote the same alloca twice. Fixes PR13916!<br>
<br>
Chandler, it's not obvious that it's okay that this alloca gets into the list<br>
twice to begin with. Please review and see whether this is the fix you really<br>
want, but I wanted to get a fix checked in quickly.<br>
<br>
Modified:<br>
    llvm/trunk/lib/Transforms/Scalar/SROA.cpp<br>
    llvm/trunk/test/Transforms/SROA/basictest.ll<br>
<br>
Modified: llvm/trunk/lib/Transforms/Scalar/SROA.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/SROA.cpp?rev=164634&r1=164633&r2=164634&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/SROA.cpp?rev=164634&r1=164633&r2=164634&view=diff</a><br>


==============================================================================<br>
--- llvm/trunk/lib/Transforms/Scalar/SROA.cpp (original)<br>
+++ llvm/trunk/lib/Transforms/Scalar/SROA.cpp Tue Sep 25 16:15:50 2012<br>
@@ -3108,6 +3108,12 @@<br>
   if (PromotableAllocas.empty())<br>
     return false;<br>
<br>
+  // Ensure that the list is unique.<br>
+  std::sort(PromotableAllocas.begin(), PromotableAllocas.end());<br>
+  PromotableAllocas.erase(std::unique(PromotableAllocas.begin(),<br>
+                                      PromotableAllocas.end()),<br>
+                          PromotableAllocas.end());<br></blockquote><div><br></div><div>In self-review, I note that sorting the list of AllocaInst* causes us to have an undefined order of creating PHI node instructions.</div>

<div><br></div><div>I'm already working on a fix. Sorry for the trouble.</div><div><br></div><div>Nick</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">


+<br>
   NumPromoted += PromotableAllocas.size();<br>
<br>
   if (DT && !ForceSSAUpdater) {<br>
<br>
Modified: llvm/trunk/test/Transforms/SROA/basictest.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SROA/basictest.ll?rev=164634&r1=164633&r2=164634&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SROA/basictest.ll?rev=164634&r1=164633&r2=164634&view=diff</a><br>


==============================================================================<br>
--- llvm/trunk/test/Transforms/SROA/basictest.ll (original)<br>
+++ llvm/trunk/test/Transforms/SROA/basictest.ll Tue Sep 25 16:15:50 2012<br>
@@ -855,3 +855,25 @@<br>
   %result = or i8 %load, %load2<br>
   ret i8 %result<br>
 }<br>
+<br>
+%test22.struct = type { i8 }<br>
+<br>
+define void @test22() {<br>
+; CHECK: @test22<br>
+; CHECK-NOT: alloca<br>
+; CHECK: ret void<br>
+; PR13916<br>
+entry:<br>
+  %A = alloca %test22.struct<br>
+  br i1 undef, label %if.then, label %if.end<br>
+<br>
+if.then:                                          ; preds = %entry<br>
+  %tmp = bitcast %test22.struct* %A to i8*<br>
+  %tmp1 = bitcast %test22.struct* %A to i8*<br>
+  call void @llvm.memcpy.p0i8.p0i8.i32(i8* %tmp, i8* %tmp1, i32 1, i32 1, i1 false)<br>
+  unreachable<br>
+<br>
+if.end:                                           ; preds = %entry<br>
+  %tmp2 = load %test22.struct* %A<br>
+  ret void<br>
+}<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br>