From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id 96E263858403; Mon, 12 Sep 2022 20:29:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 96E263858403 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1663014599; bh=vYiPC3LoNz34c/NQZeM8exp8UTmdLEXe5YRQHm174tk=; h=From:To:Subject:Date:From; b=PC08PdSZjZl+AtfeelwZv6o6hwSeRepd0kG6wkWmCgVZY1BWH6Ab3Ma7SD4FAFF1f Po9nAkl1fh1LnQoFrJYLxzmwJzT8hBnBWy69os4NAVeHBKZAFjVeM9hMQMnvz+LM6v 4XX/JbhW2tKOog7o/UsZOS8cjN5uL4B1ryb5kk9s= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jason Merrill To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-8758] c++: auto member function and auto variable [PR106893] X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: f323610375f4f87098f98b501ab01d033c930558 X-Git-Newrev: 999638cb7b126d33d1ea6548c69ba387b7d7a270 Message-Id: <20220912202959.96E263858403@sourceware.org> Date: Mon, 12 Sep 2022 20:29:59 +0000 (GMT) List-Id: https://gcc.gnu.org/g:999638cb7b126d33d1ea6548c69ba387b7d7a270 commit r12-8758-g999638cb7b126d33d1ea6548c69ba387b7d7a270 Author: Jason Merrill Date: Mon Sep 12 13:47:34 2022 -0400 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. Diff: --- gcc/cp/decl.cc | 3 +++ gcc/testsuite/g++.dg/cpp1y/auto-fn65.C | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc index 9f78c500a15..cd1522f9a9f 100644 --- a/gcc/cp/decl.cc +++ b/gcc/cp/decl.cc @@ -8137,6 +8137,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 (VAR_P (decl) && 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 00000000000..78bb004303b --- /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 +struct CoordTraits +{ + static auto GetX(T const &p) { return 1; } +}; +typedef CoordTraits Traits; +static constexpr auto GetX = Traits::GetX;