From: Bob Wilson <bob.wilson@apple.com>
Date: Thu, 10 Sep 2009 00:49:22 +0000 (+0000)
Subject: Revert r81171 which was causing pr4927.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2a16e6b22c558f9ba0b25096dfe0697488e51c8e;p=oota-llvm.git

Revert r81171 which was causing pr4927.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@81415 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/CodeGen/SelectionDAG/FastISel.cpp b/lib/CodeGen/SelectionDAG/FastISel.cpp
index 8550ea9813d..f0c70861843 100644
--- a/lib/CodeGen/SelectionDAG/FastISel.cpp
+++ b/lib/CodeGen/SelectionDAG/FastISel.cpp
@@ -615,25 +615,12 @@ FastISel::SelectFNeg(User *I) {
   unsigned OpReg = getRegForValue(BinaryOperator::getFNegArgument(I));
   if (OpReg == 0) return false;
 
-  // Bitcast the value to integer, twiddle the sign bit with xor,
-  // and then bitcast it back to floating-point.
+  // Twiddle the sign bit with xor.
   EVT VT = TLI.getValueType(I->getType());
   if (VT.getSizeInBits() > 64) return false;
-  EVT IntVT = EVT::getIntegerVT(I->getContext(), VT.getSizeInBits());
-
-  unsigned IntReg = FastEmit_r(VT.getSimpleVT(), IntVT.getSimpleVT(),
-                               ISD::BIT_CONVERT, OpReg);
-  if (IntReg == 0)
-    return false;
-
-  unsigned IntResultReg = FastEmit_ri_(IntVT.getSimpleVT(), ISD::XOR, IntReg,
-                                       UINT64_C(1) << (VT.getSizeInBits()-1),
-                                       IntVT.getSimpleVT());
-  if (IntResultReg == 0)
-    return false;
-
-  unsigned ResultReg = FastEmit_r(IntVT.getSimpleVT(), VT.getSimpleVT(),
-                                  ISD::BIT_CONVERT, IntResultReg);
+  unsigned ResultReg = FastEmit_ri_(VT.getSimpleVT(), ISD::XOR, OpReg,
+                                    UINT64_C(1) << (VT.getSizeInBits()-1),
+                                    VT.getSimpleVT());
   if (ResultReg == 0)
     return false;
 
diff --git a/test/CodeGen/X86/fast-isel-fneg.ll b/test/CodeGen/X86/fast-isel-fneg.ll
index 70191bdfdf1..15d4772927d 100644
--- a/test/CodeGen/X86/fast-isel-fneg.ll
+++ b/test/CodeGen/X86/fast-isel-fneg.ll
@@ -1,14 +1,14 @@
-; RUN: llc < %s -fast-isel -fast-isel-abort -march=x86-64 | FileCheck %s
+; RUN: llc < %s -fast-isel -march=x86-64 | FileCheck %s
 
 ; CHECK: doo:
-; CHECK: xor
+; CHECK: xorpd
 define double @doo(double %x) nounwind {
   %y = fsub double -0.0, %x
   ret double %y
 }
 
 ; CHECK: foo:
-; CHECK: xor
+; CHECK: xorps
 define float @foo(float %x) nounwind {
   %y = fsub float -0.0, %x
   ret float %y