From 96f629573dc5831580c97141a9ac37a624f71b9a Mon Sep 17 00:00:00 2001 From: Paul Brook Date: Thu, 2 Sep 2004 19:32:57 +0000 Subject: [PATCH] decl2.c (determine_visibility): Only check data visibility for VAR_DECLS. * decl2.c (determine_visibility): Only check data visibility for VAR_DECLS. [[Split portion of a mixed commit.]] From-SVN: r86983.2 --- gcc/cp/ChangeLog | 7 ++++++- gcc/cp/decl2.c | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 929bde0077e..14dac825897 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2004-09-02 Paul Brook + + * decl2.c (determine_visibility): Only check data visibility + for VAR_DECLS. + 2004-08-31 Mark Mitchell * cp-tree.h (DECL_CONSTRUCTION_VTABLE_P): New macro. @@ -5,7 +10,7 @@ * decl2.c (determine_visibility): Honor TARGET_CXX_EXPORT_CLASS_DATA. - * class.c (key_method): Rename to ... + * class.c (key_method): Rename to ... (determine_key_method): ... this. (finish_struct_1): Adjust accordingly. * cp-tree.h (key_method): Declare. diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index c26d48fe954..03c468dfd42 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -1655,7 +1655,8 @@ determine_visibility (tree decl) the visibility of their containing class. */ if (class_type) { - if (targetm.cxx.export_class_data () + if (TREE_CODE (decl) == VAR_DECL + && targetm.cxx.export_class_data () && (DECL_TINFO_P (decl) || (DECL_VTABLE_OR_VTT_P (decl) /* Construction virtual tables are not emitted -- 2.30.2