diff options
| author | Richard Sandiford <rsandifo@redhat.com> | 2002-04-11 14:16:26 +0000 |
|---|---|---|
| committer | Richard Sandiford <rsandifo@gcc.gnu.org> | 2002-04-11 14:16:26 +0000 |
| commit | d75ff184174b2678007e544e63491b741b940c07 (patch) | |
| tree | b9c92a24a07b911bb6cbc5fe6a1e66d9f720f0f6 | |
| parent | df51a2457a141c12dc203ebd0b3a04e17bfd497f (diff) | |
| download | gcc-d75ff184174b2678007e544e63491b741b940c07.zip gcc-d75ff184174b2678007e544e63491b741b940c07.tar.gz gcc-d75ff184174b2678007e544e63491b741b940c07.tar.bz2 | |
decl.c (duplicate_decls): Don't try to unify an implicit typedef with an explicit one.
* decl.c (duplicate_decls): Don't try to unify an implicit typedef
with an explicit one.
(lookup_tag): Extract the tag of an explicit typedef.
From-SVN: r52159
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 31 |
2 files changed, 34 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a2d8b8f..6f355c3 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2002-04-11 Richard Sandiford <rsandifo@redhat.com> + + * decl.c (duplicate_decls): Don't try to unify an implicit typedef + with an explicit one. + (lookup_tag): Extract the tag of an explicit typedef. + 2002-04-10 Nathan Sidwell <nathan@codesourcery.com> PR c++/5507 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index dc9d373..f55e1d4 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -3426,6 +3426,18 @@ duplicate_decls (newdecl, olddecl) } } + /* Do not merge an implicit typedef with an explicit one. In: + + class A; + ... + typedef class A A __attribute__ ((foo)); + + the attribute should apply only to the typedef. */ + if (TREE_CODE (olddecl) == TYPE_DECL + && (DECL_IMPLICIT_TYPEDEF_P (olddecl) + || DECL_IMPLICIT_TYPEDEF_P (newdecl))) + return 0; + /* If new decl is `static' and an `extern' was seen previously, warn about it. */ warn_extern_redeclared_static (newdecl, olddecl); @@ -5336,10 +5348,23 @@ lookup_tag (form, name, binding_level, thislevel_only) else old = BINDING_TYPE (old); - /* If it has an original type, it is a typedef, and we - should not return it. */ + /* If the declaration has an original type, it must a + typedef. When it is an explicit typedef of the form: + + typedef struct A A; + + the original type will be the tag that we want. + We should not return any other kind of typedef. + + Detect the valid case by checking that the original + type has the same name and context as the typedef. */ if (old && DECL_ORIGINAL_TYPE (TYPE_NAME (old))) - old = NULL_TREE; + { + old = DECL_ORIGINAL_TYPE (TYPE_NAME (old)); + if (TYPE_IDENTIFIER (old) != name + || context_for_name_lookup (TYPE_NAME (old)) != tail) + old = NULL_TREE; + } if (old && TREE_CODE (old) != form && (form == ENUMERAL_TYPE || TREE_CODE (old) == ENUMERAL_TYPE)) { |