From 9e291a01a2ce6f17e591f5c7577fd82a4aa273e1 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 20 Mar 2012 15:14:29 -0400 Subject: [PATCH] re PR c++/52510 (libitm/config/posix/rwlock.cc doesn't compile) PR c++/52510 * decl.c (reshape_init_class): Handle repeated reshaping. * search.c (lookup_field_1): Add sanity check. From-SVN: r185587 --- gcc/cp/ChangeLog | 6 +++++ gcc/cp/decl.c | 6 ++++- gcc/cp/search.c | 2 ++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/cpp0x/initlist66.C | 29 +++++++++++++++++++++++++ 5 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/initlist66.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7908bb32775..5fbf3f57a45 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2012-03-20 Jason Merrill + + PR c++/52510 + * decl.c (reshape_init_class): Handle repeated reshaping. + * search.c (lookup_field_1): Add sanity check. + 2012-03-19 Paolo Carlini PR c++/14710 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index a18b312841d..2b2a551740e 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -5110,7 +5110,11 @@ reshape_init_class (tree type, reshape_iter *d, bool first_initializer_p, return error_mark_node; } - field = lookup_field_1 (type, d->cur->index, /*want_type=*/false); + if (TREE_CODE (d->cur->index) == FIELD_DECL) + /* We already reshaped this. */ + gcc_assert (d->cur->index == field); + else + field = lookup_field_1 (type, d->cur->index, /*want_type=*/false); if (!field || TREE_CODE (field) != FIELD_DECL) { diff --git a/gcc/cp/search.c b/gcc/cp/search.c index a1f8a3db173..bd1bc576429 100644 --- a/gcc/cp/search.c +++ b/gcc/cp/search.c @@ -384,6 +384,8 @@ lookup_field_1 (tree type, tree name, bool want_type) { tree field; + gcc_assert (TREE_CODE (name) == IDENTIFIER_NODE); + if (TREE_CODE (type) == TEMPLATE_TYPE_PARM || TREE_CODE (type) == BOUND_TEMPLATE_TEMPLATE_PARM || TREE_CODE (type) == TYPENAME_TYPE) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 124ea7234f9..f86eb1944ea 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-03-20 Jason Merrill + + PR c++/52510 + * g++.dg/cpp0x/initlist66.C: New. + 2012-03-20 Georg-Johann Lay * gcc.target/avr/progmem.h (pgm_read_char): Define depending on diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist66.C b/gcc/testsuite/g++.dg/cpp0x/initlist66.C new file mode 100644 index 00000000000..4fc162e10f5 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/initlist66.C @@ -0,0 +1,29 @@ +// PR c++/52510 +// { dg-do compile { target c++11 } } + +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned int uint32_t; +typedef unsigned long long uint64_t; +typedef uint64_t upad64_t; + +typedef struct _pthread_cond { + struct { + uint8_t __pthread_cond_flag[4]; + uint16_t __pthread_cond_type; + uint16_t __pthread_cond_magic; + } __pthread_cond_flags; + upad64_t __pthread_cond_data; +} pthread_cond_t; + +class gtm_rwlock +{ + pthread_cond_t c_readers; + public: + gtm_rwlock(); +}; + +gtm_rwlock::gtm_rwlock() + : c_readers ({{{0, 0, 0, 0}, 0, 0x4356}, 0}) +{ } +