From patchwork Tue Apr 12 21:08:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 52826 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 C84833857C4A for ; Tue, 12 Apr 2022 21:09:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C84833857C4A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1649797746; bh=i0UgQZ0eUjcTPkbnKdGEhQL7XC7tpumbUWlgyyAvBbc=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=XkKRt9hPqpc9/H9cYQV4BNorHDjrJ7Oan+u9Yl4jjwaonAuEyBc4u/qpUQ9eBAtt1 OVREk2n7/BuNdrz8/SbGQbMYG6K6BZ5dpgnxZPMWiiEJUiy5SI5PckGiuvlbbVFTeh QnuvRRtSViWFK8ipReEtYsJRVsOH9ykIS6XSj3oQ= 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 722EA3858D28 for ; Tue, 12 Apr 2022 21:08:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 722EA3858D28 Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-650-a-XgQfjtOKKMbUeSK2io-g-1; Tue, 12 Apr 2022 17:08:35 -0400 X-MC-Unique: a-XgQfjtOKKMbUeSK2io-g-1 Received: by mail-qt1-f197.google.com with SMTP id x10-20020ac8700a000000b002c3ef8fc44cso18537qtm.8 for ; Tue, 12 Apr 2022 14:08:35 -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:subject:date:message-id:mime-version :content-transfer-encoding; bh=i0UgQZ0eUjcTPkbnKdGEhQL7XC7tpumbUWlgyyAvBbc=; b=bdQNJkcKDj7AqIjmtaPFkZfTuJJC32k3KmhFjqKFpR8m75/Lx8V8rmuUJ1+cB8Lfum Nj5gJpMeb65HPGjOp60/i3FB0FfwneRifNntTto8BvzPCSJMA8thz3ozbXJwmnRXxlGY F5TM5lrnh7MjA0JG6ZyLEty0tQ+ywBh/1MRLJ/yjR+iugtOfN7F8gMm+ksn0d7/Bpq4Z sjQmUInqEN/wevDqZdyNUE96olwvXDV8Inbzpt5F3SulBz1uFzA+ZRNQO1rvkuI0yH8e RpZOSzDBPqpIQS6Xt3DR2tbki2SRDRRRr3tj41tL0BkG6uUc3IW1yq/aCuC79lQNM5A6 Tb+w== X-Gm-Message-State: AOAM533DL28MQ9PjnFrmzony+VIpLtLs4lN2OThsRdklA9XLTN9DJ6m9 SbCVoQrwlNKwFXcrWpFc0U7NdtUNPkxeBRqiButnfVNup6ntqpt6bezIJhLofR/U1lPW+eLwxNT dH+Yc4VP3eshjVzuj02ovviIo/XWXkFoymD2cE8NysFbqmNDlLyW22tnyS6WoqEy/kQ== X-Received: by 2002:a37:70b:0:b0:69c:d50:7c91 with SMTP id 11-20020a37070b000000b0069c0d507c91mr4468490qkh.145.1649797714967; Tue, 12 Apr 2022 14:08:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxnk3BPU1VQqlV29rfo2iU+/TiG9xCfMXiSJM8KeMcJJoDvnnORkiRyMGq3efKdeCB0JBKvjA== X-Received: by 2002:a37:70b:0:b0:69c:d50:7c91 with SMTP id 11-20020a37070b000000b0069c0d507c91mr4468470qkh.145.1649797714530; Tue, 12 Apr 2022 14:08:34 -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 a23-20020a05620a103700b00699d49c511dsm14735838qkk.104.2022.04.12.14.08.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 14:08:33 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: non-array new alignment [PR102071] Date: Tue, 12 Apr 2022 17:08:31 -0400 Message-Id: <20220412210831.3086714-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=-13.1 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_LOW, RCVD_IN_MSPIKE_H5, 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 Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" While considering the PR102071 patch for backporting, I noticed that I was considering the alignment of the array new cookie even when there isn't one because we aren't allocating an array. Tested x86_64-pc-linux-gnu, applying to trunk. PR c++/102071 gcc/cp/ChangeLog: * init.cc (build_new_1): Check array_p for alignment. gcc/testsuite/ChangeLog: * g++.dg/cpp1z/aligned-new9.C: Add single-object test. --- gcc/cp/init.cc | 2 +- gcc/testsuite/g++.dg/cpp1z/aligned-new9.C | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) base-commit: aa7874596b9f12b25a3214b0a143b040fafa1f10 diff --git a/gcc/cp/init.cc b/gcc/cp/init.cc index ce332c7e329..7ce8d3a46e5 100644 --- a/gcc/cp/init.cc +++ b/gcc/cp/init.cc @@ -3292,7 +3292,7 @@ build_new_1 (vec **placement, tree type, tree nelts, { unsigned align = TYPE_ALIGN_UNIT (elt_type); /* Also consider the alignment of the cookie, if any. */ - if (TYPE_VEC_NEW_USES_COOKIE (elt_type)) + if (array_p && 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); } diff --git a/gcc/testsuite/g++.dg/cpp1z/aligned-new9.C b/gcc/testsuite/g++.dg/cpp1z/aligned-new9.C index 7854299419a..3fa0ed996bd 100644 --- a/gcc/testsuite/g++.dg/cpp1z/aligned-new9.C +++ b/gcc/testsuite/g++.dg/cpp1z/aligned-new9.C @@ -23,4 +23,8 @@ int main() X *p = new X[n]; if (nalign != align) __builtin_abort (); + + X *p2 = new X; + if (nalign != alignof (X)) + __builtin_abort (); }