From: Jason Merrill <jason@redhat.com>
Date: Mon, 20 Nov 2017 22:37:45 +0000 (-0500)
Subject: Avoid duplicate visibility warning.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;ds=sidebyside;h=753c2e693fd35b582b34e66ac877cd1a4a385be7;p=gcc.git

Avoid duplicate visibility warning.

	* decl2.c (constrain_class_visibility): Don't warn about artificial
	fields.

From-SVN: r254973
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 31b20ffa3e0..5de732f5425 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2017-11-20  Jason Merrill  <jason@redhat.com>
+
+	* decl2.c (constrain_class_visibility): Don't warn about artificial
+	fields.
+
 2017-11-20  Jakub Jelinek  <jakub@redhat.com>
 
 	P0329R4: Designated Initialization
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index bc0db0000de..13e7b1d180a 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -2553,7 +2553,8 @@ constrain_class_visibility (tree type)
     vis = VISIBILITY_INTERNAL;
 
   for (t = TYPE_FIELDS (type); t; t = DECL_CHAIN (t))
-    if (TREE_CODE (t) == FIELD_DECL && TREE_TYPE (t) != error_mark_node)
+    if (TREE_CODE (t) == FIELD_DECL && TREE_TYPE (t) != error_mark_node
+	&& !DECL_ARTIFICIAL (t))
       {
 	tree ftype = strip_pointer_or_array_types (TREE_TYPE (t));
 	int subvis = type_visibility (ftype);
diff --git a/gcc/testsuite/g++.dg/ext/visibility/warn6.C b/gcc/testsuite/g++.dg/ext/visibility/warn6.C
new file mode 100644
index 00000000000..256ebd2ad2f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/visibility/warn6.C
@@ -0,0 +1,2 @@
+struct __attribute ((visibility ("hidden"))) A { int i; };
+struct B: A { }; // { dg-warning "base" }