From patchwork Tue Sep 13 11:45:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 1677265 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.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=JcT5B9b/; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MRhW663YWz1ynm for ; Tue, 13 Sep 2022 21:46:09 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 970D838515E9 for ; Tue, 13 Sep 2022 11:46:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 970D838515E9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1663069566; bh=x83+eGX6VhN32JnwVfJ0y+C9YDMJttKQgeBu8ZVx/uM=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=JcT5B9b/2QSJ2p/QFjwFD6kDSUnca6wj0bYq6c6fw2xfaYlPsoplIYi1hTmb7FP9Z YWHeVa1cP9rpv0rouLjKku3F3IGQMZbUwvHGwU0Fct2b7scduib1uhkKY80hX5RPBS RBc+qNDda34diP7k/85EzihgBd54a3g9Cb5CZD3c= 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 AC4263856DD6 for ; Tue, 13 Sep 2022 11:45:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AC4263856DD6 Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-278-GJk949AmMiqpPaXmkj7Yww-1; Tue, 13 Sep 2022 07:45:43 -0400 X-MC-Unique: GJk949AmMiqpPaXmkj7Yww-1 Received: by mail-qk1-f198.google.com with SMTP id h8-20020a05620a284800b006b5c98f09fbso9999797qkp.21 for ; Tue, 13 Sep 2022 04:45:43 -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:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=x83+eGX6VhN32JnwVfJ0y+C9YDMJttKQgeBu8ZVx/uM=; b=oisrNa1cUsQ8JSkKaHkCPFRXwiNru68yfp+jqnZfHytuWD6jSQQZVyckSI3BxE/CZ1 pqAh5Ao8ZVC+14vtaW9Pa3sD/75Xy9RKdc07uVR98HtDiCBIvwH9uC7LVJ/NEdnM+5/x 8qLPkwygL3/6LANxivfwY9zUc8RJsY0V5fbQyHjb9pqx5O6YHhIGUDkGpKmbjBYWlH+w ajNW8kgXFplj2fK0tiXAmvzX8Tzg6Wf6L+YHAHMR8mEDjncZ4YFfKL25dEPsTY9s+3VF g02Lwt8h7QrHwtnr1r5UHpwxjab5Kusa8/Ch3UD/LrLYcgyexipTWjbKX6kZnLtVYLhH /z/A== X-Gm-Message-State: ACgBeo1OsD8X4iN9m8MV34FFjg8eTw2S+nYJDsrXBAVvuZ0Tl72e5FkN RTIQD2H0ZDNqHXyrLX3wHw6XaxxxuXZlTZOPeo9tvB1K/s3ooAZGL5QT9XdjMj240R4vEqVg8b2 HJNs3OBCO89VVYelzpu6a+3oR7C8F17R28+akzspnndEbJOW0RcwgyfdHRaW0ceDAlzA= X-Received: by 2002:a05:620a:ed0:b0:6cb:eb81:e039 with SMTP id x16-20020a05620a0ed000b006cbeb81e039mr15323435qkm.622.1663069542715; Tue, 13 Sep 2022 04:45:42 -0700 (PDT) X-Google-Smtp-Source: AA6agR6R184J6I+7zvJdJoY1FV1xSQN1yTr+3LGt7dDyPFlUSREHG/pFdkFP2JIkSimg3iJMT+Ojvg== X-Received: by 2002:a05:620a:ed0:b0:6cb:eb81:e039 with SMTP id x16-20020a05620a0ed000b006cbeb81e039mr15323410qkm.622.1663069542351; Tue, 13 Sep 2022 04:45:42 -0700 (PDT) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id o11-20020ac8698b000000b00342f844e30fsm8447554qtq.31.2022.09.13.04.45.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Sep 2022 04:45:41 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH] c++: some missing-SFINAE fixes Date: Tue, 13 Sep 2022 07:45:38 -0400 Message-Id: <20220913114538.2741902-1-ppalka@redhat.com> X-Mailer: git-send-email 2.37.3.542.gdd3f6c4cae MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-14.4 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 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" It looks like we aren't respecting SFINAE for: * an invalid/non-constant conditional explicit-specifier * a non-constant conditional noexcept-specifier * a non-constant argument to __integer_pack This patch fixes these issues in the usual way, by passing complain and propagating error_mark_node appropriately. Bootstrapped and regtested on x86_64-pc-linux-gnu, does this look OK for trunk? gcc/cp/ChangeLog: * decl.cc (build_explicit_specifier): Pass complain to cxx_constant_value. * except.cc (build_noexcept_spec): Likewise. * pt.cc (expand_integer_pack): Likewise. (tsubst_function_decl): Propagate error_mark_node returned from build_explicit_specifier. gcc/testsuite/ChangeLog: * g++.dg/cpp1z/noexcept-type26.C: New test. * g++.dg/cpp2a/explicit19.C: New test. * g++.dg/ext/integer-pack6.C: New test. --- gcc/cp/decl.cc | 2 +- gcc/cp/except.cc | 2 +- gcc/cp/pt.cc | 6 ++++-- gcc/testsuite/g++.dg/cpp1z/noexcept-type26.C | 12 ++++++++++++ gcc/testsuite/g++.dg/cpp2a/explicit19.C | 12 ++++++++++++ gcc/testsuite/g++.dg/ext/integer-pack6.C | 13 +++++++++++++ 6 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp1z/noexcept-type26.C create mode 100644 gcc/testsuite/g++.dg/cpp2a/explicit19.C create mode 100644 gcc/testsuite/g++.dg/ext/integer-pack6.C diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc index 936f1cf0197..5404d7e084c 100644 --- a/gcc/cp/decl.cc +++ b/gcc/cp/decl.cc @@ -18557,7 +18557,7 @@ build_explicit_specifier (tree expr, tsubst_flags_t complain) expr = build_converted_constant_bool_expr (expr, complain); expr = instantiate_non_dependent_expr (expr, complain); - expr = cxx_constant_value (expr); + expr = cxx_constant_value (expr, NULL_TREE, complain); return expr; } diff --git a/gcc/cp/except.cc b/gcc/cp/except.cc index 7fdbc747c22..4d7f0ce102d 100644 --- a/gcc/cp/except.cc +++ b/gcc/cp/except.cc @@ -1257,7 +1257,7 @@ build_noexcept_spec (tree expr, tsubst_flags_t complain) { expr = build_converted_constant_bool_expr (expr, complain); expr = instantiate_non_dependent_expr (expr, complain); - expr = cxx_constant_value (expr); + expr = cxx_constant_value (expr, NULL_TREE, complain); } if (TREE_CODE (expr) == INTEGER_CST) { diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 1c6f4b84612..f16f5ffca20 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -3869,7 +3869,7 @@ expand_integer_pack (tree call, tree args, tsubst_flags_t complain, else { hi = instantiate_non_dependent_expr (hi, complain); - hi = cxx_constant_value (hi); + hi = cxx_constant_value (hi, NULL_TREE, complain); int len = valid_constant_size_p (hi) ? tree_to_shwi (hi) : -1; /* Calculate the largest value of len that won't make the size of the vec @@ -14312,7 +14312,9 @@ tsubst_function_decl (tree t, tree args, tsubst_flags_t complain, /*function_p=*/false, /*i_c_e_p=*/true); spec = build_explicit_specifier (spec, complain); - if (instantiation_dependent_expression_p (spec)) + if (spec == error_mark_node) + return error_mark_node; + else if (instantiation_dependent_expression_p (spec)) store_explicit_specifier (r, spec); else { diff --git a/gcc/testsuite/g++.dg/cpp1z/noexcept-type26.C b/gcc/testsuite/g++.dg/cpp1z/noexcept-type26.C new file mode 100644 index 00000000000..73058395f0a --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1z/noexcept-type26.C @@ -0,0 +1,12 @@ +// Verify a non-constant conditional noexcept-specifier of a function type +// is a SFINAE error. +// { dg-do compile { target c++17 } } + +template void f(void() noexcept(T::value)) = delete; +template void f(...); + +struct B { static bool value; }; + +int main() { + f(nullptr); +} diff --git a/gcc/testsuite/g++.dg/cpp2a/explicit19.C b/gcc/testsuite/g++.dg/cpp2a/explicit19.C new file mode 100644 index 00000000000..47903813680 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/explicit19.C @@ -0,0 +1,12 @@ +// Verify a conditional explicit-specifier is a SFINAE context. +// { dg-do compile { target c++20 } } + +struct A { + template explicit(T::value) A(T) = delete; + A(...); +}; + +struct B { static bool value; }; + +A x(0); +A y(B{}); diff --git a/gcc/testsuite/g++.dg/ext/integer-pack6.C b/gcc/testsuite/g++.dg/ext/integer-pack6.C new file mode 100644 index 00000000000..7e16bc44b40 --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/integer-pack6.C @@ -0,0 +1,13 @@ +// Verify a non-constant argument to __integer_pack is a SFINAE error. +// { dg-do compile { target c++11 } } + +template struct A { }; + +template auto f(int) -> A<__integer_pack(T::value)...> = delete; +template void f(...); + +struct B { static int value; }; + +int main() { + f(0); +}