From 92d9c9e705f039f42734139c233202888d2bf01b Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 22 Jun 2021 15:20:14 +0200 Subject: [PATCH] fold-const: Return corresponding integral type for OFFSET_TYPE in range_check_type [PR101162] Andrew's recent r12-1608-g2f1686ff70b25fceb04ca2ffc0a450fb682913ef change to fail verification on various unary and binary operations with OFFSET_TYPE revealed that e.g. switchconv happily performs multiplications and additions in OFFSET_TYPE. 2021-06-22 Jakub Jelinek Andrew Pinski PR tree-optimization/101162 * fold-const.c (range_check_type): Handle OFFSET_TYPE like pointer types. * g++.dg/opt/pr101162.C: New test. --- gcc/fold-const.c | 2 +- gcc/testsuite/g++.dg/opt/pr101162.C | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/opt/pr101162.C diff --git a/gcc/fold-const.c b/gcc/fold-const.c index 95673d24ed01..0b33ee99a81f 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -5360,7 +5360,7 @@ range_check_type (tree etype) else return NULL_TREE; } - else if (POINTER_TYPE_P (etype)) + else if (POINTER_TYPE_P (etype) || TREE_CODE (etype) == OFFSET_TYPE) etype = unsigned_type_for (etype); return etype; } diff --git a/gcc/testsuite/g++.dg/opt/pr101162.C b/gcc/testsuite/g++.dg/opt/pr101162.C new file mode 100644 index 000000000000..40321890bb07 --- /dev/null +++ b/gcc/testsuite/g++.dg/opt/pr101162.C @@ -0,0 +1,21 @@ +// PR tree-optimization/101162 +// { dg-do compile } +// { dg-options "-O2" } + +struct A { int i1, i2, i3, i4, i5, i6; }; + +int A::* +foo (int i) +{ + switch (i) + { + case 1: return &A::i1; + case 2: return &A::i2; + case 3: return &A::i3; + case 4: return &A::i4; + case 5: return &A::i5; + case 6: return &A::i6; + } + + return 0; +} -- 2.47.2