[llvm] r339609 - revert r339608 - [SimplifyLibCalls] don't drop fast-math-flags on trig reflection folds

[Sanjay Patel via llvm-commits]

Author: spatel
Date: Mon Aug 13 13:20:38 2018
New Revision: 339609

URL: http://llvm.org/viewvc/llvm-project?rev=339609&view=rev
Log:
revert r339608 - [SimplifyLibCalls] don't drop fast-math-flags on trig reflection folds

Can't set the builder flags without knowing this is an FPMathOperator. I'll add a test
for that and try again.

Modified:
    llvm/trunk/lib/Transforms/Utils/SimplifyLibCalls.cpp
    llvm/trunk/test/Transforms/InstCombine/cos-1.ll

Modified: llvm/trunk/lib/Transforms/Utils/SimplifyLibCalls.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/SimplifyLibCalls.cpp?rev=339609&r1=339608&r2=339609&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Utils/SimplifyLibCalls.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/SimplifyLibCalls.cpp Mon Aug 13 13:20:38 2018
@@ -1124,9 +1124,7 @@ Value *LibCallSimplifier::optimizeCAbs(C
 
 static Value *optimizeTrigReflections(CallInst *Call, LibFunc Func,
                                       IRBuilder<> &B) {
-  IRBuilder<>::FastMathFlagGuard Guard(B);
-  B.setFastMathFlags(Call->getFastMathFlags());
-  
+  // FIXME: This drops FMF.
   // TODO: Add tan() and other calls.
   // TODO: Can this be shared to also handle LLVM intrinsics?
   Value *X;

Modified: llvm/trunk/test/Transforms/InstCombine/cos-1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/cos-1.ll?rev=339609&r1=339608&r2=339609&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/cos-1.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/cos-1.ll Mon Aug 13 13:20:38 2018
@@ -40,7 +40,7 @@ define float @cosf_negated_arg(float %x)
 
 define float @cosf_negated_arg_FMF(float %x) {
 ; ANY-LABEL: @cosf_negated_arg_FMF(
-; ANY-NEXT:    [[COS:%.*]] = call reassoc nnan float @cosf(float [[X:%.*]])
+; ANY-NEXT:    [[COS:%.*]] = call float @cosf(float [[X:%.*]])
 ; ANY-NEXT:    ret float [[COS]]
 ;
   %neg = fsub float -0.0, %x
@@ -72,17 +72,6 @@ define float @sinf_negated_arg(float %x)
   ret float %r
 }
 
-define float @sinf_negated_arg_FMF(float %x) {
-; ANY-LABEL: @sinf_negated_arg_FMF(
-; ANY-NEXT:    [[SIN:%.*]] = call nnan afn float @sinf(float [[X:%.*]])
-; ANY-NEXT:    [[TMP1:%.*]] = fsub nnan afn float -0.000000e+00, [[SIN]]
-; ANY-NEXT:    ret float [[TMP1]]
-;
-  %neg = fsub ninf float -0.0, %x
-  %r = call afn nnan float @sinf(float %neg)
-  ret float %r
-}
-
 declare void @use(double)
 
 define double @sin_negated_arg_extra_use(double %x) {