mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-05 16:51:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

c++: tweak to (*(fn))() patch [PR104618]

Browse Source 
Other callers of mark_single_function might also want to look through these
wrapapers.

	PR c++/104618

gcc/cp/ChangeLog:

	* decl2.cc (mark_single_function): Look through parens and location
	wrapper.
	* typeck.cc (cp_build_addr_expr_1): Not here.
This commit is contained in:
Jason Merrill 2022-02-28 12:05:34 -04:00
parent b7dbe870bc
commit 03e0c807ef
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gcc/cp/decl2.cc
View File

@ -5737,6 +5737,9 @@ decl_dependent_p (tree decl)
bool
mark_single_function (tree expr, tsubst_flags_t complain)
{
expr = maybe_undo_parenthesized_ref (expr);
expr = tree_strip_any_location_wrapper (expr);
if (is_overloaded_fn (expr) == 1
&& !mark_used (expr, complain)
&& (complain & tf_error))

4
gcc/cp/typeck.cc
View File

@ -6884,9 +6884,7 @@ cp_build_addr_expr_1 (tree arg, bool strict_lvalue, tsubst_flags_t complain)
so we can just form an ADDR_EXPR with the correct type. */
if (processing_template_decl || TREE_CODE (arg) != COMPONENT_REF)
{
tree stripped_arg
= tree_strip_any_location_wrapper (maybe_undo_parenthesized_ref (arg));
if (!mark_single_function (stripped_arg, complain))
if (!mark_single_function (arg, complain))
return error_mark_node;
val = build_address (arg);
if (TREE_CODE (arg) == OFFSET_REF)