From fd620c07283fd6366d248e1630895373e34cda9e Mon Sep 17 00:00:00 2001
From: mpolacek <mpolacek@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 25 Sep 2014 12:56:57 +0000
Subject: [PATCH] 	PR c++/61945 	* class.c (warn_hidden): Check for
 FUNCTION_DECL.

	* g++.dg/warn/pr61945.C: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@215597 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/cp/ChangeLog                    |  5 +++++
 gcc/cp/class.c                      |  3 ++-
 gcc/testsuite/ChangeLog             |  5 +++++
 gcc/testsuite/g++.dg/warn/pr61945.C | 11 +++++++++++
 4 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/warn/pr61945.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2457ccdb734..a11a52009b7 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-25  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/61945
+	* class.c (warn_hidden): Check for FUNCTION_DECL.
+
 2014-09-25  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/63249
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index c4ac61bd0a0..acf5768b7d3 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -2821,7 +2821,8 @@ warn_hidden (tree t)
       for (fn = fns; fn; fn = OVL_NEXT (fn))
 	{
 	  fndecl = OVL_CURRENT (fn);
-	  if (DECL_VINDEX (fndecl))
+	  if (TREE_CODE (fndecl) == FUNCTION_DECL
+	      && DECL_VINDEX (fndecl))
 	    {
 	      tree *prev = &base_fndecls;
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f1806f64503..953a5b2a3e5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-25  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/61945
+	* g++.dg/warn/pr61945.C: New test.
+
 2014-09-25  Jakub Jelinek  <jakub@redhat.com>
 
 	PR tree-optimization/63341
diff --git a/gcc/testsuite/g++.dg/warn/pr61945.C b/gcc/testsuite/g++.dg/warn/pr61945.C
new file mode 100644
index 00000000000..5584d841692
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/pr61945.C
@@ -0,0 +1,11 @@
+// PR c++/61945
+// { dg-do compile }
+// { dg-options "-Woverloaded-virtual" }
+
+class A {
+  virtual int foo ();	// { dg-warning "was hidden" }
+};
+class B : A {
+  template <typename>
+  void foo ();		// { dg-warning "by .B::foo\\(\\)." }
+};
-- 
2.11.4.GIT