From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 4ADF73856DE0 for ; Mon, 12 Sep 2022 19:46:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4ADF73856DE0 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1663012014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VJ3RV0oOdK+UVRipVDLWAa4zxDol2glvEs31mrukbM4=; b=FL4z92+MUn0Qcmod5b2clIfooXuXOCxIzWezTgbUr8RUoSXn6k0WnBqHL7DDczMa1YhRd2 Vt9PLsMuQ/2VEUHipsav27bTbJ6UHJGR1pjc3EJSqDDueSEPb7uWPtyPkU6X9wB9U1hYKO wMfSJClvVBMcW0WZQQ46rucfoVfZLLE= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-60-azJIBIf7NFGIBGFgtoIxGA-1; Mon, 12 Sep 2022 15:46:52 -0400 X-MC-Unique: azJIBIf7NFGIBGFgtoIxGA-1 Received: by mail-qt1-f200.google.com with SMTP id cd8-20020a05622a418800b0035bb00c5aaaso4076234qtb.7 for ; Mon, 12 Sep 2022 12:46:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date; bh=VJ3RV0oOdK+UVRipVDLWAa4zxDol2glvEs31mrukbM4=; b=MxeC0y8xF55XXX5XZ4WhZR1NeUqKbYYPqn+FzZG/NkT7vQfUcm0T6ar1Bo/CFzNDf7 gmqE6Jnd+eSKBUnQQ/WOTRFw3zpdUTXZF0ANIxd+FakA0nvztLUfBBMmZygAfxWWOMAa bSaJR0xdwEvk0wwg56YcBhfKE1QwMHYUdsjacl4b6/+qtjmqk3Yh3g1oxxt+eyiaqkJd gHmZel4Q+i+dBVggFlOvqFh3tlWZJd3FwJsVt94Pte2Oh2a8Q3mschM+5lKnBTdOHSXZ 8RgZCwpLGZJqEH/GVHeDM3qR47NNo5BayaCZ+SjoKQGaqITEGIX2A3SwhuNXM6dwpr5e Ahpw== X-Gm-Message-State: ACgBeo2In2BYh5SKK4hnEBAm6sFO/aObhQsPKYgcNYlD/47/eJB3yZzy xkCzvoou2lURM1DSDgHNlXq4VicA2c1IYVqUHTnxGgdK+v0/8Cyr1N/xQ/YgMi5h6EkqO1N3ZjH Mm6MrlTeeRwRgZnuPtMqftYj80ajlJuBtfM6uVnc1XtDO9sWKSH9CGAWKqXCA0OW0WQ== X-Received: by 2002:ad4:5dea:0:b0:4ac:6ffc:74b2 with SMTP id jn10-20020ad45dea000000b004ac6ffc74b2mr21608939qvb.78.1663012011976; Mon, 12 Sep 2022 12:46:51 -0700 (PDT) X-Google-Smtp-Source: AA6agR7UTE/Uen1vqXlPacxauCQdsQTW5HOvND66VGziQi5UbJ/jhGknaIqPWtgCqjelKUIyxJMcdA== X-Received: by 2002:ad4:5dea:0:b0:4ac:6ffc:74b2 with SMTP id jn10-20020ad45dea000000b004ac6ffc74b2mr21608904qvb.78.1663012011423; Mon, 12 Sep 2022 12:46:51 -0700 (PDT) Received: from barrymore.redhat.com (130-44-159-43.s15913.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.159.43]) by smtp.gmail.com with ESMTPSA id o7-20020a05620a228700b006b95f832aebsm793148qkh.96.2022.09.12.12.46.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Sep 2022 12:46:50 -0700 (PDT) From: Jason Merrill To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: auto member function and auto variable [PR106893] Date: Mon, 12 Sep 2022 15:46:46 -0400 Message-Id: <20220912194646.3441845-1-jason@redhat.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: As with PR105623, we need to call mark_single_function sooner to resolve the type of a BASELINK. Tested x86_64-pc-linux-gnu, applying to trunk. 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. --- gcc/cp/decl.cc | 3 +++ gcc/testsuite/g++.dg/cpp1y/auto-fn65.C | 10 ++++++++++ 2 files changed, 13 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp1y/auto-fn65.C diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc index 4665a29a24d..88f283bc4bd 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 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; base-commit: 7c989a8ed47228bdd494a2f0d1f6fdd325f953d7 prerequisite-patch-id: cc4d1e7bcdd804ea5a1a64ea9a138d9279e5eaa8 -- 2.31.1