From ca514a41ea91c14b02bcb95691ae6c8c36f50706 Mon Sep 17 00:00:00 2001
From: Andrea Di Biagio <Andrea_DiBiagio@sn.scee.net>
Date: Tue, 2 Sep 2014 17:22:49 +0000
Subject: [PATCH] Revert: [APFloat] Fixed a bug in method 'fusedMultiplyAdd'.

This reverts revision 216913; the new test added at revision 216913
caused regression failures on a couple of buildbots.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@216914 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Support/APFloat.cpp                       |   2 +-
 .../InstSimplify/fold-builtin-fma.ll          | 119 ------------------
 2 files changed, 1 insertion(+), 120 deletions(-)
 delete mode 100644 test/Transforms/InstSimplify/fold-builtin-fma.ll

diff --git a/lib/Support/APFloat.cpp b/lib/Support/APFloat.cpp
index ab641fdbe79..7989e30afae 100644
--- a/lib/Support/APFloat.cpp
+++ b/lib/Support/APFloat.cpp
@@ -1801,7 +1801,7 @@ APFloat::fusedMultiplyAdd(const APFloat &multiplicand,
      extended-precision calculation.  */
   if (isFiniteNonZero() &&
       multiplicand.isFiniteNonZero() &&
-      addend.isFinite()) {
+      addend.isFiniteNonZero()) {
     lostFraction lost_fraction;
 
     lost_fraction = multiplySignificand(multiplicand, &addend);
diff --git a/test/Transforms/InstSimplify/fold-builtin-fma.ll b/test/Transforms/InstSimplify/fold-builtin-fma.ll
deleted file mode 100644
index 6331b8c2dd4..00000000000
--- a/test/Transforms/InstSimplify/fold-builtin-fma.ll
+++ /dev/null
@@ -1,119 +0,0 @@
-; RUN: opt -instsimplify -S < %s | FileCheck %s
-
-; Fixes PR20832
-; Make sure that we correctly fold a fused multiply-add where operands
-; are all finite constants and addend is zero.
-
-declare double @llvm.fma.f64(double, double, double)
-
-
-define double @PR20832()  {
-  %1 = call double @llvm.fma.f64(double 7.0, double 8.0, double 0.0)
-  ret double %1
-}
-; CHECK-LABEL: @PR20832(
-; CHECK: ret double 5.600000e+01
-
-; Test builtin fma with all finite non-zero constants.
-define double @test_all_finite()  {
-  %1 = call double @llvm.fma.f64(double 7.0, double 8.0, double 5.0)
-  ret double %1
-}
-; CHECK-LABEL: @test_all_finite(
-; CHECK: ret double 6.100000e+01
-
-; Test builtin fma with a +/-NaN addend.
-define double @test_NaN_addend()  {
-  %1 = call double @llvm.fma.f64(double 7.0, double 8.0, double 0x7FF8000000000000)
-  ret double %1
-}
-; CHECK-LABEL: @test_NaN_addend(
-; CHECK: ret double 0x7FF8000000000000
-
-define double @test_NaN_addend_2()  {
-  %1 = call double @llvm.fma.f64(double 7.0, double 8.0, double 0xFFF8000000000000)
-  ret double %1
-}
-; CHECK-LABEL: @test_NaN_addend_2(
-; CHECK: ret double 0xFFF8000000000000
-
-; Test builtin fma with a +/-Inf addend.
-define double @test_Inf_addend()  {
-  %1 = call double @llvm.fma.f64(double 7.0, double 8.0, double 0x7FF0000000000000)
-  ret double %1
-}
-; CHECK-LABEL: @test_Inf_addend(
-; CHECK: ret double 0x7FF0000000000000
-
-define double @test_Inf_addend_2()  {
-  %1 = call double @llvm.fma.f64(double 7.0, double 8.0, double 0xFFF0000000000000)
-  ret double %1
-}
-; CHECK-LABEL: @test_Inf_addend_2(
-; CHECK: ret double 0xFFF0000000000000
-
-; Test builtin fma with one of the operands to the multiply being +/-NaN.
-define double @test_NaN_1()  {
-  %1 = call double @llvm.fma.f64(double 0x7FF8000000000000, double 8.0, double 0.0)
-  ret double %1
-}
-; CHECK-LABEL: @test_NaN_1(
-; CHECK: ret double 0x7FF8000000000000
-
-
-define double @test_NaN_2()  {
-  %1 = call double @llvm.fma.f64(double 7.0, double 0x7FF8000000000000, double 0.0)
-  ret double %1
-}
-; CHECK-LABEL: @test_NaN_2(
-; CHECK: ret double 0x7FF8000000000000
-
-
-define double @test_NaN_3()  {
-  %1 = call double @llvm.fma.f64(double 0xFFF8000000000000, double 8.0, double 0.0)
-  ret double %1
-}
-; CHECK-LABEL: @test_NaN_3(
-; CHECK: ret double 0x7FF8000000000000
-
-
-define double @test_NaN_4()  {
-  %1 = call double @llvm.fma.f64(double 7.0, double 0xFFF8000000000000, double 0.0)
-  ret double %1
-}
-; CHECK-LABEL: @test_NaN_4(
-; CHECK: ret double 0x7FF8000000000000
-
-
-; Test builtin fma with one of the operands to the multiply being +/-Inf.
-define double @test_Inf_1()  {
-  %1 = call double @llvm.fma.f64(double 0x7FF0000000000000, double 8.0, double 0.0)
-  ret double %1
-}
-; CHECK-LABEL: @test_Inf_1(
-; CHECK: ret double 0x7FF0000000000000
-
-
-define double @test_Inf_2()  {
-  %1 = call double @llvm.fma.f64(double 7.0, double 0x7FF0000000000000, double 0.0)
-  ret double %1
-}
-; CHECK-LABEL: @test_Inf_2(
-; CHECK: ret double 0x7FF0000000000000
-
-
-define double @test_Inf_3()  {
-  %1 = call double @llvm.fma.f64(double 0xFFF0000000000000, double 8.0, double 0.0)
-  ret double %1
-}
-; CHECK-LABEL: @test_Inf_3(
-; CHECK: ret double 0xFFF0000000000000
-
-
-define double @test_Inf_4()  {
-  %1 = call double @llvm.fma.f64(double 7.0, double 0xFFF0000000000000, double 0.0)
-  ret double %1
-}
-; CHECK-LABEL: @test_Inf_4(
-; CHECK: ret double 0xFFF0000000000000
-