diff options
author | Jakub Jelinek <jakub@redhat.com> | 2022-06-18 11:07:13 +0200 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2022-06-18 11:07:13 +0200 |
commit | ef662120177d39af5f88ffc622d90bb6ae0ca1d3 (patch) | |
tree | dabad3e88d79c104b3d91d28034d0307fd0c769c | |
parent | 9991d84d2a84355fd3fc9afc89a963f45991bfa9 (diff) | |
download | gcc-ef662120177d39af5f88ffc622d90bb6ae0ca1d3.zip gcc-ef662120177d39af5f88ffc622d90bb6ae0ca1d3.tar.gz gcc-ef662120177d39af5f88ffc622d90bb6ae0ca1d3.tar.bz2 |
varasm: Fix up ICE in narrowing_initializer_constant_valid_p [PR105998]
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.
2022-06-18 Jakub Jelinek <jakub@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
! INTEGRAL_TYPE_P and do the same check also on op{0,1}'s type.
* c-c++-common/pr105998.c: New test.
-rw-r--r-- | gcc/testsuite/c-c++-common/pr105998.c | 12 | ||||
-rw-r--r-- | gcc/varasm.cc | 10 |
2 files changed, 20 insertions, 2 deletions
diff --git a/gcc/testsuite/c-c++-common/pr105998.c b/gcc/testsuite/c-c++-common/pr105998.c new file mode 100644 index 0000000..85277b9 --- /dev/null +++ b/gcc/testsuite/c-c++-common/pr105998.c @@ -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; +} diff --git a/gcc/varasm.cc b/gcc/varasm.cc index 826a9ca..4db8506 100644 --- a/gcc/varasm.cc +++ b/gcc/varasm.cc @@ -4716,7 +4716,10 @@ narrowing_initializer_constant_valid_p (tree value, tree endtype, tree *cache) { tree inner = TREE_OPERAND (op0, 0); if (inner == error_mark_node - || ! INTEGRAL_MODE_P (TYPE_MODE (TREE_TYPE (inner))) + || ! INTEGRAL_TYPE_P (TREE_TYPE (op0)) + || ! SCALAR_INT_MODE_P (TYPE_MODE (TREE_TYPE (op0))) + || ! INTEGRAL_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 +4731,10 @@ narrowing_initializer_constant_valid_p (tree value, tree endtype, tree *cache) { tree inner = TREE_OPERAND (op1, 0); if (inner == error_mark_node - || ! INTEGRAL_MODE_P (TYPE_MODE (TREE_TYPE (inner))) + || ! INTEGRAL_TYPE_P (TREE_TYPE (op1)) + || ! SCALAR_INT_MODE_P (TYPE_MODE (TREE_TYPE (op1))) + || ! INTEGRAL_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; |