diff options
| author | Jason Merrill <jason@redhat.com> | 2022-09-12 13:47:34 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2022-09-12 15:46:59 -0400 |
| commit | 03381beccb52c0e2c15da3b8b8dfa3bb6eb71df9 (patch) | |
| tree | 3a8367006366573d5bff11efa75bdced4df166b8 /gcc | |
| parent | 6bcca5f642eb950a3cef024ea49a35e4792306f6 (diff) | |
| download | gcc-03381beccb52c0e2c15da3b8b8dfa3bb6eb71df9.zip gcc-03381beccb52c0e2c15da3b8b8dfa3bb6eb71df9.tar.gz gcc-03381beccb52c0e2c15da3b8b8dfa3bb6eb71df9.tar.bz2 | |
c++: auto member function and auto variable [PR106893]
As with PR105623, we need to call mark_single_function sooner to
resolve the type of a BASELINK.
PR c++/106893
PR c++/90451
gcc/cp/ChangeLog:
* decl.cc (cp_finish_decl): Call mark_single_function.
gcc/testsuite/ChangeLog:
* g++.dg/cpp1y/auto-fn65.C: New test.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/decl.cc | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/auto-fn65.C | 10 |
2 files changed, 13 insertions, 0 deletions
diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc index 4665a29..88f283b 100644 --- a/gcc/cp/decl.cc +++ b/gcc/cp/decl.cc @@ -8140,6 +8140,9 @@ cp_finish_decl (tree decl, tree init, bool init_const_expr_p, d_init = build_x_compound_expr_from_list (d_init, ELK_INIT, tf_warning_or_error); d_init = resolve_nondeduced_context (d_init, tf_warning_or_error); + /* Force auto deduction now. Use tf_none to avoid redundant warnings + on deprecated-14.C. */ + mark_single_function (d_init, tf_none); } enum auto_deduction_context adc = adc_variable_type; if (DECL_DECOMPOSITION_P (decl)) diff --git a/gcc/testsuite/g++.dg/cpp1y/auto-fn65.C b/gcc/testsuite/g++.dg/cpp1y/auto-fn65.C new file mode 100644 index 0000000..78bb004 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/auto-fn65.C @@ -0,0 +1,10 @@ +// PR c++/106893 +// { dg-do compile { target c++14 } } + +template <typename T> +struct CoordTraits +{ + static auto GetX(T const &p) { return 1; } +}; +typedef CoordTraits<int> Traits; +static constexpr auto GetX = Traits::GetX; |