diff options
| -rw-r--r-- | gdb/compile/compile-c-types.c | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.compile/compile.c | 7 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.compile/compile.exp | 3 |
3 files changed, 15 insertions, 1 deletions
diff --git a/gdb/compile/compile-c-types.c b/gdb/compile/compile-c-types.c index 1bfaefc..1243be3 100644 --- a/gdb/compile/compile-c-types.c +++ b/gdb/compile/compile-c-types.c @@ -118,7 +118,11 @@ convert_struct_or_union (compile_c_instance *context, struct type *type) type->field (i).loc_bitpos ()); } - context->plugin ().finish_record_or_union (result, type->length ()); + if (context->plugin ().version () >= GCC_C_FE_VERSION_2) + context->plugin ().finish_record_with_alignment (result, type->length (), + type_align (type)); + else + context->plugin ().finish_record_or_union (result, type->length ()); return result; } diff --git a/gdb/testsuite/gdb.compile/compile.c b/gdb/testsuite/gdb.compile/compile.c index 8170a3a..04beae8 100644 --- a/gdb/testsuite/gdb.compile/compile.c +++ b/gdb/testsuite/gdb.compile/compile.c @@ -100,6 +100,13 @@ int globalshadow = 10; static int staticshadow = 20; int externed = 7; +struct struct_with_array +{ + char val[7]; +}; + +static struct struct_with_array swa; + int main (void) { diff --git a/gdb/testsuite/gdb.compile/compile.exp b/gdb/testsuite/gdb.compile/compile.exp index fed7b04..f522a84 100644 --- a/gdb/testsuite/gdb.compile/compile.exp +++ b/gdb/testsuite/gdb.compile/compile.exp @@ -397,3 +397,6 @@ gdb_test "p globalvar" " = 1" "expect 1" gdb_test_no_output "compile code shlibvar += 5;" "modify shared library variable" gdb_test "p shlibvar" " = 15" "expect 15" + +# This used to fail due to alignment. PR compile/31397. +gdb_test_no_output "compile code swa.val\[0\] = 1" |