diff options
author | Jason Merrill <jason@redhat.com> | 2014-01-07 16:24:37 -0500 |
---|---|---|
committer | Jason Merrill <jason@gcc.gnu.org> | 2014-01-07 16:24:37 -0500 |
commit | 5a5e7deb5f93f04e027fd5baa1876370d6d6697f (patch) | |
tree | f5e2734834f4af7ff1608eec1cb2449b59d8bc3a /gcc | |
parent | 62dd455c2ea0c6dbfac3bd265da0596b7ee79a60 (diff) | |
download | gcc-5a5e7deb5f93f04e027fd5baa1876370d6d6697f.zip gcc-5a5e7deb5f93f04e027fd5baa1876370d6d6697f.tar.gz gcc-5a5e7deb5f93f04e027fd5baa1876370d6d6697f.tar.bz2 |
re PR c++/58965 ([c++11] ICE with member initializer in static union)
PR c++/58965
* mangle.c (write_guarded_var_name): Handle null DECL_NAME.
From-SVN: r206405
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
-rw-r--r-- | gcc/cp/mangle.c | 3 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/nsdmi-union3.C | 10 |
3 files changed, 17 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b31014f..cdb376d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2014-01-07 Jason Merrill <jason@redhat.com> + + PR c++/58965 + * mangle.c (write_guarded_var_name): Handle null DECL_NAME. + 2014-01-07 Paolo Carlini <paolo.carlini@oracle.com> * semantics.c (trait_expr_value, [CPTK_IS_BASE_OF]): Implement diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c index 6f32a43..dc7d4ea 100644 --- a/gcc/cp/mangle.c +++ b/gcc/cp/mangle.c @@ -3775,7 +3775,8 @@ mangle_conv_op_name_for_type (const tree type) static void write_guarded_var_name (const tree variable) { - if (strncmp (IDENTIFIER_POINTER (DECL_NAME (variable)), "_ZGR", 4) == 0) + if (DECL_NAME (variable) + && strncmp (IDENTIFIER_POINTER (DECL_NAME (variable)), "_ZGR", 4) == 0) /* The name of a guard variable for a reference temporary should refer to the reference, not the temporary. */ write_string (IDENTIFIER_POINTER (DECL_NAME (variable)) + 4); diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-union3.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-union3.C new file mode 100644 index 0000000..35f6509 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-union3.C @@ -0,0 +1,10 @@ +// PR c++/58965 +// { dg-require-effective-target c++11 } + +void foo() +{ + static union + { + int i = i; + }; +} |