From patchwork Wed Apr 14 18:59:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 1466389 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=N93ahufF; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FLBbk09Wzz9sW4 for ; Thu, 15 Apr 2021 04:59:28 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5D4743851C2B; Wed, 14 Apr 2021 18:59:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5D4743851C2B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1618426766; bh=Ta2jnkRQp/S/jTHaM71KjR4+5e4DZgE+BTvq4qpnY48=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=N93ahufFX0Xkf9xo7RxdoLRYwvVqkjhlkKVFt8c8nywKt5SjWt1qh8XrmVpRZqNmJ ZaBYWslfQ745gP9+vSc7ESlUR54uYF/zwJGaZlwcIz7seXBqW460d6piTIvprBlrch XAqOIPweMB1OnZP5NQf5lrgQu2QhyD3aD6w/jr9E= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id F3D3E3851C2B for ; Wed, 14 Apr 2021 18:59:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org F3D3E3851C2B Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-437-lmXGWMkkMfCZwMDtrDLBpw-1; Wed, 14 Apr 2021 14:59:21 -0400 X-MC-Unique: lmXGWMkkMfCZwMDtrDLBpw-1 Received: by mail-qt1-f199.google.com with SMTP id p15-20020a05622a00cfb02901ae13813340so2546937qtw.15 for ; Wed, 14 Apr 2021 11:59:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Ta2jnkRQp/S/jTHaM71KjR4+5e4DZgE+BTvq4qpnY48=; b=ESem1C6K39RAorILHuPdRtwGH4ZXki+g4H1hkxDgB/7izY/rSToSWCK67lSIr9GTgK QWqMbQ6QB4fEsaI+UdmxrnxABUgbnWrBiwgvJ4kS0sROfCIM7gcumGR+76pzMYf3s+Ss keyQPBRTrJ3hpd2i093sMDYlJJO0f1MUrisqhM76H5SE5PFy0B+rq5puLCnSXlZkooqK nOQRGAjhuQjGmGQxmFE+64+OLP3/MspecvrvoUpjk9V9wkiAJ53SEqfVxGUsFEKmy06R fyoJ2LEjP/0bp2Ee1SwTPTUTITG0r6G+5N05BWUILZ1ajRCCR54rqdPI06rUoCSr0Qlx CU2g== X-Gm-Message-State: AOAM531MB+D9FJVCLHmEJK4MUUFcB8kSEMAemvNRhvuO0kP2XXr1IL5y 7jTHRwotzZLPmtwpKeiR/Tl66E7b6DBeA1fv9/UWn7usDF7bPKO1b4w/XJP1dNRVXLKPXqk/Blv xqDZmXcYyjlSjGo7RlEAgR7iwdBNBF8KrdYqt8r1yeeFqWXWilCyGQlGa6/mJtAKdQQ== X-Received: by 2002:a37:695:: with SMTP id 143mr26283182qkg.217.1618426761075; Wed, 14 Apr 2021 11:59:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwLyQx8vlrPOzy97hqYGbGK+jtsDUhrgxETGKXEyZd/a9DJeFFjv4XobEt4fGwv9cMV7xKdEA== X-Received: by 2002:a37:695:: with SMTP id 143mr26283152qkg.217.1618426760708; Wed, 14 Apr 2021 11:59:20 -0700 (PDT) Received: from barrymore.redhat.com (209-6-216-142.s141.c3-0.smr-cbr1.sbo-smr.ma.cable.rcncustomer.com. [209.6.216.142]) by smtp.gmail.com with ESMTPSA id t198sm239965qke.44.2021.04.14.11.59.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Apr 2021 11:59:19 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: premature overload resolution redux [PR100078] Date: Wed, 14 Apr 2021 14:59:18 -0400 Message-Id: <20210414185918.572987-1-jason@redhat.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-15.5 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, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jason Merrill via Gcc-patches From: Jason Merrill Reply-To: Jason Merrill Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" My patch for PR93085 didn't consider that a default template argument can also make a template dependent. Tested x86_64-pc-linux-gnu, applying to trunk. gcc/cp/ChangeLog: PR c++/100078 PR c++/93085 * pt.c (uses_outer_template_parms): Also look at default template argument. gcc/testsuite/ChangeLog: PR c++/100078 * g++.dg/template/dependent-tmpl2.C: New test. --- gcc/cp/pt.c | 5 +++++ gcc/testsuite/g++.dg/template/dependent-tmpl2.C | 10 ++++++++++ 2 files changed, 15 insertions(+) create mode 100644 gcc/testsuite/g++.dg/template/dependent-tmpl2.C base-commit: 9b53edc796d284b6adec7f2996772dbddf4c341e diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index f488a5a8c12..0f119a55272 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -10856,6 +10856,7 @@ uses_outer_template_parms (tree decl) for (int i = TREE_VEC_LENGTH (parms) - 1; i >= 0; --i) { tree parm = TREE_VALUE (TREE_VEC_ELT (parms, i)); + tree defarg = TREE_PURPOSE (TREE_VEC_ELT (parms, i)); if (TREE_CODE (parm) == PARM_DECL && for_each_template_parm (TREE_TYPE (parm), template_parm_outer_level, @@ -10864,6 +10865,10 @@ uses_outer_template_parms (tree decl) if (TREE_CODE (parm) == TEMPLATE_DECL && uses_outer_template_parms (parm)) return true; + if (defarg + && for_each_template_parm (defarg, template_parm_outer_level, + &depth, NULL, /*nondeduced*/true)) + return true; } } tree ci = get_constraints (decl); diff --git a/gcc/testsuite/g++.dg/template/dependent-tmpl2.C b/gcc/testsuite/g++.dg/template/dependent-tmpl2.C new file mode 100644 index 00000000000..040ddb47ee6 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/dependent-tmpl2.C @@ -0,0 +1,10 @@ +// PR c++/100078 +// { dg-do compile { target c++11 } } + +template struct enable_if; +template struct HashMapBucket { + template + static typename enable_if::type selectStructure() { + selectStructure(); + } +};