1 files changed, 11 insertions, 7 deletions
diff --git a/gcc/range-op.cc b/gcc/range-op.cc
index 6fa27a8..df0735c 100644
--- a/gcc/range-op.cc
+++ b/gcc/range-op.cc
@@ -2516,13 +2516,17 @@ operator_cast::fold_range (irange &r, tree type ATTRIBUTE_UNUSED,
 	return true;
     }
 
-  // Pass nonzero mask through the cast.
-  if (!truncating_cast_p (inner, outer))
-    {
-      wide_int nz = inner.get_nonzero_bits ();
-      nz = wide_int::from (nz, TYPE_PRECISION (type), TYPE_SIGN (inner.type ()));
-      r.set_nonzero_bits (nz);
-    }
+  // Update the nonzero mask.  Truncating casts are problematic unless
+  // the conversion fits in the resulting outer type.
+  wide_int nz = inner.get_nonzero_bits ();
+  if (truncating_cast_p (inner, outer)
+      && wi::rshift (nz, wi::uhwi (TYPE_PRECISION (outer.type ()),
+				   TYPE_PRECISION (inner.type ())),
+		     TYPE_SIGN (inner.type ())) != 0)
+    return true;
+  nz = wide_int::from (nz, TYPE_PRECISION (type), TYPE_SIGN (inner.type ()));
+  r.set_nonzero_bits (nz);
+
   return true;
 }