From: Mark Mitchell <mark@codesourcery.com>
Date: Thu, 21 Sep 2006 22:18:54 +0000 (+0000)
Subject: re PR c++/29016 (tree check: expected class 'expression', have 'exceptional' (baselin... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b76d34e959674bb91653ca0fc86cdf9a4dabf075;p=gcc.git

re PR c++/29016 (tree check: expected class 'expression', have 'exceptional' (baselink) in get_base_var, at ipa-utils.c:224)

	PR c++/29016
	* typeck.c (build_unary_op): Don't form an ADDR_EXPR around a
	BASELINK.
	PR c++/29016
	* g++.dg/init/ptrfn1.C: New test.

From-SVN: r117123
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f6b83bd7894..9661c8f6bc5 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-21  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/29016
+	* typeck.c (build_unary_op): Don't form an ADDR_EXPR around a
+	BASELINK.
+
 2006-09-21  Lee Millward  <lee.millward@codesourcery.com>
 
 	PR c++/28861
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 220be7eda86..4713f05809c 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -4311,6 +4311,10 @@ build_unary_op (enum tree_code code, tree xarg, int noconvert)
 	    pedwarn ("ISO C++ forbids taking the address of a cast to a non-lvalue expression");
 	  break;
 
+	case BASELINK:
+	  arg = BASELINK_FUNCTIONS (arg);
+	  /* Fall through.  */
+
 	case OVERLOAD:
 	  arg = OVL_CURRENT (arg);
 	  break;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 49ea8251386..80097ac33a5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-21  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/29016
+	* g++.dg/init/ptrfn1.C: New test.
+
 2006-09-21  Lee Millward  <lee.millward@codesourcery.com>
 
         PR c++/28861
diff --git a/gcc/testsuite/g++.dg/init/ptrfn1.C b/gcc/testsuite/g++.dg/init/ptrfn1.C
new file mode 100644
index 00000000000..0cbabbf8072
--- /dev/null
+++ b/gcc/testsuite/g++.dg/init/ptrfn1.C
@@ -0,0 +1,12 @@
+// PR c++/29016
+// { dg-options "-O2" }
+
+class A;
+class B
+{
+  typedef void (*C[5]) (A *);
+  static  C D;
+  static void E (A*) {}
+};
+B::C B::D={E};
+