From patchwork Mon Mar 28 13:35:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 52413 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 E92F83888C7F for ; Mon, 28 Mar 2022 13:42:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E92F83888C7F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1648474921; bh=qaet92wydlm36QyL1r3IBquEvwJS8M6zWblZz+mxTIU=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=vLsAdHKd3Q5zwDsnFjyQRy60nc+Nvhg/goWluNkxp2gRiUlVs0MYuxPM1aN0WYwCK XxfNqwQhyUw7rV2iERJlQC+35qOOM1A30ydmcqanZNVTNKXv4rFUTCGQVG8dJ14Myo aLwry35Tmo3irp4D8F7mKCH2adUD2rOokl09aDzQ= 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 8F2C6385782D for ; Mon, 28 Mar 2022 13:35:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8F2C6385782D Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-389-2YGB4x7KO_mNEy-6n0PKDQ-1; Mon, 28 Mar 2022 09:35:30 -0400 X-MC-Unique: 2YGB4x7KO_mNEy-6n0PKDQ-1 Received: by mail-qv1-f71.google.com with SMTP id s14-20020ad4446e000000b00440d3810126so11332965qvt.5 for ; Mon, 28 Mar 2022 06:35:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qaet92wydlm36QyL1r3IBquEvwJS8M6zWblZz+mxTIU=; b=3RwH2OBwti17uPoMpflxFg72R0zW8J0C9Vf/vpUNwMLsc9YwhHcpxyF/eG3sHCdXVs Hn+IRyHkakNt5YuT270HdgmJYQBlMpLaWPOwuZLVjk90XF1E5iTTvtBDvtnBnhbU16LK O8bU1CiXX9opBegjpL5M5zIHdN5a/0Ji7l/65hQ2g1DnrK+M5NtkHWALgQmiC2NuMZjZ pVA8P62uVcuUrUXhDirIXe9Pv2u7sX2eI2sLBhtGHpUJMN83hUFsPv/y8Qsd/D9fBd6X jTEjA6bd+Zkxy/bhbhdabU1d02QovoM5kk+wDfo/Fqcw/1C5kGx2GFEFdlk0OuxXK+2M pwCw== X-Gm-Message-State: AOAM531mmBnLPfGe6nt84TMedOFfCTbzY7t1H0GZ444pKhRD0w/Um5+3 sfgzCRYVssboGld/vJifKZV85MoJ/I6EI+POj+oVUGQANdlD9IRiR6SWn6xaIUuJJouDtO87ZFC y2g+OHU19OTi21003JQmupOhbiz6a1pHKiPJiugSgUx316WBslfAb/x9NDIQE4H6osw== X-Received: by 2002:a05:622a:391:b0:2e2:3282:7e66 with SMTP id j17-20020a05622a039100b002e232827e66mr21419154qtx.566.1648474529072; Mon, 28 Mar 2022 06:35:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzcE+dYUu7ysxydJfhNMah40syLDj941XDzmpAFVb9oCD95/FjQhwwCwNLel148Wmza3h492w== X-Received: by 2002:a05:622a:391:b0:2e2:3282:7e66 with SMTP id j17-20020a05622a039100b002e232827e66mr21419115qtx.566.1648474528652; Mon, 28 Mar 2022 06:35:28 -0700 (PDT) Received: from barrymore.redhat.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 w8-20020ac87e88000000b002e1cdc11203sm12509897qtj.18.2022.03.28.06.35.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Mar 2022 06:35:27 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: low -faligned-new [PR102071] Date: Mon, 28 Mar 2022 09:35:25 -0400 Message-Id: <20220328133525.2586952-1-jason@redhat.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_LOTSOFHASH, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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 Cc: Jakub Jelinek Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" This test ICEd after the constexpr new patch (r10-3661) because alloc_call had a NOP_EXPR around it; fixed by moving the NOP_EXPR to alloc_expr. And the PR pointed out that the size_t cookie might need more alignment, so I fix that as well. Tested x86_64-pc-linux-gnu, applying to trunk. PR c++/102071 gcc/cp/ChangeLog: * init.cc (build_new_1): Include cookie in alignment. Omit constexpr wrapper from alloc_call. gcc/testsuite/ChangeLog: * g++.dg/cpp1z/aligned-new9.C: New test. --- gcc/cp/init.cc | 15 +++++++++---- gcc/testsuite/g++.dg/cpp1z/aligned-new9.C | 26 +++++++++++++++++++++++ 2 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp1z/aligned-new9.C base-commit: bc86a86a4f2c057bc0e0be94dcbb8c128ae7f717 prerequisite-patch-id: 09e711b54e7911a4a04bd7808abc1b73ae4482ba prerequisite-patch-id: 566cf0772894d0c6a842b2e0ca62eb1d5ae8ad33 prerequisite-patch-id: b1def7e83e76c1652efb483cb2b67e472d15b720 prerequisite-patch-id: 12973b1310781ff6ce5c9792ea689f0673fc5251 prerequisite-patch-id: 8dcc4ecc29dbe7b290325412af70613171456714 prerequisite-patch-id: 0e11ad2f06a4b425182bca51bd5a85eedd3ce8cd prerequisite-patch-id: 1c17a86736dd239bc62ee4619599fc89f0cf5908 prerequisite-patch-id: e62940b6d46209e9c0af369d9eff7351d9a94775 diff --git a/gcc/cp/init.cc b/gcc/cp/init.cc index 08767679dd4..91b5c2c0f69 100644 --- a/gcc/cp/init.cc +++ b/gcc/cp/init.cc @@ -3284,7 +3284,13 @@ build_new_1 (vec **placement, tree type, tree nelts, tree align_arg = NULL_TREE; if (type_has_new_extended_alignment (elt_type)) - align_arg = build_int_cst (align_type_node, TYPE_ALIGN_UNIT (elt_type)); + { + unsigned align = TYPE_ALIGN_UNIT (elt_type); + /* Also consider the alignment of the cookie, if any. */ + if (TYPE_VEC_NEW_USES_COOKIE (elt_type)) + align = MAX (align, TYPE_ALIGN_UNIT (size_type_node)); + align_arg = build_int_cst (align_type_node, align); + } alloc_fn = NULL_TREE; @@ -3473,18 +3479,19 @@ build_new_1 (vec **placement, tree type, tree nelts, } } + alloc_expr = alloc_call; if (cookie_size) - alloc_call = maybe_wrap_new_for_constexpr (alloc_call, type, + alloc_expr = maybe_wrap_new_for_constexpr (alloc_expr, type, cookie_size); /* In the simple case, we can stop now. */ pointer_type = build_pointer_type (type); if (!cookie_size && !is_initialized && !member_delete_p) - return build_nop (pointer_type, alloc_call); + return build_nop (pointer_type, alloc_expr); /* Store the result of the allocation call in a variable so that we can use it more than once. */ - alloc_expr = get_target_expr (alloc_call); + alloc_expr = get_target_expr (alloc_expr); alloc_node = TARGET_EXPR_SLOT (alloc_expr); /* Strip any COMPOUND_EXPRs from ALLOC_CALL. */ diff --git a/gcc/testsuite/g++.dg/cpp1z/aligned-new9.C b/gcc/testsuite/g++.dg/cpp1z/aligned-new9.C new file mode 100644 index 00000000000..7854299419a --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1z/aligned-new9.C @@ -0,0 +1,26 @@ +// PR c++/102071 +// { dg-do run { target c++17 } } +// { dg-additional-options -faligned-new=2 } + +#include + +int nalign; +void *operator new (std::size_t s, std::align_val_t a) +{ + nalign = (int)a; + return operator new (s); +} + +struct X { ~X(); int c; }; + +int align = (alignof (X) > alignof (std::size_t) + ? alignof (X) : alignof (std::size_t)); + +int n = 4; + +int main() +{ + X *p = new X[n]; + if (nalign != align) + __builtin_abort (); +}