From patchwork Tue Jan 19 03:55:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 569786 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 8E6C2140326 for ; Tue, 19 Jan 2016 14:56:02 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=ciaaY7ul; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id; q=dns; s=default; b=LxYfoczUKfSL WLFrHDC9QTg9798nW9oYkjjviJLgFjTwRbc1UUOYBysqVcS6SCF20bv3Uebm8Sey 3Cc+cn7BUc8dCqM/GTj94OB2YZD5/YnxZg0aHxxYbf0tTiI7ucKZuJBtPBLBYhWA eusk5DKKN/wubK7t0zk007gxRYsPtD4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id; s=default; bh=szSKvjvkXthhBYsaTJ aS/qtW7F8=; b=ciaaY7ulDF4FyAitwVXKjIlMwHMb+MBUiOdJY35E6qvMoaLSXr SzLW4D86/bLPrCpJ5LfFVMBaowraHINCMrl/0eZ4UOW6NadR0F1UTAk08n1cIZj3 Qno7IsomvtjLOZOGW4iKPR4QUc7lDh+lJ/Vvc2TtwmlpIL1diRSGOxhBk= Received: (qmail 89253 invoked by alias); 19 Jan 2016 03:55:53 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 89241 invoked by uid 89); 19 Jan 2016 03:55:52 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 spammy=Tag, adl X-HELO: mail-qk0-f172.google.com Received: from mail-qk0-f172.google.com (HELO mail-qk0-f172.google.com) (209.85.220.172) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Tue, 19 Jan 2016 03:55:51 +0000 Received: by mail-qk0-f172.google.com with SMTP id b66so25386576qkf.3 for ; Mon, 18 Jan 2016 19:55:51 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=BTEe2BUTTjL1MI33PD5jhaRu6UmRw2u2Z2pEmYEYPbc=; b=Hsk1qWcclnKrDyyl8TEVBb9e3pOdzrRM3E9xjbtrwyMMkj8xThjO6FDquM1AiwTwFE ty2CL9lxoksDGwWoEllqIgi/x/0HPmQ73wLeDOFfSgkUoMfSGNyfWRDZ1MLxZFZ/6B56 dPEZKm0ppVVE8Y1W5HQUT5iepXma2/N4cyEhVLQpv/gWnkoPoDrMu2i6G33Ip+vfrYPi hmD6wslFBb9z79sZWYyzKdSZZOJZDVlxGCYN0qFv+I7+LKldGm+myFwgzbD868m0dd/Y Pw/eqKf/d+9gCxGj1rovhBxaGrNi+ZpzU/UEqp3x4prT5g1O9nn2gmHutOK59RBTFBGa pqBg== X-Gm-Message-State: ALoCoQlGGzfpm5PKVG7swSv7rXXLyeFKwo5nmcJFPxqrwFOI7HdoszJ3WVrSz+Oz1csbwQkzKVPeJMfTuvIhRobVck7XSlK9yA== X-Received: by 10.55.76.15 with SMTP id z15mr35258436qka.32.1453175749235; Mon, 18 Jan 2016 19:55:49 -0800 (PST) Received: from localhost.localdomain (ool-4353abbc.dyn.optonline.net. [67.83.171.188]) by smtp.gmail.com with ESMTPSA id 130sm11348828qhk.45.2016.01.18.19.55.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Jan 2016 19:55:48 -0800 (PST) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: jason@redhat.com, Patrick Palka Subject: [PATCH] Fix PR c++/69283 (auto deduction fails when ADL is required) Date: Mon, 18 Jan 2016 22:55:28 -0500 Message-Id: <1453175728-13354-1-git-send-email-patrick@parcs.ath.cx> mark_used is wrongly diagnosing a use of a TEMPLATE_DECL (e.g. the call to f1 in function f3 of auto-fn29.C below) for having an undeduced 'auto' return type. This doesn't make sense, because an 'auto' used inside a template doesn't get deduced until after the template is instantiated. So for a TEMPLATE_DECL we shouldn't diagnose a use of undeduced 'auto' here. After instantiation, presumably we will call mark_used on the resulting FUNCTION_DECL which will check for undeduced auto appropriately. Bootstrapped and regtested on x86_64-pc-linux-gnu, no new regressions. Is this OK to commit? gcc/cp/ChangeLog: PR c++/69283 PR c++/67835 * decl2.c (mark_used): Don't complain about an undeduced 'auto' in a TEMPLATE_DECL. gcc/testsuite/ChangeLog: PR c++/69283 PR c++/67835 * g++.dg/cpp1y/auto-fn29.C: New test. * g++.dg/cpp1y/auto-fn30.C: New test. * g++.dg/cpp1y/auto-fn31.C: New test. --- gcc/cp/decl2.c | 4 +++- gcc/testsuite/g++.dg/cpp1y/auto-fn29.C | 23 +++++++++++++++++++++++ gcc/testsuite/g++.dg/cpp1y/auto-fn30.C | 21 +++++++++++++++++++++ gcc/testsuite/g++.dg/cpp1y/auto-fn31.C | 22 ++++++++++++++++++++++ 4 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp1y/auto-fn29.C create mode 100644 gcc/testsuite/g++.dg/cpp1y/auto-fn30.C create mode 100644 gcc/testsuite/g++.dg/cpp1y/auto-fn31.C diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index a7212ca0..849375f 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -5112,7 +5112,9 @@ mark_used (tree decl, tsubst_flags_t complain) || DECL_LANG_SPECIFIC (decl) == NULL || DECL_THUNK_P (decl)) { - if (!processing_template_decl && type_uses_auto (TREE_TYPE (decl))) + if (!processing_template_decl + && TREE_CODE (decl) != TEMPLATE_DECL + && type_uses_auto (TREE_TYPE (decl))) { if (complain & tf_error) error ("use of %qD before deduction of %", decl); diff --git a/gcc/testsuite/g++.dg/cpp1y/auto-fn29.C b/gcc/testsuite/g++.dg/cpp1y/auto-fn29.C new file mode 100644 index 0000000..cd10460 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/auto-fn29.C @@ -0,0 +1,23 @@ +// PR c++/69283 +// { dg-do compile { target c++14 } } + +namespace Ape { + struct Type {}; + + template + auto f1(T const& v){ + return true; + } +} + +namespace Baboon { + template + bool f3(T const& v){ + return f1(v); + } +} + +int main(){ + Ape::Type x; + Baboon::f3(x); +} diff --git a/gcc/testsuite/g++.dg/cpp1y/auto-fn30.C b/gcc/testsuite/g++.dg/cpp1y/auto-fn30.C new file mode 100644 index 0000000..e005e6e --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/auto-fn30.C @@ -0,0 +1,21 @@ +// PR c++/67835 +// { dg-do compile { target c++14 } } + +template +auto g(Tag tag, T x) { + return f(tag, x); +} + +namespace abc { +struct tag {}; + +struct A {}; + +template +auto f(tag, T x) { return x; } +} + +int main() { + g(abc::tag(), abc::A()); + return 0; +} diff --git a/gcc/testsuite/g++.dg/cpp1y/auto-fn31.C b/gcc/testsuite/g++.dg/cpp1y/auto-fn31.C new file mode 100644 index 0000000..7849632 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/auto-fn31.C @@ -0,0 +1,22 @@ +// { dg-do compile { target c++14 } } + +namespace Ape { + struct Type {}; + + template + auto f1(T const& v){ + return f1(v); // { dg-error "auto" } + } +} + +namespace Baboon { + template + void f3(T const& v){ + f1(v); + } +} + +int main(){ + Ape::Type x; + Baboon::f3(x); +}