From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by sourceware.org (Postfix) with ESMTP id C502F386EC79 for ; Wed, 13 May 2020 03:36:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org C502F386EC79 Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-382-hsyF0HwkOvWs0XZrKOGKag-1; Tue, 12 May 2020 23:36:16 -0400 X-MC-Unique: hsyF0HwkOvWs0XZrKOGKag-1 Received: by mail-qk1-f199.google.com with SMTP id m15so8765602qka.20 for ; Tue, 12 May 2020 20:36:16 -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:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=PjyOekWBSdVxJu3WmhCSUC3tty2CmR/mYx3JZ4cpdaM=; b=faz2fj1aiJrBhmzyG9yMx4N2idi1mZbU53L8QoySGHjxWjkL2IM/0yPpu6NSqumJi2 gdHtNEswW12rUblAhnzTkPGdKxCNFv3yDRAJ79m3aYdUre5dmYjQwbNAjoy2Egs7w+ep 7H4fhsHzVzDXhPrjaVQ8xsDb80mgklIRYf3ZChIfDRCzgIiWfBkwmaIQ7kQaMWJqQqK8 uDTCS8NoPirIbUgKn/eeY/g9gidnnzESgT+yxa/XY+TxGQp938TnUIsYSLSiWtSqmUo4 h9WuNmqdDo6vE/4eLBOUQxORzrPdgHwY61OVKUBE6WQMfqYg2w/tdtGwJl7VuITkGcOH mHGA== X-Gm-Message-State: AGi0PuZl8xsLK1i3NXD3wyStZk55+AvJnBZ/EOr0NFf29cAZQVrLQ4/j DXxkJNn40NtQ4oQnB0XTF6ujU0Vus7+tUSvFeD5aA4XEl5M1Pksf8eRsjOEi5CNuQGwfG+4S49o 3KITPn4Mis8Y+yIvjPQ== X-Received: by 2002:a37:8044:: with SMTP id b65mr24066995qkd.62.1589340975882; Tue, 12 May 2020 20:36:15 -0700 (PDT) X-Google-Smtp-Source: APiQypK7mTmcvBOwE9vpMOyO0fdRZx+LG8abIQhYmbZ8lZrfN9QE47sqa4pX9i5VYC6QwSULx7QODg== X-Received: by 2002:a37:8044:: with SMTP id b65mr24066986qkd.62.1589340975581; Tue, 12 May 2020 20:36:15 -0700 (PDT) Received: from localhost.localdomain (ool-457d493a.dyn.optonline.net. [69.125.73.58]) by smtp.gmail.com with ESMTPSA id h6sm10227088qkf.61.2020.05.12.20.36.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 May 2020 20:36:14 -0700 (PDT) From: Patrick Palka To: gcc-patches@gcc.gnu.org Subject: [PATCH] c++: SFINAE for invalid delete-expression [PR79706] Date: Tue, 12 May 2020 23:36:11 -0400 Message-Id: <20200513033611.558917-1-ppalka@redhat.com> X-Mailer: git-send-email 2.26.2.561.g07d8ea56f2 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-19.6 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_NONE, RCVD_IN_MSPIKE_H2, 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-List-Received-Date: Wed, 13 May 2020 03:36:20 -0000 This fixes SFINAE when substitution yields an invalid delete-expression due to the pertinent deallocation function being marked deleted or otherwise inaccessible. We need to check for an erroneous result from build_op_delete_call and exit early in that case, so that we don't build a COND_EXPR around the erroneous call which finish_decltype_type would then quietly accept. Bootstrapped and regtested on x86_64-pc-linux-gnu, does this look OK to commit? gcc/cp/ChangeLog: PR c++/79706 * init.c (build_vec_delete_1): Return error_mark_node if deallocate_expr is error_mark_node. (build_delete): Return error_mark_node if do_delete is error_mark_node. gcc/testsuite/ChangeLog: PR c++/79706 * g++.dg/template/sfinae30.C: New test. --- gcc/cp/init.c | 8 ++++++-- gcc/testsuite/g++.dg/template/sfinae30.C | 21 +++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/template/sfinae30.C diff --git a/gcc/cp/init.c b/gcc/cp/init.c index e2e547afd96..c1047dbb1cc 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -4076,7 +4076,9 @@ build_vec_delete_1 (location_t loc, tree base, tree maxindex, tree type, } body = loop; - if (!deallocate_expr) + if (deallocate_expr == error_mark_node) + return error_mark_node; + else if (!deallocate_expr) ; else if (!body) body = deallocate_expr; @@ -4993,7 +4995,9 @@ build_delete (location_t loc, tree otype, tree addr, return expr; } - if (do_delete) + if (do_delete == error_mark_node) + return error_mark_node; + else if (do_delete) { tree do_delete_call_expr = extract_call_expr (do_delete); if (TREE_CODE (do_delete_call_expr) == CALL_EXPR) diff --git a/gcc/testsuite/g++.dg/template/sfinae30.C b/gcc/testsuite/g++.dg/template/sfinae30.C new file mode 100644 index 00000000000..82f31aaa625 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/sfinae30.C @@ -0,0 +1,21 @@ +// PR c++/79706 +// { dg-do compile { target c++11 } } + +struct A { + void operator delete(void*) = delete; +private: + void operator delete[](void*); +}; + +extern A *p; + +template +auto foo(T *t) -> decltype(delete t); // { dg-error "use of deleted function" } + +template +auto bar(T *t) -> decltype(delete[] t); // { dg-error "private within this context" } + +void baz() { + foo(p); // { dg-error "no match" } + bar(p); // { dg-error "no match" } +} -- 2.26.2.561.g07d8ea56f2