aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIain Buclaw <ibuclaw@gdcproject.org>2023-03-16 01:07:02 +0100
committerIain Buclaw <ibuclaw@gdcproject.org>2023-03-16 12:06:11 +0100
commit46c4be98d1e759a406069487e5dbaad0346e7e7d (patch)
tree9e524f4c20331799b404f8c1707e5263c271aebe /gcc
parent63b25b8012400bed0c35d6e39549168ae131aefc (diff)
downloadgcc-46c4be98d1e759a406069487e5dbaad0346e7e7d.zip
gcc-46c4be98d1e759a406069487e5dbaad0346e7e7d.tar.gz
gcc-46c4be98d1e759a406069487e5dbaad0346e7e7d.tar.bz2
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.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/d/d-codegen.cc5
-rw-r--r--gcc/testsuite/gdc.dg/torture/pr109144.d9
2 files changed, 14 insertions, 0 deletions
diff --git a/gcc/d/d-codegen.cc b/gcc/d/d-codegen.cc
index 5a04192..5c6c300 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 0000000..32d3af7
--- /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);
+}