diff options
| author | Kaz Kylheku <kaz@kylheku.com> | 2022-05-19 18:21:07 -0700 |
|---|---|---|
| committer | Kaz Kylheku <kaz@kylheku.com> | 2022-05-19 18:21:07 -0700 |
| commit | 79a67942651b7b1f15838fda053d72d17b3f2884 (patch) | |
| tree | f1d52cae5c304aae37997172a6f5b2206e99250f | |
| parent | 446853ed69188bb6d3080eb852d07b240ddd0db2 (diff) | |
| download | txr-79a67942651b7b1f15838fda053d72d17b3f2884.tar.gz txr-79a67942651b7b1f15838fda053d72d17b3f2884.tar.bz2 txr-79a67942651b7b1f15838fda053d72d17b3f2884.zip | |
ffi: bugfix: empty structs/unions have alignment of 1.
* ffi.c (make_ffi_type_struct, make_ffi_type_union): Initialize
most_align local variable to 1, so the lower bound of alignment
is that, rather than zero.
* tests/017/ffi-misc.tl: Tests added.
| -rw-r--r-- | ffi.c | 4 | ||||
| -rw-r--r-- | tests/017/ffi-misc.tl | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -3461,7 +3461,7 @@ static val make_ffi_type_struct(val syntax, val lisp_type, tft->self, cobj(coerce(mem_t *, tft), ffi_type_cls, &ffi_type_struct_ops)); ucnum offs = 0; - ucnum most_align = 0; + ucnum most_align = 1; int need_out_handler = 0; int bit_offs = 0; const unsigned bits_int = 8 * sizeof(int); @@ -3642,7 +3642,7 @@ static val make_ffi_type_union(val syntax, val use_existing, val self) val obj = if3(use_existing, tft->self, cobj(coerce(mem_t *, tft), ffi_type_cls, &ffi_type_struct_ops)); - ucnum most_align = 0; + ucnum most_align = 1; ucnum biggest_size = 0; const unsigned bits_int = 8 * sizeof(int); #if HAVE_I64 diff --git a/tests/017/ffi-misc.tl b/tests/017/ffi-misc.tl index 68f67b6f..4d7bffab 100644 --- a/tests/017/ffi-misc.tl +++ b/tests/017/ffi-misc.tl @@ -109,3 +109,7 @@ (mtest (ffi-put (new foo x 1 y 1) (ffi foo)) #b'0100000000000100' (ffi-put (new foo x #xABCDFFFFB00B y #x1234) (ffi foo)) #b'0BB0FFFFCDAB3412')) + +(mtest + (alignof (struct empty)) 1 + (alignof (union empty)) 1) |