From patchwork Thu Dec 1 03:46:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 61297 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 EBB1C3858024 for ; Thu, 1 Dec 2022 03:47:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EBB1C3858024 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1669866435; bh=8wXoUH0/VL4KgVVkiuHvq5yo8TrpwIIke7tCGTBhaRg=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=icTdJz0Gc3RCKd/Qk9dBZ3B6EFsLMv7/o8OrKBiVnIep1PAgeETE5HKEK1s41quZP xd+olWHv+4GF8GiLxbWz2ubBE++4EApXOZQlxSMCBJ1i8F/ECDBhn1HXuY1JZkVAE7 v2UpzQkQ+sbdrr4RVUi2ExRiWPRqZQE7Kil/TNuM= 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 AC265385840C for ; Thu, 1 Dec 2022 03:46:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AC265385840C Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-636-_Xbi8ftUO6qBCgbjLKH86Q-1; Wed, 30 Nov 2022 22:46:43 -0500 X-MC-Unique: _Xbi8ftUO6qBCgbjLKH86Q-1 Received: by mail-qk1-f199.google.com with SMTP id w14-20020a05620a424e00b006fc46116f7dso1859947qko.12 for ; Wed, 30 Nov 2022 19:46:43 -0800 (PST) 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:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=8wXoUH0/VL4KgVVkiuHvq5yo8TrpwIIke7tCGTBhaRg=; b=s2GGJ5bHQbI4m72Z9tkUMefA/a4jUvw8BGNhUO4CQ185FbhxFDiLf+o07IjUhQZeHs +mACc8NwAakwjVsMfGnnuppXznPYDq55jndpGCfcwVDA9RK22mI4iIgEIMAEPji+wQJ1 ZskwiPjQGUSI+eJWMSGiBlpSXgghPvlhPh6rmbJtFoTHNpZBU3bgPqSDNUAfitmfeRA4 iK9+7K1Yn/VKm+6kOukXJ8JA0AC0I3leCSJQq4dSgyCz8bbqzbhU/uXOEfb0Os7Kn0kU 6n3Lm4k4Is7fcRRv8MrXVWKJmW+QOJygvt1cMjOPIgqHySB8vy9wxnvk+2ESifOwLxDc dYZQ== X-Gm-Message-State: ANoB5pkLr9CUwjKpJ7qMEoJzQB4pyy42QTil/RdeTlcXb/klFkd9YCHo IYWX0U53DCIcA2pQ7Cl9ZgwM1zHTe9IZtZzeoDcmKMDtmprxySpGymf7meXwsSafbaud7IJV6WH OE6nZfMzWQjqX/IbTiFxl/rcHXRdmSaGnsGj/nWJhONgK8/e2nEalDQ/xrbULOPBmWA== X-Received: by 2002:a05:620a:35a:b0:6fa:27f6:8338 with SMTP id t26-20020a05620a035a00b006fa27f68338mr41117512qkm.721.1669866402956; Wed, 30 Nov 2022 19:46:42 -0800 (PST) X-Google-Smtp-Source: AA0mqf6sezcQr1byrs4yZMO1ojRLwJm/DZIp6czUYCjls89iRgCA9s95ZrhOFMF7rPe96R/F0yzOPA== X-Received: by 2002:a05:620a:35a:b0:6fa:27f6:8338 with SMTP id t26-20020a05620a035a00b006fa27f68338mr41117490qkm.721.1669866402494; Wed, 30 Nov 2022 19:46:42 -0800 (PST) Received: from jason.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 d2-20020a05620a240200b006fa43e139b5sm2631947qkn.59.2022.11.30.19.46.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Nov 2022 19:46:41 -0800 (PST) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: small contracts fixes Date: Wed, 30 Nov 2022 22:46:39 -0500 Message-Id: <20221201034639.136411-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.5 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+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Tested x86_64-pc-linux-gnu, applying to trunk. -- 8< -- The first is an actual bug: remove_contract_attributes was only keeping one attribute. The second just helps flow analysis in optimizers and static analyzers. gcc/cp/ChangeLog: * contracts.cc (remove_contract_attributes): Actually prepend to the list. * pt.cc (tsubst_contract): Only look for a postcondition if type is nonnull. --- gcc/cp/contracts.cc | 2 +- gcc/cp/pt.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) base-commit: cda29c540037fbcf00a377196050953aab1d3d5b diff --git a/gcc/cp/contracts.cc b/gcc/cp/contracts.cc index a9097016768..45f52b20392 100644 --- a/gcc/cp/contracts.cc +++ b/gcc/cp/contracts.cc @@ -869,7 +869,7 @@ remove_contract_attributes (tree fndecl) tree list = NULL_TREE; for (tree p = DECL_ATTRIBUTES (fndecl); p; p = TREE_CHAIN (p)) if (!cxx_contract_attribute_p (p)) - list = tree_cons (TREE_PURPOSE (p), TREE_VALUE (p), NULL_TREE); + list = tree_cons (TREE_PURPOSE (p), TREE_VALUE (p), list); DECL_ATTRIBUTES (fndecl) = nreverse (list); } diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 2d8e4fdd4b5..08de273a900 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -11561,7 +11561,7 @@ tsubst_contract (tree decl, tree t, tree args, tsubst_flags_t complain, tree r = copy_node (t); /* Rebuild the result variable. */ - if (POSTCONDITION_P (t) && POSTCONDITION_IDENTIFIER (t)) + if (type && POSTCONDITION_P (t) && POSTCONDITION_IDENTIFIER (t)) { tree oldvar = POSTCONDITION_IDENTIFIER (t);