<div dir="ltr"><div>Hi Hans,</div><div><br></div>I think r228760 and r<span style="font-size:12.8000001907349px">228761</span> should get merged into 3.6</div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Feb 10, 2015 at 3:09 PM, David Majnemer <span dir="ltr"><<a href="mailto:david.majnemer@gmail.com" target="_blank">david.majnemer@gmail.com</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: Tue Feb 10 17:09:43 2015<br>
New Revision: 228760<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=228760&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=228760&view=rev</a><br>
Log:<br>
EarlyCSE: It isn't safe to CSE across synchronization boundaries<br>
<br>
This fixes PR22514.<br>
<br>
Modified:<br>
    llvm/trunk/lib/Transforms/Scalar/EarlyCSE.cpp<br>
    llvm/trunk/test/Transforms/EarlyCSE/basic.ll<br>
<br>
Modified: llvm/trunk/lib/Transforms/Scalar/EarlyCSE.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/EarlyCSE.cpp?rev=228760&r1=228759&r2=228760&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/EarlyCSE.cpp?rev=228760&r1=228759&r2=228760&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Transforms/Scalar/EarlyCSE.cpp (original)<br>
+++ llvm/trunk/lib/Transforms/Scalar/EarlyCSE.cpp Tue Feb 10 17:09:43 2015<br>
@@ -527,6 +527,9 @@ bool EarlyCSE::processNode(DomTreeNode *<br>
       // Ignore volatile loads.<br>
       if (MemInst.isVolatile()) {<br>
         LastStore = nullptr;<br>
+        // Don't CSE across synchronization boundaries.<br>
+        if (Inst->mayWriteToMemory())<br>
+          ++CurrentGeneration;<br>
         continue;<br>
       }<br>
<br>
<br>
Modified: llvm/trunk/test/Transforms/EarlyCSE/basic.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/EarlyCSE/basic.ll?rev=228760&r1=228759&r2=228760&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/EarlyCSE/basic.ll?rev=228760&r1=228759&r2=228760&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/EarlyCSE/basic.ll (original)<br>
+++ llvm/trunk/test/Transforms/EarlyCSE/basic.ll Tue Feb 10 17:09:43 2015<br>
@@ -193,4 +193,10 @@ define void @test11(i32 *%P) {<br>
   ; CHECK-NEXT: ret void<br>
 }<br>
<br>
-<br>
+define i32 @test12(i1 %B, i32* %P1, i32* %P2) {<br>
+  %load0 = load i32* %P1<br>
+  %1 = load atomic i32* %P2 seq_cst, align 4<br>
+  %load1 = load i32* %P1<br>
+  %sel = select i1 %B, i32 %load0, i32 %load1<br>
+  ret i32 %sel<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></div>