diff options
| -rw-r--r-- | gcc/cp/pt.cc | 20 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/fn-ptr3.C | 28 |
2 files changed, 44 insertions, 4 deletions
diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index b2b1a5d1ec6..38c138bd835 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -20926,10 +20926,22 @@ tsubst_copy_and_build (tree t, } /* Remember that there was a reference to this entity. */ - if (function != NULL_TREE - && DECL_P (function) - && !mark_used (function, complain) && !(complain & tf_error)) - RETURN (error_mark_node); + if (function != NULL_TREE) + { + tree inner = function; + if (TREE_CODE (inner) == ADDR_EXPR + && TREE_CODE (TREE_OPERAND (inner, 0)) == FUNCTION_DECL) + /* We should already have called mark_used when taking the + address of this function, but do so again anyway to make + sure it's odr-used: at worst this is a no-op, but if we + obtained this FUNCTION_DECL as part of ahead-of-time overload + resolution then that call to mark_used wouldn't have marked it + odr-used yet (53164). */ + inner = TREE_OPERAND (inner, 0); + if (DECL_P (inner) + && !mark_used (inner, complain) && !(complain & tf_error)) + RETURN (error_mark_node); + } if (!maybe_fold_fn_template_args (function, complain)) return error_mark_node; diff --git a/gcc/testsuite/g++.dg/template/fn-ptr3.C b/gcc/testsuite/g++.dg/template/fn-ptr3.C new file mode 100644 index 00000000000..4c651f124f6 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/fn-ptr3.C @@ -0,0 +1,28 @@ +// PR c++/53164 +// PR c++/105848 +// { dg-do link } + +template<class T> +void f(T) { } + +template<void (*P)(int)> +struct A { + static void wrap() { + P(0); + } +}; + +template<void (*P)(char)> +void wrap() { + P(0); +} + +template<int> +void g() { + A<f>::wrap(); + wrap<f>(); +} + +int main() { + g<0>(); +} |