[Reassoc] Small fix to support unary FNeg in NegateValue(...)

Differential Revision: https://reviews.llvm.org/D66612

llvm-svn: 369772

2 files changed, 25 insertions, 1 deletions

diff --git a/llvm/lib/Transforms/Scalar/Reassociate.cpp b/llvm/lib/Transforms/Scalar/Reassociate.cpp
index 0d4894732ac..124f625ef7b 100644
--- a/llvm/lib/Transforms/Scalar/Reassociate.cpp
+++ b/llvm/lib/Transforms/Scalar/Reassociate.cpp
@@ -861,7 +861,7 @@ static Value *NegateValue(Value *V, Instruction *BI,
     // this use.  We do this by moving it to the entry block (if it is a
     // non-instruction value) or right after the definition.  These negates will
     // be zapped by reassociate later, so we don't need much finesse here.
-    BinaryOperator *TheNeg = cast<BinaryOperator>(U);
+    Instruction *TheNeg = cast<Instruction>(U);
 
     // Verify that the negate is in this function, V might be a constant expr.
     if (TheNeg->getParent()->getParent() != BI->getParent()->getParent())
diff --git a/llvm/test/Transforms/Reassociate/2019-08-22-FNegAssert.ll b/llvm/test/Transforms/Reassociate/2019-08-22-FNegAssert.ll
new file mode 100644
index 00000000000..345d4e339fc
--- /dev/null
+++ b/llvm/test/Transforms/Reassociate/2019-08-22-FNegAssert.ll
@@ -0,0 +1,24 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
+; RUN: opt < %s -reassociate -S | FileCheck %s
+; D61675
+
+define float @test1(float %arg, float %arg1, float %arg2, float %arg3) {
+; CHECK-LABEL: @test1(
+; CHECK-NEXT:    [[TMP5:%.*]] = fneg fast float [[ARG:%.*]]
+; CHECK-NEXT:    [[TMP1:%.*]] = fsub fast float [[ARG3:%.*]], [[ARG2:%.*]]
+; CHECK-NEXT:    [[TMP2_NEG:%.*]] = fadd fast float [[TMP5]], 5.000000e+02
+; CHECK-NEXT:    [[TMP3:%.*]] = fadd fast float [[TMP2_NEG]], [[TMP1]]
+; CHECK-NEXT:    [[TMP4:%.*]] = fmul fast float [[TMP3]], [[TMP3]]
+; CHECK-NEXT:    [[TMP6:%.*]] = fdiv fast float [[TMP5]], [[ARG1:%.*]]
+; CHECK-NEXT:    [[TMP7:%.*]] = fadd fast float [[TMP4]], [[TMP6]]
+; CHECK-NEXT:    ret float [[TMP7]]
+;
+  %tmp1 = fsub fast float %arg3, %arg2
+  %tmp2 = fadd fast float %arg, -5.000000e+02
+  %tmp3 = fsub fast float %tmp1, %tmp2
+  %tmp4 = fmul fast float %tmp3, %tmp3
+  %tmp5 = fneg fast float %arg
+  %tmp6 = fdiv fast float %tmp5, %arg1
+  %tmp7 = fadd fast float %tmp6, %tmp4
+  ret float %tmp7
+}