Permission is hereby granted, free of charge, to any person obtaining diff --git a/runtime/include/about.html b/runtime/include/about.html index 1e645a54d27..8f8da6fb001 100644 --- a/runtime/include/about.html +++ b/runtime/include/about.html @@ -85,7 +85,7 @@
The software is modified from the original version.
-libffi - Copyright (c) 1996-2022 Anthony Green, Red Hat, Inc and others.
+libffi - Copyright (c) 1996-2023 Anthony Green, Red Hat, Inc and others.
Permission is hereby granted, free of charge, to any person obtaining diff --git a/runtime/libffi/about.html b/runtime/libffi/about.html index ee7d25e8969..e53c1a1a04d 100644 --- a/runtime/libffi/about.html +++ b/runtime/libffi/about.html @@ -6,7 +6,7 @@
Mar 14, 2022
+Nov 13, 2023
This program and the accompanying materials are made available under the terms of the @@ -46,7 +46,7 @@
The software is modified from the original version.
-libffi - Copyright (c) 1996-2022 Anthony Green, Red Hat, Inc and others.
+libffi - Copyright (c) 1996-2023 Anthony Green, Red Hat, Inc and others.
Permission is hereby granted, free of charge, to any person obtaining diff --git a/runtime/libffi/powerpc/ffi_darwin.c b/runtime/libffi/powerpc/ffi_darwin.c index 64bb94dfae7..afb6750a5bb 100644 --- a/runtime/libffi/powerpc/ffi_darwin.c +++ b/runtime/libffi/powerpc/ffi_darwin.c @@ -623,38 +623,50 @@ darwin_adjust_aggregate_sizes (ffi_type *s) } /* Adjust the size of S to be correct for AIX. - Word-align double unless it is the first member of a structure. */ + Word-align double unless it is the first member of a structure recursively. + Return non-zero if we found a recursive first member aggregate of interest. */ -static void -aix_adjust_aggregate_sizes (ffi_type *s) +static int +aix_adjust_aggregate_sizes (ffi_type *s, int outer_most_type_or_first_member) { - int i; + int i, nested_first_member=0, final_align, rc=0; if (s->type != FFI_TYPE_STRUCT) - return; + return 0; s->size = 0; for (i = 0; s->elements[i] != NULL; i++) { - ffi_type *p; + ffi_type p; int align; - - p = s->elements[i]; - aix_adjust_aggregate_sizes (p); - align = p->alignment; - if (i != 0 && p->type == FFI_TYPE_DOUBLE) - align = 4; - s->size = FFI_ALIGN(s->size, align) + p->size; + + /* nested aggregates layout differently on AIX, so take a copy of the type */ + p = *(s->elements[i]); + if (i == 0) + nested_first_member = aix_adjust_aggregate_sizes(&p, outer_most_type_or_first_member); + else + aix_adjust_aggregate_sizes(&p, 0); + align = p.alignment; + if (i != 0 && p.type == FFI_TYPE_DOUBLE) + align = 4; + s->size = FFI_ALIGN(s->size, align) + p.size; } - - s->size = FFI_ALIGN(s->size, s->alignment); - - if (s->elements[0]->type == FFI_TYPE_UINT64 - || s->elements[0]->type == FFI_TYPE_SINT64 - || s->elements[0]->type == FFI_TYPE_DOUBLE - || s->elements[0]->alignment == 8) - s->alignment = s->alignment > 8 ? s->alignment : 8; - /* Do not add additional tail padding. */ + + final_align=s->alignment; + if ((s->elements[0]->type == FFI_TYPE_UINT64 + || s->elements[0]->type == FFI_TYPE_SINT64 + || s->elements[0]->type == FFI_TYPE_DOUBLE + || s->elements[0]->alignment == 8 || nested_first_member)) { + final_align = s->alignment > 8 ? s->alignment : 8; + rc=1; + /* still use the adjusted alignment to calculate tail padding, but don't adjust the types alignment if + we aren't in the recursive first position */ + if (outer_most_type_or_first_member) + s->alignment=final_align; + } + + s->size = FFI_ALIGN(s->size, final_align); + return rc; } /* Perform machine dependent cif processing. */ @@ -682,9 +694,9 @@ ffi_prep_cif_machdep (ffi_cif *cif) if (cif->abi == FFI_AIX) { - aix_adjust_aggregate_sizes (cif->rtype); + aix_adjust_aggregate_sizes (cif->rtype, 1); for (i = 0; i < cif->nargs; i++) - aix_adjust_aggregate_sizes (cif->arg_types[i]); + aix_adjust_aggregate_sizes (cif->arg_types[i], 1); } /* Space for the frame pointer, callee's LR, CR, etc, and for