From 3f774254dbed681d86c023cac491a8c38188d76c Mon Sep 17 00:00:00 2001
From: Daniel Berlin <dberlin@dberlin.org>
Date: Fri, 15 Jul 2005 20:22:39 +0000
Subject: [PATCH] re PR c++/22452 (ICE expected tree that contains 'decl with
visibility' structure, have 'const_decl' in decl_linkage, at cp/tree.c:2132)
2005-07-14 Daniel Berlin <dberlin@dberlin.org>
Fix PR c++/22452
* tree.c (decl_linkage): Don't check DECL_COMDAT on CONST_DECL.
From-SVN: r102063
---
gcc/cp/ChangeLog | 5 +++++
gcc/cp/tree.c | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a52464a20e44..e13653c4a244 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-14 Daniel Berlin <dberlin@dberlin.org>
+
+ Fix PR c++/22452
+ * tree.c (decl_linkage): Don't check DECL_COMDAT on CONST_DECL.
+
2005-07-15 Mark Mitchell <mark@codesourcery.com>
PR c++/22132
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index e0eb1ac6ef74..0cf6b4ebc1ad 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -2123,6 +2123,11 @@ decl_linkage (tree decl)
/* Things that are TREE_PUBLIC have external linkage. */
if (TREE_PUBLIC (decl))
return lk_external;
+
+ /* Linkage of a CONST_DECL depends on the linkage of the enumeration
+ type. */
+ if (TREE_CODE (decl) == CONST_DECL)
+ return decl_linkage (TYPE_NAME (TREE_TYPE (decl)));
/* Some things that are not TREE_PUBLIC have external linkage, too.
For example, on targets that don't have weak symbols, we make all
--
GitLab