git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jason Merrill 2013-01-31 11:34:14 -05:00 committed by Jason Merrill
parent 90b10decd8
commit b5fbde9215
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/cp/ChangeLog
View File

@ -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> 2013-01-29 Jason Merrill <jason@redhat.com>
PR libstdc++/54314 PR libstdc++/54314

4
gcc/cp/typeck.c
View File

@ -3176,9 +3176,7 @@ get_member_function_from_ptrfunc (tree *instance_ptrptr, tree function,
e3 = pfn_from_ptrmemfunc (function); e3 = pfn_from_ptrmemfunc (function);
delta = delta_from_ptrmemfunc (function); delta = delta_from_ptrmemfunc (function);
idx = build1 (NOP_EXPR, vtable_index_type, e3); idx = build1 (NOP_EXPR, vtable_index_type, e3);
if (nonvirtual) switch (TARGET_PTRMEMFUNC_VBIT_LOCATION)
e1 = integer_zero_node;
else switch (TARGET_PTRMEMFUNC_VBIT_LOCATION)
{ {
case ptrmemfunc_vbit_in_pfn: case ptrmemfunc_vbit_in_pfn:
e1 = cp_build_binary_op (input_location, e1 = cp_build_binary_op (input_location,