From patchwork Wed Apr 6 15:11:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 52680 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1C8EB38515F6 for ; Wed, 6 Apr 2022 15:12:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1C8EB38515F6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1649257969; bh=yunHP2CYX14UACt+2EuQPYxZ2zeELm1ZGMk7GgWKslA=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=yreWZF0wNZsAFwHkR90YxCkf7e1gPSPa/qvd5kS2pKHfGEJ1sBubWtsc/PRkyD67C Tg23jm2dn4fVA9glUhVPht6aonTDS+XLc4PRex2ZNNUHL4aRtRhKaXDHE11vpHHkoJ b77kIhOakP6bc66gDblnXF/dz3q4lJ+8Y4R/i83g= 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 [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id D3712384602A for ; Wed, 6 Apr 2022 15:12:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D3712384602A Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-414-gEH9k2GzMAePbGXvyvFjIg-1; Wed, 06 Apr 2022 11:12:02 -0400 X-MC-Unique: gEH9k2GzMAePbGXvyvFjIg-1 Received: by mail-qt1-f197.google.com with SMTP id h11-20020a05622a170b00b002e0769b9018so3124697qtk.14 for ; Wed, 06 Apr 2022 08:12:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=yunHP2CYX14UACt+2EuQPYxZ2zeELm1ZGMk7GgWKslA=; b=SMXK6jtMKT+wM/hA+0yew0IHrAGOgSwo8KvYKcdvSs3O7cZCCQryHidWoWE0t0jHWX noAKMMawg+DCknzs+LjNmIZfXRzbW9jMTnHmcrMWl99y6s0IFICi0E7R5+WSHbZ7bfK6 GiaHm02NmGqwEJACMQz0vd+9KlLXqpV16cPkSpX7CVixP0rOKyHLBZmuxF5dTKcEiJMs szxCcAaaoP+Pahdj5QHmftCtv6RlKAacXzGfSo1OpJZID0M6qolnnB+QKkfl50bHj1oo k1mEIvZ8ST/kdsVNYmZosXXuDjYjCgjJULBCcUl2D8Jl1epctM/OGcha4lAagzgaOloc PoEA== X-Gm-Message-State: AOAM531102UTE8+t9McPpkAdCbtn/Lk+VSw1XP3xm+oSOc91V9JTwEex KX7SuPRkso4alJDZc+YjJW+MWtF+TKKXoIplCoo2/gIUU1I6vPOVgkHpKds5zfkMv/hM44jbc/m wOEumPE0qzz2GXApec/wsci8rm2yQ/PgLKjdfaUp6+iJQqfmA2GfMz2+9tXfhfI4w4CM= X-Received: by 2002:a05:622a:1802:b0:2e1:abdb:e522 with SMTP id t2-20020a05622a180200b002e1abdbe522mr7838599qtc.144.1649257921352; Wed, 06 Apr 2022 08:12:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2N7CxeQMtrTLhL6qULEX1QP7TXr8AxBgpmbhiduK07iibu41f90Q16zSihxMReCCyk8od4A== X-Received: by 2002:a05:622a:1802:b0:2e1:abdb:e522 with SMTP id t2-20020a05622a180200b002e1abdbe522mr7838577qtc.144.1649257921038; Wed, 06 Apr 2022 08:12:01 -0700 (PDT) Received: from localhost.localdomain (ool-18e40894.dyn.optonline.net. [24.228.8.148]) by smtp.gmail.com with ESMTPSA id 145-20020a370897000000b0067b30c65415sm9772781qki.75.2022.04.06.08.12.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 08:12:00 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH] c++: respect complain for -Wctad-maybe-unsupported [PR105143] Date: Wed, 6 Apr 2022 11:11:58 -0400 Message-Id: <20220406151158.3381793-1-ppalka@redhat.com> X-Mailer: git-send-email 2.36.0.rc0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-14.3 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_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Patrick Palka via Gcc-patches From: Patrick Palka Reply-To: Patrick Palka Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" We were attempting to issue a -Wctad-maybe-unsupported warning even when complain=tf_none, which led to a crash in the first testcase below and a bogus error during SFINAE in the second testcase. Bootstrapped and regtested on x86_64-pc-linux-gnu, does this look OK for trunk/11? PR c++/105143 gcc/cp/ChangeLog: * pt.cc (do_class_deduction): Check complain before issuing a -Wctad-maybe-unsupported warning. gcc/testsuite/ChangeLog: * g++.dg/cpp2a/nodiscard1.C: New test. * g++.dg/warn/Wctad-maybe-unsupported4.C: New test. --- gcc/cp/pt.cc | 2 +- gcc/testsuite/g++.dg/cpp2a/nodiscard1.C | 13 +++++++++++++ .../g++.dg/warn/Wctad-maybe-unsupported4.C | 12 ++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp2a/nodiscard1.C create mode 100644 gcc/testsuite/g++.dg/warn/Wctad-maybe-unsupported4.C diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 1f0231f70e6..1805fa68440 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -30075,7 +30075,7 @@ do_class_deduction (tree ptype, tree tmpl, tree init, /* If CTAD succeeded but the type doesn't have any explicit deduction guides, this deduction might not be what the user intended. */ - if (fndecl != error_mark_node && !any_dguides_p) + if ((complain & tf_warning) && fndecl != error_mark_node && !any_dguides_p) { if ((!DECL_IN_SYSTEM_HEADER (fndecl) || global_dc->dc_warn_system_headers) diff --git a/gcc/testsuite/g++.dg/cpp2a/nodiscard1.C b/gcc/testsuite/g++.dg/cpp2a/nodiscard1.C new file mode 100644 index 00000000000..c3c5094b619 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/nodiscard1.C @@ -0,0 +1,13 @@ +// PR c++/105143 +// { dg-do compile { target c++20 } } +// We used to crash here with "Error reporting routines re-entered". + +template struct A { }; + +template using type = int; + +template [[nodiscard]] type get(); + +int main() { + get<{}>(); // { dg-warning "nodiscard" } +} diff --git a/gcc/testsuite/g++.dg/warn/Wctad-maybe-unsupported4.C b/gcc/testsuite/g++.dg/warn/Wctad-maybe-unsupported4.C new file mode 100644 index 00000000000..0d0e2fb45eb --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/Wctad-maybe-unsupported4.C @@ -0,0 +1,12 @@ +// PR c++/105143 +// { dg-do compile { target c++17 } } +// { dg-additional-options "-Werror=ctad-maybe-unsupported" } + +template struct A { }; + +template class TT> auto f(...) -> decltype(TT()); // #1 +template class TT> void f(int); // #2 + +int main() { + f(0); // Calls #2 without issuing a -Wctad-maybe-unsupported diagnostic. +}