From e4269c7843070aa3ebc7c9e2e81c2e8a8d941c50 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 22 Aug 2011 17:00:06 +0200 Subject: [PATCH] re PR middle-end/50141 (ICE: tree check: expected var_decl, have parm_decl in get_bit_range, at expr.c:4357 with --param allow-store-data-races=0 and bitfields) PR middle-end/50141 * expr.c (get_bit_range): Only use DECL_THREAD_LOCAL_P if innerdecl is a VAR_DECL. * c-c++-common/cxxbitfields-6.c: New test. From-SVN: r177957 --- gcc/ChangeLog | 6 ++++++ gcc/expr.c | 3 ++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/c-c++-common/cxxbitfields-6.c | 17 +++++++++++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/c-c++-common/cxxbitfields-6.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 15c4e3ba24c..14ab8591350 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2011-08-22 Jakub Jelinek + + PR middle-end/50141 + * expr.c (get_bit_range): Only use DECL_THREAD_LOCAL_P if + innerdecl is a VAR_DECL. + 2011-08-22 Kirill Yukhin * config/i386/avx2intrin.h: New file. diff --git a/gcc/expr.c b/gcc/expr.c index 82873eb8376..ee16b6a469e 100644 --- a/gcc/expr.c +++ b/gcc/expr.c @@ -4354,7 +4354,8 @@ get_bit_range (unsigned HOST_WIDE_INT *bitstart, || TREE_CODE (innerdecl) == TARGET_MEM_REF) && !ptr_deref_may_alias_global_p (TREE_OPERAND (innerdecl, 0))) || (DECL_P (innerdecl) - && (DECL_THREAD_LOCAL_P (innerdecl) + && ((TREE_CODE (innerdecl) == VAR_DECL + && DECL_THREAD_LOCAL_P (innerdecl)) || !TREE_STATIC (innerdecl)))) { *bitstart = *bitend = 0; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f7df8c1db9d..72feb20c493 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-08-22 Jakub Jelinek + + PR middle-end/50141 + * c-c++-common/cxxbitfields-6.c: New test. + 2011-08-22 Mikael Morin PR fortran/50050 diff --git a/gcc/testsuite/c-c++-common/cxxbitfields-6.c b/gcc/testsuite/c-c++-common/cxxbitfields-6.c new file mode 100644 index 00000000000..bdd62941b4d --- /dev/null +++ b/gcc/testsuite/c-c++-common/cxxbitfields-6.c @@ -0,0 +1,17 @@ +/* PR middle-end/50141 */ +/* { dg-do compile } */ +/* { dg-options "-O2 --param allow-store-data-races=0" } */ + +struct S +{ + int i:8; +}; + +void bar (struct S, int); + +void +foo (struct S s, int i) +{ + s.i = i; + bar (s, i); +} -- 2.30.2