From e81de9c8eb33a9dedf33078d08b9815b98acf55d Mon Sep 17 00:00:00 2001 From: mmitchel Date: Thu, 21 Sep 2006 22:18:54 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@117123 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/typeck.c | 4 ++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/init/ptrfn1.C | 12 ++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 gcc/testsuite/g++.dg/init/ptrfn1.C 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 + + PR c++/29016 + * typeck.c (build_unary_op): Don't form an ADDR_EXPR around a + BASELINK. + 2006-09-21 Lee Millward 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 + + PR c++/29016 + * g++.dg/init/ptrfn1.C: New test. + 2006-09-21 Lee Millward 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}; + -- 2.7.4