diff options
| author | Jason Merrill <jason@redhat.com> | 2012-04-11 13:55:25 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2012-04-11 13:55:25 -0400 |
| commit | 6a091e8bd882c308cd7ad0a7feb1b14443b26fb8 (patch) | |
| tree | ec869a9482d4c7331f5b0969c08d7565b33c5047 /gcc | |
| parent | 701bd2a2ccb8b091e0d08e62bb371d8cc0ed13a7 (diff) | |
| download | gcc-6a091e8bd882c308cd7ad0a7feb1b14443b26fb8.zip gcc-6a091e8bd882c308cd7ad0a7feb1b14443b26fb8.tar.gz gcc-6a091e8bd882c308cd7ad0a7feb1b14443b26fb8.tar.bz2 | |
decl.c (grokdeclarator): Strip the injected-class-name typedef if we are building a declaration or...
* decl.c (grokdeclarator): Strip the injected-class-name typedef
if we are building a declaration or compound type.
From-SVN: r186346
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 11 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/debug/dwarf2/self-ref-1.C | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/debug/dwarf2/self-ref-2.C | 2 |
5 files changed, 21 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 1f34600..525ce99 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2012-04-11 Jason Merrill <jason@redhat.com> + PR debug/45088 + * decl.c (grokdeclarator): Strip the injected-class-name typedef + if we are building a declaration or compound type. + PR c++/52906 * decl.c (check_tag_decl): Don't complain about attributes if we don't even have a type. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 8b221929..711ceef 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -8943,6 +8943,17 @@ grokdeclarator (const cp_declarator *declarator, error ("qualifiers are not allowed on declaration of %<operator %T%>", ctor_return_type); + /* If we're using the injected-class-name to form a compound type or a + declaration, replace it with the underlying class so we don't get + redundant typedefs in the debug output. But if we are returning the + type unchanged, leave it alone so that it's available to + maybe_get_template_decl_from_type_decl. */ + if (CLASS_TYPE_P (type) + && DECL_SELF_REFERENCE_P (TYPE_NAME (type)) + && type == TREE_TYPE (TYPE_NAME (type)) + && (declarator || type_quals)) + type = DECL_ORIGINAL_TYPE (TYPE_NAME (type)); + type_quals |= cp_type_quals (type); type = cp_build_qualified_type_real (type, type_quals, ((typedef_decl && !DECL_ARTIFICIAL (typedef_decl) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5fbbcfc..7773d30 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2012-04-11 Jason Merrill <jason@redhat.com> + PR debug/45088 + * g++.dg/debug/dwarf2/self-ref-1.C: Define virtual destructor. + * g++.dg/debug/dwarf2/self-ref-1.C: Likewise. + PR c++/52906 * g++.dg/ext/attrib45.C: New. diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/self-ref-1.C b/gcc/testsuite/g++.dg/debug/dwarf2/self-ref-1.C index 81bcb27..06db9dc 100644 --- a/gcc/testsuite/g++.dg/debug/dwarf2/self-ref-1.C +++ b/gcc/testsuite/g++.dg/debug/dwarf2/self-ref-1.C @@ -5,7 +5,7 @@ struct A { - virtual ~A(); + virtual ~A(){} }; struct B : public A diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/self-ref-2.C b/gcc/testsuite/g++.dg/debug/dwarf2/self-ref-2.C index b1c5401..d5463c0 100644 --- a/gcc/testsuite/g++.dg/debug/dwarf2/self-ref-2.C +++ b/gcc/testsuite/g++.dg/debug/dwarf2/self-ref-2.C @@ -6,7 +6,7 @@ template<class T> struct A { - virtual ~A(); + virtual ~A(){} }; struct B : public A<int> |