From patchwork Sun Dec 7 23:35:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Egas Ribeiro X-Patchwork-Id: 126104 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8469E43413EC for ; Sun, 7 Dec 2025 23:36:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8469E43413EC Authentication-Results: sourceware.org; dkim=pass (2048-bit key, secure) header.d=tecnico.ulisboa.pt header.i=@tecnico.ulisboa.pt header.a=rsa-sha256 header.s=mail2 header.b=ZTrW2UUz X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp1.tecnico.ulisboa.pt (smtp1.tecnico.ulisboa.pt [193.136.128.21]) by sourceware.org (Postfix) with ESMTPS id 1D3524906CBA for ; Sun, 7 Dec 2025 23:35:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1D3524906CBA Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=tecnico.ulisboa.pt Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tecnico.ulisboa.pt ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1D3524906CBA Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=193.136.128.21 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1765150559; cv=none; b=G7IKIEWfsglWp32WONXfmiaRSqRPOWZ6OvCf/jxkKU2IlYsT1Z308Dnr3gwpM0hM8Tr00yYCFU0FdBO/NN41Ta/2N07Wo4WLQCO0K3Ao+QldPdOPcgc5FX/8peuyJRTNb2oJ7FM79dXgbk8LXe9MQ111A457Kab2PndvkueI//Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1765150559; c=relaxed/simple; bh=K1meTm300XfNJfEJ8nBCSJX9jj0PVmcAXQ9467Otfew=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Pso++9lt0blo/7O2Y3fazNQj6s+A3iCZLy53s1rjbt2QRL+2jisf9wVkFpP3c/IXqaYN8JB2mtrwhaPYMpw8VBX3/zI7Mr8e04ZKM80dv7Tb1h7i8MUZ4L/kaBO8EaDCYHgqFM7rEjTn70xbhF4hHyHraU72kyZ2uakQ8MP0n78= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1D3524906CBA Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp1.tecnico.ulisboa.pt (Postfix) with ESMTP id F03BB600022B; Sun, 7 Dec 2025 23:35:57 +0000 (WET) X-Virus-Scanned: by amavis-2.13.0 (20230106) (Debian) at tecnico.ulisboa.pt Received: from smtp1.tecnico.ulisboa.pt ([127.0.0.1]) by localhost (smtp1.tecnico.ulisboa.pt [127.0.0.1]) (amavis, port 10025) with LMTP id YnW7dhGS6sdM; Sun, 7 Dec 2025 23:35:55 +0000 (WET) Received: from mail1.tecnico.ulisboa.pt (mail1.ist.utl.pt [193.136.128.10]) by smtp1.tecnico.ulisboa.pt (Postfix) with ESMTPS id 5CC076002984; Sun, 7 Dec 2025 23:35:55 +0000 (WET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tecnico.ulisboa.pt; s=mail2; t=1765150555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=zcojWK+fb2phwKs2+vmr53iIRlg/wE+xIf7vWcZZ8po=; b=ZTrW2UUzZra5PyMWUyZUCkfz1i4YIWUcFZXKpOrbDURrK5+FVxcvXoNwNJ9v6/ZIue0Ygl 9H6y4CKuq31m4wGh/hiwogfe5WokHuJuvz8r51RWxtakIE9KNYAZBSYhsOH73F/FXkfdUy xhuuDhQ9St4LWZDBejvwOKvwe0XJCt3Dbxc6E9aTTlUsaPnVmudeCUlSAehWhYke8w96/x J10aKlN3+a4QFL0J0k2s826RwVvMYBE65D+SKlKo6ebWFmQgDQRfGpSpbSMSgEJ4kiSjU1 jL20VVYOdlo2Iz7/zJdWs6BWjtPgfCKYPuVSsCCu8OrPOnVxbV3KS/m1U71vLA== Received: from archlinux (bl23-255-114.dsl.telepac.pt [144.64.255.114]) (Authenticated sender: ist1110454) by mail1.tecnico.ulisboa.pt (Postfix) with ESMTPSA id ECDA03600CB; Sun, 7 Dec 2025 23:35:54 +0000 (WET) From: Egas Ribeiro To: gcc-patches@gcc.gnu.org Cc: jason@redhat.com, ppalka@redhat.com, Egas Ribeiro Subject: [PATCH v3] c++: Fix SFINAE for deleted explicit specializations [PR119343] Date: Sun, 7 Dec 2025 23:35:00 +0000 Message-ID: <20251207233459.1078265-2-egas.g.ribeiro@tecnico.ulisboa.pt> X-Mailer: git-send-email 2.52.0 MIME-Version: 1.0 X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~patchwork=sourceware.org@gcc.gnu.org When checking a deleted explicit specialization in a SFINAE context, we were incorrectly selecting a partial specialization because resolve_nondeduced_context was calling mark_used. But resolving an overload to a single function (per DR 115) does not constitute ODR-use, so mark_used shouldn't be called there. PR c++/119343 gcc/cp/ChangeLog: * pt.cc (resolve_nondeduced_context): Remove mark_used call. gcc/testsuite/ChangeLog: * g++.dg/template/sfinae-deleted-pr119343.C: New test. Signed-off-by: Egas Ribeiro --- gcc/cp/pt.cc | 2 -- .../g++.dg/template/sfinae-deleted-pr119343.C | 31 +++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/template/sfinae-deleted-pr119343.C diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 8498730b6e4..a9b311be9ac 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -24816,8 +24816,6 @@ resolve_nondeduced_context (tree orig_expr, tsubst_flags_t complain) } if (good == 1) { - if (!mark_used (goodfn, complain) && !(complain & tf_error)) - return error_mark_node; expr = goodfn; if (baselink) expr = build_baselink (BASELINK_BINFO (baselink), diff --git a/gcc/testsuite/g++.dg/template/sfinae-deleted-pr119343.C b/gcc/testsuite/g++.dg/template/sfinae-deleted-pr119343.C new file mode 100644 index 00000000000..065ad605637 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/sfinae-deleted-pr119343.C @@ -0,0 +1,31 @@ +// { dg-do compile { target c++11 } } +// PR c++/119343 - No SFINAE for deleted explicit specializations + +struct true_type { static constexpr bool value = true; }; +struct false_type { static constexpr bool value = false; }; + +struct X { + static void f()=delete; + template static void g(); +}; +template<> void X::g<0>()=delete; +struct Y { + static void f(); + template static void g(); +}; + +template +struct has_f : false_type {}; +template +struct has_f : true_type {}; + +static_assert(!has_f::value, ""); +static_assert(has_f::value, ""); + +template +struct has_g0 : false_type {}; +template +struct has_g0))> : true_type {}; + +static_assert(!has_g0::value, ""); +static_assert(has_g0::value, "");