From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1873) id C90213858D35; Thu, 16 Mar 2023 11:36:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C90213858D35 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1678966585; bh=PbnPSG2UPozzx57P2g1d0fgKA5SSV20laXcJpZG6M9s=; h=From:To:Subject:Date:From; b=ujdwCkiWRCSaDFC37CmGdtCxA3j/afzcrz2gR5mEWYZaNu/TxNCGR6uhCN42TvFXl mC42BKihmUTOCursNkoesGU4ake504shVkjUv+aasVtDgpB3dMqkIOv1S6Fnv4fqJn rX+kmRvNNDIWGVaihy1KW/4muXF8FCO1ayqsAX+8= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Iain Buclaw To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-6710] d: Fix closure fields don't get same alignment as local variable [PR109144] X-Act-Checkin: gcc X-Git-Author: Iain Buclaw X-Git-Refname: refs/heads/master X-Git-Oldrev: 63b25b8012400bed0c35d6e39549168ae131aefc X-Git-Newrev: 46c4be98d1e759a406069487e5dbaad0346e7e7d Message-Id: <20230316113625.C90213858D35@sourceware.org> Date: Thu, 16 Mar 2023 11:36:25 +0000 (GMT) List-Id: https://gcc.gnu.org/g:46c4be98d1e759a406069487e5dbaad0346e7e7d commit r13-6710-g46c4be98d1e759a406069487e5dbaad0346e7e7d Author: Iain Buclaw Date: Thu Mar 16 01:07:02 2023 +0100 d: Fix closure fields don't get same alignment as local variable [PR109144] Local variables with both non-local references and explicit alignment did not propagate their alignment to either the closure field or closure frame type, resulting in the closure being misaligned. This is now correctly set-up when building the frame type. PR d/109144 gcc/d/ChangeLog: * d-codegen.cc (build_frame_type): Set frame field and type alignment. gcc/testsuite/ChangeLog: * gdc.dg/torture/pr109144.d: New test. Diff: --- gcc/d/d-codegen.cc | 5 +++++ gcc/testsuite/gdc.dg/torture/pr109144.d | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/gcc/d/d-codegen.cc b/gcc/d/d-codegen.cc index 5a041927ec9..5c6c300ecec 100644 --- a/gcc/d/d-codegen.cc +++ b/gcc/d/d-codegen.cc @@ -2706,6 +2706,11 @@ build_frame_type (tree ffi, FuncDeclaration *fd) TREE_ADDRESSABLE (field) = TREE_ADDRESSABLE (vsym); DECL_NONADDRESSABLE_P (field) = !TREE_ADDRESSABLE (vsym); TREE_THIS_VOLATILE (field) = TREE_THIS_VOLATILE (vsym); + SET_DECL_ALIGN (field, DECL_ALIGN (vsym)); + + /* Update alignment for frame record type. */ + if (TYPE_ALIGN (frame_rec_type) < DECL_ALIGN (field)) + SET_TYPE_ALIGN (frame_rec_type, DECL_ALIGN (field)); if (DECL_LANG_NRVO (vsym)) { diff --git a/gcc/testsuite/gdc.dg/torture/pr109144.d b/gcc/testsuite/gdc.dg/torture/pr109144.d new file mode 100644 index 00000000000..32d3af7cd45 --- /dev/null +++ b/gcc/testsuite/gdc.dg/torture/pr109144.d @@ -0,0 +1,9 @@ +// { dg-do run } +// { dg-skip-if "needs gcc/config.d" { ! d_runtime } } +void main() +{ + align(128) byte var; + assert((cast(size_t) &var) % 128 == 0); + var = 73; + assert((() => var)() == 73); +}