<div dir="ltr">Nevermind, saw the followup in the other thread. :)<div><br></div><div style>-eric</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Jan 3, 2013 at 8:14 AM, Eric Christopher <span dir="ltr"><<a href="mailto:echristo@gmail.com" target="_blank">echristo@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div>Was this with a bootstrap build or something? How'd it break <span style="font-family:arial,sans-serif;font-size:13.333333015441895px">FixIt/fixit-errors.c?</span></div>
<span class="HOEnZb"><font color="#888888"><div><span style="font-family:arial,sans-serif;font-size:13.333333015441895px"><br>
</span></div><div>-eric</div></font></span></div><div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Jan 3, 2013 at 12:18 AM, Michael Gottesman <span dir="ltr"><<a href="mailto:mgottesman@apple.com" target="_blank">mgottesman@apple.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: mgottesman<br>
Date: Thu Jan 3 02:18:30 2013<br>
New Revision: 171466<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=171466&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=171466&view=rev</a><br>
Log:<br>
Revert "Mark DIV/IDIV instructions hasSideEffects=1 because they can trap when dividing by 0. This is needed to keep early if conversion from moving them across basic blocks."<br>
<br>
This reverts commit r171461 since it breaks the following tests:<br>
<br>
Clang :: Analysis/outofbound-notwork.c<br>
Clang :: Analysis/string-fail.c<br>
Clang :: CXX/basic/basic.lookup/basic.lookup.qual/p6-0x.cpp<br>
Clang :: CXX/basic/basic.lookup/basic.lookup.unqual/p15.cpp<br>
Clang :: CXX/dcl.dcl/dcl.spec/dcl.fct.spec/p4.cpp<br>
Clang :: CXX/dcl.dcl/dcl.spec/dcl.stc/p10.cpp<br>
Clang :: CXX/temp/temp.param/p14.cpp<br>
Clang :: CXX/temp/temp.res/temp.dep.res/temp.point/p1.cpp<br>
Clang :: CodeGen/2009-02-13-zerosize-union-field-ppc.c<br>
Clang :: CodeGen/blocks-2.c<br>
Clang :: CodeGen/libcalls-d.c<br>
Clang :: CodeGen/libcalls-ld.c<br>
Clang :: CodeGenCXX/conversion-function.cpp<br>
Clang :: CodeGenCXX/debug-info-limit-type.cpp<br>
Clang :: CodeGenCXX/inheriting-constructor.cpp<br>
Clang :: FixIt/fixit-errors.c<br>
Clang :: FixIt/fixit-pmem.cpp<br>
Clang :: Modules/namespaces.cpp<br>
Clang :: PCH/changed-files.c<br>
Clang :: PCH/pr4489.c<br>
Clang :: PCH/source-manager-stack.c<br>
Clang :: Parser/cxx-ambig-decl-expr-xfail.cpp<br>
Clang :: SemaCXX/switch-implicit-fallthrough-cxx98.cpp<br>
Clang :: SemaTemplate/<a href="http://instantiate-function-1.mm" target="_blank">instantiate-function-1.mm</a><br>
<br>
Modified:<br>
llvm/trunk/lib/Target/X86/X86InstrArithmetic.td<br>
llvm/trunk/test/CodeGen/X86/early-ifcvt.ll<br>
<br>
Modified: llvm/trunk/lib/Target/X86/X86InstrArithmetic.td<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrArithmetic.td?rev=171466&r1=171465&r2=171466&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrArithmetic.td?rev=171466&r1=171465&r2=171466&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Target/X86/X86InstrArithmetic.td (original)<br>
+++ llvm/trunk/lib/Target/X86/X86InstrArithmetic.td Thu Jan 3 02:18:30 2013<br>
@@ -266,7 +266,7 @@<br>
<br>
<br>
// unsigned division/remainder<br>
-let hasSideEffects = 1 in { // so that we don't speculatively execute<br>
+let hasSideEffects = 0 in {<br>
let Defs = [AL,EFLAGS,AX], Uses = [AX] in<br>
def DIV8r : I<0xF6, MRM6r, (outs), (ins GR8:$src), // AX/r8 = AL,AH<br>
"div{b}\t$src", [], IIC_DIV8_REG>;<br>
<br>
Modified: llvm/trunk/test/CodeGen/X86/early-ifcvt.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/early-ifcvt.ll?rev=171466&r1=171465&r2=171466&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/early-ifcvt.ll?rev=171466&r1=171465&r2=171466&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/X86/early-ifcvt.ll (original)<br>
+++ llvm/trunk/test/CodeGen/X86/early-ifcvt.ll Thu Jan 3 02:18:30 2013<br>
@@ -142,35 +142,3 @@<br>
}<br>
<br>
declare void @BZ2_bz__AssertH__fail()<br>
-<br>
-<br>
-; Make sure we don't speculate on div/idiv instructions<br>
-; CHECK: test_idiv<br>
-; CHECK-NOT: cmov<br>
-define i32 @test_idiv(i32 %a, i32 %b) nounwind uwtable readnone ssp {<br>
- %1 = icmp eq i32 %b, 0<br>
- br i1 %1, label %4, label %2<br>
-<br>
-; <label>:2 ; preds = %0<br>
- %3 = sdiv i32 %a, %b<br>
- br label %4<br>
-<br>
-; <label>:4 ; preds = %0, %2<br>
- %5 = phi i32 [ %3, %2 ], [ %a, %0 ]<br>
- ret i32 %5<br>
-}<br>
-<br>
-; CHECK: test_div<br>
-; CHECK-NOT: cmov<br>
-define i32 @test_div(i32 %a, i32 %b) nounwind uwtable readnone ssp {<br>
- %1 = icmp eq i32 %b, 0<br>
- br i1 %1, label %4, label %2<br>
-<br>
-; <label>:2 ; preds = %0<br>
- %3 = udiv i32 %a, %b<br>
- br label %4<br>
-<br>
-; <label>:4 ; preds = %0, %2<br>
- %5 = phi i32 [ %3, %2 ], [ %a, %0 ]<br>
- ret i32 %5<br>
-}<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">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>
</div></div></blockquote></div><br></div>