diff --git a/llvm/lib/IR/Constants.cpp b/llvm/lib/IR/Constants.cpp
index 70f7e0176e85..1abb65643559 100644
--- a/llvm/lib/IR/Constants.cpp
+++ b/llvm/lib/IR/Constants.cpp
@@ -53,12 +53,9 @@ bool Constant::isNegativeZeroValue() const {
       if (SplatCFP && SplatCFP->isZero() && SplatCFP->isNegative())
         return true;
 
-  // However, vectors of zeroes which are floating point represent +0.0's.
-  if (const ConstantAggregateZero *CAZ = dyn_cast<ConstantAggregateZero>(this))
-    if (const VectorType *VT = dyn_cast<VectorType>(CAZ->getType()))
-      if (VT->getElementType()->isFloatingPointTy())
-        // As it's a CAZ, we know it's the zero bit-pattern (ie, +0.0) in each element.
-        return false;
+  // We've already handled true FP case; any other FP vectors can't represent -0.0.
+  if (getType()->isFPOrFPVectorTy())
+    return false;
 
   // Otherwise, just use +0.0.
   return isNullValue();