middle-end: replace GET_MODE_WIDER_MODE with GET_MODE_NEXT_MODE

After the fix to the addsub patch yesterday for bootstrap I had only regtested on x86.
While looking today it seemed the new tests were failing, this was caused
by a change in the behavior of the GET_MODE_WIDER_MODE macro on trunk.

gcc/ChangeLog:

	* match.pd: Replace GET_MODE_WIDER_MODE with
	custom code.

diff --git a/gcc/match.pd b/gcc/match.pd
index 39edc894aa59a404437743c08d3660311404d4e5..fe1178cf0d5038dbab3e3144937b8b8f4d734fc2 100644 (file)
--- a/gcc/match.pd
+++ b/gcc/match.pd
@@ -7940,12 +7940,15 @@ and,
        vec_perm_indices sel (builder, 2, nelts);
        machine_mode vec_mode = TYPE_MODE (type);
        machine_mode wide_mode;
+       scalar_mode wide_elt_mode;
+       poly_uint64 wide_nunits;
+       scalar_mode inner_mode = GET_MODE_INNER (vec_mode);
      }
      (if (sel.series_p (0, 2, 0, 2)
-          && GET_MODE_WIDER_MODE (vec_mode).exists (&wide_mode)
-         && VECTOR_MODE_P (wide_mode)
-         && (GET_MODE_UNIT_BITSIZE (vec_mode) * 2
-             == GET_MODE_UNIT_BITSIZE (wide_mode)))
+         && GET_MODE_2XWIDER_MODE (inner_mode).exists (&wide_elt_mode)
+         && multiple_p (GET_MODE_NUNITS (vec_mode), 2, &wide_nunits)
+         && related_vector_mode (vec_mode, wide_elt_mode,
+                                 wide_nunits).exists (&wide_mode))
        (with
         {
           tree stype