[PATCH] varasm: Fix up ICE in narrowing_initializer_constant_valid_p [PR105998]

[Jakub Jelinek via Gcc-patches]

Hi!

The following testcase ICEs because there is NON_LVALUE_EXPR (location
wrapper) around a VAR_DECL and has TYPE_MODE V2SImode and
SCALAR_INT_TYPE_MODE on that ICEs.  Or for -m32 -march=i386 TYPE_MODE
is DImode, but SCALAR_INT_TYPE_MODE still uses the raw V2SImode and ICEs
too.

Fixed thusly, bootstrapped/regtested on x86_64-linux and i686-linux, ok
for trunk?

2022-06-17  Jakub Jelinek  <ja...@redhat.com>

        PR middle-end/105998
        * varasm.cc (narrowing_initializer_constant_valid_p): Check
        SCALAR_INT_MODE_P instead of INTEGRAL_MODE_P, also break on
        VECTOR_TYPE_P.

        * c-c++-common/pr105998.c: New test.

--- gcc/varasm.cc.jj    2022-06-06 12:18:12.792812888 +0200
+++ gcc/varasm.cc       2022-06-17 09:49:21.918029072 +0200
@@ -4716,7 +4716,8 @@ narrowing_initializer_constant_valid_p (
     {
       tree inner = TREE_OPERAND (op0, 0);
       if (inner == error_mark_node
-         || ! INTEGRAL_MODE_P (TYPE_MODE (TREE_TYPE (inner)))
+         || VECTOR_TYPE_P (TREE_TYPE (inner))
+         || ! SCALAR_INT_MODE_P (TYPE_MODE (TREE_TYPE (inner)))
          || (GET_MODE_SIZE (SCALAR_INT_TYPE_MODE (TREE_TYPE (op0)))
              > GET_MODE_SIZE (SCALAR_INT_TYPE_MODE (TREE_TYPE (inner)))))
        break;
@@ -4728,7 +4729,8 @@ narrowing_initializer_constant_valid_p (
     {
       tree inner = TREE_OPERAND (op1, 0);
       if (inner == error_mark_node
-         || ! INTEGRAL_MODE_P (TYPE_MODE (TREE_TYPE (inner)))
+         || VECTOR_TYPE_P (TREE_TYPE (inner))
+         || ! SCALAR_INT_MODE_P (TYPE_MODE (TREE_TYPE (inner)))
          || (GET_MODE_SIZE (SCALAR_INT_TYPE_MODE (TREE_TYPE (op1)))
              > GET_MODE_SIZE (SCALAR_INT_TYPE_MODE (TREE_TYPE (inner)))))
        break;
--- gcc/testsuite/c-c++-common/pr105998.c.jj    2022-06-16 16:37:00.094926684 
+0200
+++ gcc/testsuite/c-c++-common/pr105998.c       2022-06-16 16:36:30.155322215 
+0200
@@ -0,0 +1,12 @@
+/* PR middle-end/105998 */
+
+typedef int __attribute__((__vector_size__ (sizeof (long long)))) V;
+
+V v;
+
+long long
+foo (void)
+{
+  long long l = (long long) ((0 | v) - ((V) { } == 0));
+  return l;
+}

        Jakub