From patchwork Fri Mar 17 21:32:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 1758424 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=SHLfWGvg; 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 4PdcmT00pgz247T for ; Sat, 18 Mar 2023 08:32:38 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E7554385040B for ; Fri, 17 Mar 2023 21:32:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E7554385040B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1679088755; bh=F5ueoaCuFu/d3w5WdpaBirqJ/w9p4M/fSQ6KcLQmY38=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=SHLfWGvgVACR8w+uTckwe/6fVvM/TOkdYzIPLrOLmw9+XIfCMJ78iZ9Fpl9bSzTB0 jvQhV/ijhc+JTwRSeAk+vbQqcXaRa7gBfEZieN+f3PEDvWu+aMh2hFLHr8IVUhPTpz sa7ck1AWmnSpM8PHZ3Qrvb3dEpo5dTAzysHyAeow= 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.129.124]) by sourceware.org (Postfix) with ESMTPS id 356AA3850419 for ; Fri, 17 Mar 2023 21:32:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 356AA3850419 Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-671-d5JJB-N9OQ-w3FyD_QB-Lw-1; Fri, 17 Mar 2023 17:32:10 -0400 X-MC-Unique: d5JJB-N9OQ-w3FyD_QB-Lw-1 Received: by mail-qt1-f199.google.com with SMTP id t22-20020ac86a16000000b003bd1c0f74cfso3181434qtr.20 for ; Fri, 17 Mar 2023 14:32:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679088730; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=F5ueoaCuFu/d3w5WdpaBirqJ/w9p4M/fSQ6KcLQmY38=; b=Z6kmuoBiP95MoDZIBWXOPb//nlX1POHi/LId+YxAVuAGCACo1sJ8zTYmHAo8sUtzKi Bb7AC+uoRZMFiEyuyp/4luDZBZCEoFDH7GabQXJx7KNbN+csfzA2jtacEcV8F+DZbsHM Yc+VB/a1gCRWY20er6m26ONnJOW/QJYD/SqfYy8qRxSH1LnItDiM6j7252gBU/KHkLAY v1E1+IipxMYuYerImK9zDGLr2jkQc2XpxLB+MZ8ioUQ7/J3n8py1Q1GQJDtCW8b81HY7 vPxTU8vHzTFq916Rkg8La4AREDY6/cDVky0S/jMq+t85n2mJLWye2qsgBuXFbK3XpE5B 6+8A== X-Gm-Message-State: AO0yUKULe/X0AuhRouLsq2srSsdE7MQ0IV8DqXgDTdAIszEn4fn6qOfs IDb7ijypoH5k7RiEB6d+DUiaJQjt408+HtcIx0AxHBdpZ61A0qjwOgzrAKWgTyHx2UMiiD2W+ol 6c/eWeg/5MbJ8pDbj/AIDH8keXlFQXdbzLK5+tGCTb8flvB9zp43CER0SDISGFJoWTk9TCZSXDA == X-Received: by 2002:ac8:5a48:0:b0:3bf:d9ee:8814 with SMTP id o8-20020ac85a48000000b003bfd9ee8814mr16666184qta.17.1679088729976; Fri, 17 Mar 2023 14:32:09 -0700 (PDT) X-Google-Smtp-Source: AK7set9UTqs/P3kbglh2CsZWCb6K4I455zXb4gWzLQV0lFYkL5KVZy8vjXUQg/4VuBLwfMbkLK0bFQ== X-Received: by 2002:ac8:5a48:0:b0:3bf:d9ee:8814 with SMTP id o8-20020ac85a48000000b003bfd9ee8814mr16666136qta.17.1679088729549; Fri, 17 Mar 2023 14:32:09 -0700 (PDT) Received: from jason.cygnus.com (130-44-159-43.s15913.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.159.43]) by smtp.gmail.com with ESMTPSA id k10-20020ac8604a000000b003d3a34d2eb2sm2138334qtm.41.2023.03.17.14.32.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 14:32:08 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: throw and private destructor [PR109172] Date: Fri, 17 Mar 2023 17:32:05 -0400 Message-Id: <20230317213205.1383604-1-jason@redhat.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.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_NONE, TXREP 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: Jason Merrill via Gcc-patches From: Jason Merrill Reply-To: Jason Merrill Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Tested x86_64-pc-linux-gnu, applying to trunk. -- 8< -- Since we aren't going through the normal call machinery, we need to check the dtor access specifically. PR c++/109172 gcc/cp/ChangeLog: * except.cc (build_throw): Check dtor access. gcc/testsuite/ChangeLog: * g++.dg/eh/dtor4.C: New test. --- gcc/cp/except.cc | 10 ++++++++-- gcc/testsuite/g++.dg/eh/dtor4.C | 15 +++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/eh/dtor4.C base-commit: c48be8298c27143c1a684c0cb9689c88d16f4b49 diff --git a/gcc/cp/except.cc b/gcc/cp/except.cc index 916e8189db6..91a5e049860 100644 --- a/gcc/cp/except.cc +++ b/gcc/cp/except.cc @@ -639,6 +639,8 @@ build_throw (location_t loc, tree exp) tree object, ptr; tree allocate_expr; + tsubst_flags_t complain = tf_warning_or_error; + /* The CLEANUP_TYPE is the internal type of a destructor. */ if (!cleanup_type) { @@ -759,11 +761,15 @@ build_throw (location_t loc, tree exp) cleanup = NULL_TREE; if (type_build_dtor_call (TREE_TYPE (object))) { - tree dtor_fn = lookup_fnfields (TYPE_BINFO (TREE_TYPE (object)), + tree binfo = TYPE_BINFO (TREE_TYPE (object)); + tree dtor_fn = lookup_fnfields (binfo, complete_dtor_identifier, 0, tf_warning_or_error); dtor_fn = BASELINK_FUNCTIONS (dtor_fn); - mark_used (dtor_fn); + if (!mark_used (dtor_fn) + || !perform_or_defer_access_check (binfo, dtor_fn, + dtor_fn, complain)) + return error_mark_node; if (TYPE_HAS_NONTRIVIAL_DESTRUCTOR (TREE_TYPE (object))) { cxx_mark_addressable (dtor_fn); diff --git a/gcc/testsuite/g++.dg/eh/dtor4.C b/gcc/testsuite/g++.dg/eh/dtor4.C new file mode 100644 index 00000000000..6c0e804fe8a --- /dev/null +++ b/gcc/testsuite/g++.dg/eh/dtor4.C @@ -0,0 +1,15 @@ +// PR c++/109172 + +class Demo +{ + ~Demo(); +}; + +int main() +{ + try + { + throw *new Demo; // { dg-error private } + } + catch(const Demo& e) { } +}