summaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@gcc.gnu.org>2002-05-03 14:55:23 -0400
committerJason Merrill <jason@gcc.gnu.org>2002-05-03 14:55:23 -0400
commit2c5a72e5851c97db20cb736628e0fe53dbf1aca5 (patch)
treee0a6461bc8cf842dd2802465a639838159edf6a1 /gcc
parent8402ca31308818939b3a6793721b06ddca1721e0 (diff)
downloadgcc-2c5a72e5851c97db20cb736628e0fe53dbf1aca5.tar.gz
revert reversion
From-SVN: r53112
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog3
-rw-r--r--gcc/cp/ChangeLog2
-rw-r--r--gcc/cp/decl.c2
-rw-r--r--gcc/dwarf2out.c1
4 files changed, 2 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dd1c8f15d7b..549b49f0d21 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -22,9 +22,6 @@
* config/i960/i960.h (BOOL_TYPE_SIZE): Don't define.
* config/mcore/mcore.h (BOOL_TYPE_SIZE): Don't define.
- * dwarf2out.c (gen_type_die): Don't recurse if TYPE_NAME doesn't
- actually declare this type.
-
2002-05-02 Loren J. Rittle <ljrittle@acm.org>
* doc/install.texi (*-*-freebsd*): Update to latest status.
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2844ad38d6d..b2b71e97437 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -2,8 +2,6 @@
* decl.c (BOOL_TYPE_SIZE): Move default to defaults.h.
- * decl.c (grokdeclarator): Revert last change.
-
2002-05-02 Mark Mitchell <mark@codesourcery.com>
* init.c (perform_base_cleanups): Correct order of base class
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 99e69fadd7c..ebff32f9e02 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -11270,6 +11270,8 @@ grokdeclarator (declarator, declspecs, decl_context, initialized, attrlist)
&& TYPE_NAME (type)
&& TREE_CODE (TYPE_NAME (type)) == TYPE_DECL
&& TYPE_ANONYMOUS_P (type)
+ /* Don't do this if there are attributes. */
+ && (!attrlist || !*attrlist)
&& cp_type_quals (type) == TYPE_UNQUALIFIED)
{
tree oldname = TYPE_NAME (type);
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 8f4126ac867..e99665fa425 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -11045,7 +11045,6 @@ gen_type_die (type, context_die)
return;
if (TYPE_NAME (type) && TREE_CODE (TYPE_NAME (type)) == TYPE_DECL
- && TREE_TYPE (TYPE_NAME (type)) == type
&& DECL_ORIGINAL_TYPE (TYPE_NAME (type)))
{
TREE_ASM_WRITTEN (type) = 1;