OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Jason Merrill 2012-03-20 15:14:29 -04:00 committed by Jason Merrill
parent f78f047346
commit 9e291a01a2
5 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2012-03-20 Jason Merrill <jason@redhat.com>
PR c++/52510
* decl.c (reshape_init_class): Handle repeated reshaping.
* search.c (lookup_field_1): Add sanity check.
2012-03-19 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/14710

6
gcc/cp/decl.c
View File

@ -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)
{

2
gcc/cp/search.c
View File

@ -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)

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2012-03-20 Jason Merrill <jason@redhat.com>
PR c++/52510
* g++.dg/cpp0x/initlist66.C: New.
2012-03-20 Georg-Johann Lay <avr@gjlay.de>
* gcc.target/avr/progmem.h (pgm_read_char): Define depending on

29
gcc/testsuite/g++.dg/cpp0x/initlist66.C Normal file
View File

@ -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})
{ }