aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMark Mitchell <mark@codesourcery.com>2006-09-21 22:18:54 +0000
committerMark Mitchell <mmitchel@gcc.gnu.org>2006-09-21 22:18:54 +0000
commitb76d34e959674bb91653ca0fc86cdf9a4dabf075 (patch)
treedbd8c52e4a1d7674d3b117a9267ce96b88f30e02 /gcc
parent2801ed8e2fc91d7b924e76b4f5505daee09381a5 (diff)
downloadgcc-b76d34e959674bb91653ca0fc86cdf9a4dabf075.zip
gcc-b76d34e959674bb91653ca0fc86cdf9a4dabf075.tar.gz
gcc-b76d34e959674bb91653ca0fc86cdf9a4dabf075.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/typeck.c4
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/init/ptrfn1.C12
4 files changed, 27 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f6b83bd..9661c8f 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 220be7e..4713f05 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 49ea825..80097ac 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 0000000..0cbabbf
--- /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};
+