diff options
| author | Jason Merrill <jason@redhat.com> | 2006-07-06 14:39:39 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2006-07-06 14:39:39 -0400 |
| commit | 1f0b926a1fe14a4ec094be7343aa7c8cf9b70716 (patch) | |
| tree | 09e431a3d861945a30a4c131ce36186af54e5fea /gcc | |
| parent | 0ac5ccd149b619d6017eb83ba78786257225eb36 (diff) | |
| download | gcc-1f0b926a1fe14a4ec094be7343aa7c8cf9b70716.zip gcc-1f0b926a1fe14a4ec094be7343aa7c8cf9b70716.tar.gz gcc-1f0b926a1fe14a4ec094be7343aa7c8cf9b70716.tar.bz2 | |
re PR c++/28279 (ICE in finish_static_data_member_decl, at cp/decl2.c:716)
PR c++/28279
* decl2.c (finish_static_data_member_decl): Don't assert
TREE_PUBLIC.
From-SVN: r115228
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl2.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/anon2.C | 15 |
3 files changed, 22 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3d3952c..b792964 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2006-07-06 Jason Merrill <jason@redhat.com> + + PR c++/28279 + * decl2.c (finish_static_data_member_decl): Don't assert + TREE_PUBLIC. + 2006-07-05 Jason Merrill <jason@redhat.com> PR c++/13983 diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 0964bf5..defeafb 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -713,15 +713,13 @@ finish_static_data_member_decl (tree decl, tree asmspec_tree, int flags) { - gcc_assert (TREE_PUBLIC (decl)); - DECL_CONTEXT (decl) = current_class_type; /* We cannot call pushdecl here, because that would fill in the TREE_CHAIN of our decl. Instead, we modify cp_finish_decl to do the right thing, namely, to put this decl out straight away. */ - if (! processing_template_decl) + if (! processing_template_decl && TREE_PUBLIC (decl)) note_vague_linkage_var (decl); if (LOCAL_CLASS_P (current_class_type)) diff --git a/gcc/testsuite/g++.dg/template/anon2.C b/gcc/testsuite/g++.dg/template/anon2.C new file mode 100644 index 0000000..75285ad --- /dev/null +++ b/gcc/testsuite/g++.dg/template/anon2.C @@ -0,0 +1,15 @@ +// PR c++/28279 +// finish_static_data_member_decl was confused by the anonymous +// namespace causing TREE_PUBLIC to be unset + +template<typename T> +struct is_pointer_impl { + static const bool value = true; +}; + +namespace { + class prefix_name_mapper {}; +} + +static const bool val = is_pointer_impl<prefix_name_mapper>::value; + |