diff options
| author | Chris Lattner <sabre@nondot.org> | 2008-05-01 07:26:11 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2008-05-01 07:26:11 +0000 |
| commit | d4b2a67cf3aba4d340654a6d6fdcaa9af8549527 (patch) | |
| tree | c07bfad7316ea91f2b206f9d2763973f644cf94b /llvm | |
| parent | bb41aab4267c21bd74bad06b453703fefeb37b51 (diff) | |
| download | bcm5719-llvm-d4b2a67cf3aba4d340654a6d6fdcaa9af8549527.tar.gz bcm5719-llvm-d4b2a67cf3aba4d340654a6d6fdcaa9af8549527.zip | |
don't randomly miscompile seto/setuo just because we are in
ffastmath mode. This fixes rdar://5902801, a miscompilation
of gcc.dg/builtins-8.c.
Bill, please pull this into Tak.
llvm-svn: 50523
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | 8 | ||||
| -rw-r--r-- | llvm/test/CodeGen/X86/2008-05-01-InvalidOrdCompare.ll | 15 |
2 files changed, 19 insertions, 4 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp index c5911e5d660..00390768c2e 100644 --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp @@ -1272,8 +1272,8 @@ void SelectionDAGLowering::FindMergedConditions(Value *Cond, case FCmpInst::FCMP_OLT: FOC = ISD::SETLT; FPC = ISD::SETOLT; break; case FCmpInst::FCMP_OLE: FOC = ISD::SETLE; FPC = ISD::SETOLE; break; case FCmpInst::FCMP_ONE: FOC = ISD::SETNE; FPC = ISD::SETONE; break; - case FCmpInst::FCMP_ORD: FOC = ISD::SETEQ; FPC = ISD::SETO; break; - case FCmpInst::FCMP_UNO: FOC = ISD::SETNE; FPC = ISD::SETUO; break; + case FCmpInst::FCMP_ORD: FOC = FPC = ISD::SETO; break; + case FCmpInst::FCMP_UNO: FOC = FPC = ISD::SETUO; break; case FCmpInst::FCMP_UEQ: FOC = ISD::SETEQ; FPC = ISD::SETUEQ; break; case FCmpInst::FCMP_UGT: FOC = ISD::SETGT; FPC = ISD::SETUGT; break; case FCmpInst::FCMP_UGE: FOC = ISD::SETGE; FPC = ISD::SETUGE; break; @@ -2317,8 +2317,8 @@ void SelectionDAGLowering::visitFCmp(User &I) { case FCmpInst::FCMP_OLT: FOC = ISD::SETLT; FPC = ISD::SETOLT; break; case FCmpInst::FCMP_OLE: FOC = ISD::SETLE; FPC = ISD::SETOLE; break; case FCmpInst::FCMP_ONE: FOC = ISD::SETNE; FPC = ISD::SETONE; break; - case FCmpInst::FCMP_ORD: FOC = ISD::SETEQ; FPC = ISD::SETO; break; - case FCmpInst::FCMP_UNO: FOC = ISD::SETNE; FPC = ISD::SETUO; break; + case FCmpInst::FCMP_ORD: FOC = ISD::SETO; break; + case FCmpInst::FCMP_UNO: FOC = ISD::SETUO; break; case FCmpInst::FCMP_UEQ: FOC = ISD::SETEQ; FPC = ISD::SETUEQ; break; case FCmpInst::FCMP_UGT: FOC = ISD::SETGT; FPC = ISD::SETUGT; break; case FCmpInst::FCMP_UGE: FOC = ISD::SETGE; FPC = ISD::SETUGE; break; diff --git a/llvm/test/CodeGen/X86/2008-05-01-InvalidOrdCompare.ll b/llvm/test/CodeGen/X86/2008-05-01-InvalidOrdCompare.ll new file mode 100644 index 00000000000..dae3b83b1af --- /dev/null +++ b/llvm/test/CodeGen/X86/2008-05-01-InvalidOrdCompare.ll @@ -0,0 +1,15 @@ +; RUN: llvm-as < %s | llc -enable-unsafe-fp-math | grep jnp +; rdar://5902801 + +declare void @test2() + +define i32 @test(double %p) nounwind { + %tmp5 = fcmp uno double %p, 0.000000e+00 + br i1 %tmp5, label %bb, label %UnifiedReturnBlock +bb: + call void @test2() + ret i32 17 +UnifiedReturnBlock: + ret i32 42 +} + |
