diff options
| author | Jason Merrill <jason@redhat.com> | 2013-01-31 11:34:14 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2013-01-31 11:34:14 -0500 |
| commit | b5fbde9215da5efaa03cfd17fbce0ca3346583e5 (patch) | |
| tree | 77399b70af7f391ee80255286fcc5efd38338cc4 /gcc | |
| parent | 90b10decd8e668eacfce1b1ed8c31453702acbfb (diff) | |
| download | gcc-b5fbde9215da5efaa03cfd17fbce0ca3346583e5.zip gcc-b5fbde9215da5efaa03cfd17fbce0ca3346583e5.tar.gz gcc-b5fbde9215da5efaa03cfd17fbce0ca3346583e5.tar.bz2 | |
re PR regression/56162 (PASS->FAIL: g++.old-deja/g++.mike/pmf1.C -std=c++11 execution test (occurs 2 times))
PR c++/56162
PR c++/56104
* typeck.c (get_member_function_from_ptrfunc): Fix
ptrmemfunc_vbit_in_delta case.
From-SVN: r195614
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 65157e1..7bd5402 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2013-01-31 Jason Merrill <jason@redhat.com> + + PR c++/56162 + PR c++/56104 + * typeck.c (get_member_function_from_ptrfunc): Fix + ptrmemfunc_vbit_in_delta case. + 2013-01-29 Jason Merrill <jason@redhat.com> PR libstdc++/54314 diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index bfac394..688c266 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -3176,9 +3176,7 @@ get_member_function_from_ptrfunc (tree *instance_ptrptr, tree function, e3 = pfn_from_ptrmemfunc (function); delta = delta_from_ptrmemfunc (function); idx = build1 (NOP_EXPR, vtable_index_type, e3); - if (nonvirtual) - e1 = integer_zero_node; - else switch (TARGET_PTRMEMFUNC_VBIT_LOCATION) + switch (TARGET_PTRMEMFUNC_VBIT_LOCATION) { case ptrmemfunc_vbit_in_pfn: e1 = cp_build_binary_op (input_location, |