From a9e4a1a56fb8e99594b65d6640432ba29c705f3e Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 27 Mar 2017 23:07:21 +0200 Subject: [PATCH] re PR target/80162 (ICE on invalid code (address of register variable)) PR middle-end/80162 c-family/ * c-common.c (c_common_mark_addressable_vec): Don't set TREE_ADDRESSABLE on DECL_HARD_REGISTER. c/ * c-tree.h (c_mark_addressable): Add array_ref_p argument. * c-typeck.c (c_mark_addressable): Likewise. Look through VIEW_CONVERT_EXPR unless array_ref_p and VCE is from VECTOR_TYPE to ARRAY_TYPE. (build_array_ref): Pass true as array_ref_p to c_mark_addressable. cp/ * cp-tree.h (cxx_mark_addressable): Add array_ref_p argument. * typeck.c (cxx_mark_addressable): Likewise. Look through VIEW_CONVERT_EXPR unless array_ref_p and VCE is from VECTOR_TYPE to ARRAY_TYPE. (cp_build_array_ref): Pass true as array_ref_p to cxx_mark_addressable. testsuite/ * c-c++-common/pr80162-1.c: New test. * c-c++-common/pr80162-2.c: New test. * c-c++-common/pr80162-3.c: New test. From-SVN: r246512 --- gcc/c-family/ChangeLog | 6 ++++++ gcc/c-family/c-common.c | 3 ++- gcc/c/ChangeLog | 9 +++++++++ gcc/c/c-tree.h | 2 +- gcc/c/c-typeck.c | 16 +++++++++++++--- gcc/cp/ChangeLog | 9 +++++++++ gcc/cp/cp-tree.h | 2 +- gcc/cp/typeck.c | 16 +++++++++++++--- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/c-c++-common/pr80162-1.c | 13 +++++++++++++ gcc/testsuite/c-c++-common/pr80162-2.c | 18 ++++++++++++++++++ gcc/testsuite/c-c++-common/pr80162-3.c | 18 ++++++++++++++++++ 12 files changed, 108 insertions(+), 9 deletions(-) create mode 100644 gcc/testsuite/c-c++-common/pr80162-1.c create mode 100644 gcc/testsuite/c-c++-common/pr80162-2.c create mode 100644 gcc/testsuite/c-c++-common/pr80162-3.c diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 4afb4b8af6e..0b543ec52f6 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,9 @@ +2017-03-27 Jakub Jelinek + + PR middle-end/80162 + * c-common.c (c_common_mark_addressable_vec): Don't set + TREE_ADDRESSABLE on DECL_HARD_REGISTER. + 2017-03-21 Martin Sebor PR c++/79548 diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c index 65ffd8cd7bd..07af384cd6b 100644 --- a/gcc/c-family/c-common.c +++ b/gcc/c-family/c-common.c @@ -6542,7 +6542,8 @@ c_common_mark_addressable_vec (tree t) && TREE_CODE (t) != PARM_DECL && TREE_CODE (t) != COMPOUND_LITERAL_EXPR) return; - TREE_ADDRESSABLE (t) = 1; + if (!VAR_P (t) || !DECL_HARD_REGISTER (t)) + TREE_ADDRESSABLE (t) = 1; } diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index f4dbeeb1b09..08a5b9ae2d7 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,12 @@ +2017-03-27 Jakub Jelinek + + PR middle-end/80162 + * c-tree.h (c_mark_addressable): Add array_ref_p argument. + * c-typeck.c (c_mark_addressable): Likewise. Look through + VIEW_CONVERT_EXPR unless array_ref_p and VCE is from VECTOR_TYPE + to ARRAY_TYPE. + (build_array_ref): Pass true as array_ref_p to c_mark_addressable. + 2017-03-23 Marek Polacek * c-tree.h: Remove a C_RID_YYCODE reference. diff --git a/gcc/c/c-tree.h b/gcc/c/c-tree.h index 9428d74d051..5fa32a48f29 100644 --- a/gcc/c/c-tree.h +++ b/gcc/c/c-tree.h @@ -615,7 +615,7 @@ extern int same_translation_unit_p (const_tree, const_tree); extern int comptypes (tree, tree); extern int comptypes_check_different_types (tree, tree, bool *); extern bool c_vla_type_p (const_tree); -extern bool c_mark_addressable (tree); +extern bool c_mark_addressable (tree, bool = false); extern void c_incomplete_type_error (location_t, const_tree, const_tree); extern tree c_type_promotes_to (tree); extern struct c_expr default_function_array_conversion (location_t, diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c index b283a211a03..ff239e2d628 100644 --- a/gcc/c/c-typeck.c +++ b/gcc/c/c-typeck.c @@ -2654,7 +2654,7 @@ build_array_ref (location_t loc, tree array, tree index) || (COMPLETE_TYPE_P (TREE_TYPE (TREE_TYPE (array))) && TREE_CODE (TYPE_SIZE (TREE_TYPE (TREE_TYPE (array)))) != INTEGER_CST)) { - if (!c_mark_addressable (array)) + if (!c_mark_addressable (array, true)) return error_mark_node; } /* An array that is indexed by a constant value which is not within @@ -4755,16 +4755,26 @@ lvalue_or_else (location_t loc, const_tree ref, enum lvalue_use use) /* Mark EXP saying that we need to be able to take the address of it; it should not be allocated in a register. - Returns true if successful. */ + Returns true if successful. ARRAY_REF_P is true if this + is for ARRAY_REF construction - in that case we don't want + to look through VIEW_CONVERT_EXPR from VECTOR_TYPE to ARRAY_TYPE, + it is fine to use ARRAY_REFs for vector subscripts on vector + register variables. */ bool -c_mark_addressable (tree exp) +c_mark_addressable (tree exp, bool array_ref_p) { tree x = exp; while (1) switch (TREE_CODE (x)) { + case VIEW_CONVERT_EXPR: + if (array_ref_p + && TREE_CODE (TREE_TYPE (x)) == ARRAY_TYPE + && VECTOR_TYPE_P (TREE_TYPE (TREE_OPERAND (x, 0)))) + return true; + /* FALLTHRU */ case COMPONENT_REF: case ADDR_EXPR: case ARRAY_REF: diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ea1eaa771a5..1d75be5a2d4 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,12 @@ +2017-03-27 Jakub Jelinek + + PR middle-end/80162 + * cp-tree.h (cxx_mark_addressable): Add array_ref_p argument. + * typeck.c (cxx_mark_addressable): Likewise. Look through + VIEW_CONVERT_EXPR unless array_ref_p and VCE is from VECTOR_TYPE + to ARRAY_TYPE. + (cp_build_array_ref): Pass true as array_ref_p to cxx_mark_addressable. + 2017-03-24 Jason Merrill PR c++/77339 - ICE with invalid use of alias template. diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 9f02a97619a..daa1a81103e 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -6715,7 +6715,7 @@ extern void cxx_print_error_function (diagnostic_context *, struct diagnostic_info *); /* in typeck.c */ -extern bool cxx_mark_addressable (tree); +extern bool cxx_mark_addressable (tree, bool = false); extern int string_conv_p (const_tree, const_tree, int); extern tree cp_truthvalue_conversion (tree); extern tree condition_conversion (tree); diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 4e9a1c0b6e7..79391c04fd6 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -3217,7 +3217,7 @@ cp_build_array_ref (location_t loc, tree array, tree idx, && (TREE_CODE (TYPE_SIZE (TREE_TYPE (TREE_TYPE (array)))) != INTEGER_CST))) { - if (!cxx_mark_addressable (array)) + if (!cxx_mark_addressable (array, true)) return error_mark_node; } @@ -6269,18 +6269,28 @@ unary_complex_lvalue (enum tree_code code, tree arg) /* Mark EXP saying that we need to be able to take the address of it; it should not be allocated in a register. - Value is true if successful. + Value is true if successful. ARRAY_REF_P is true if this + is for ARRAY_REF construction - in that case we don't want + to look through VIEW_CONVERT_EXPR from VECTOR_TYPE to ARRAY_TYPE, + it is fine to use ARRAY_REFs for vector subscripts on vector + register variables. C++: we do not allow `current_class_ptr' to be addressable. */ bool -cxx_mark_addressable (tree exp) +cxx_mark_addressable (tree exp, bool array_ref_p) { tree x = exp; while (1) switch (TREE_CODE (x)) { + case VIEW_CONVERT_EXPR: + if (array_ref_p + && TREE_CODE (TREE_TYPE (x)) == ARRAY_TYPE + && VECTOR_TYPE_P (TREE_TYPE (TREE_OPERAND (x, 0)))) + return true; + /* FALLTHRU */ case ADDR_EXPR: case COMPONENT_REF: case ARRAY_REF: diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8146499de3f..14f6d6b5408 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2017-03-27 Jakub Jelinek + PR middle-end/80162 + * c-c++-common/pr80162-1.c: New test. + * c-c++-common/pr80162-2.c: New test. + * c-c++-common/pr80162-3.c: New test. + PR target/80102 * g++.dg/opt/pr80102.C: New test. diff --git a/gcc/testsuite/c-c++-common/pr80162-1.c b/gcc/testsuite/c-c++-common/pr80162-1.c new file mode 100644 index 00000000000..7d442b37417 --- /dev/null +++ b/gcc/testsuite/c-c++-common/pr80162-1.c @@ -0,0 +1,13 @@ +/* PR middle-end/80162 */ +/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && lp64 } } } */ +/* { dg-options "-msse2 -ffixed-xmm7" } */ + +typedef int v8 __attribute__ ((vector_size (8))); +struct U { v8 a; v8 b; }; +register struct U u asm ("xmm7"); + +int * +foo (int i) +{ + return &u.a[i]; /* { dg-error "address of \[^ \n\r]* register variable" } */ +} diff --git a/gcc/testsuite/c-c++-common/pr80162-2.c b/gcc/testsuite/c-c++-common/pr80162-2.c new file mode 100644 index 00000000000..cb2c8991ae9 --- /dev/null +++ b/gcc/testsuite/c-c++-common/pr80162-2.c @@ -0,0 +1,18 @@ +/* PR middle-end/80162 */ +/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && lp64 } } } */ +/* { dg-options "-mavx2 -ffixed-xmm7" } */ + +typedef int V __attribute__ ((vector_size (32))); +register V u asm ("xmm7"); + +int +foo (int i) +{ + return u[i]; +} + +int +bar (void) +{ + return u[5]; +} diff --git a/gcc/testsuite/c-c++-common/pr80162-3.c b/gcc/testsuite/c-c++-common/pr80162-3.c new file mode 100644 index 00000000000..a600fde2a6b --- /dev/null +++ b/gcc/testsuite/c-c++-common/pr80162-3.c @@ -0,0 +1,18 @@ +/* PR middle-end/80162 */ +/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && lp64 } } } */ +/* { dg-options "-mavx2 -ffixed-xmm7" } */ + +typedef int V __attribute__ ((vector_size (32))); +register V u asm ("xmm7"); + +int * +foo (int i) +{ + return &u[i]; /* { dg-error "address of \[^ \n\r]* register variable" } */ +} + +int * +bar (void) +{ + return &u[5]; /* { dg-error "address of \[^ \n\r]* register variable" } */ +} -- 2.30.2