git: 03d04bf49492 - main - Stop using expressions in _Alignof()

[John Baldwin]

The branch main has been updated by jhb:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=03d04bf49492fc70366e6d78194336a4122282a2

commit 03d04bf49492fc70366e6d78194336a4122282a2
Author:     Minsoo Choo <minsoochoo0...@proton.me>
AuthorDate: 2024-01-12 23:37:53 +0000
Commit:     John Baldwin <j...@freebsd.org>
CommitDate: 2024-01-12 23:37:53 +0000

    Stop using expressions in _Alignof()
    
    _Alignof(expression) is a non-standard extension.  This is not allowed
    in gnu11 and gnu17 which follow the C11 standard _Alignof(type).
    
    Reviewed by:    arichardson, imp, jhb
    Fixes:          4a9cd9fc22d7 amd64 db_trace: Reject unaligned frame pointers
    Fixes:          7ccaf76a27f1 riscv db_trace: Ensure trapframe pointer is 
suitably aligned.
    Fixes:          638c68897fbd arm64 db_trace: Ensure trapframe pointer is 
suitably aligned.
    Differential Revision:  https://reviews.freebsd.org/D43409
---
 sys/amd64/amd64/db_trace.c | 3 ++-
 sys/arm64/arm64/db_trace.c | 2 +-
 sys/riscv/riscv/db_trace.c | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/sys/amd64/amd64/db_trace.c b/sys/amd64/amd64/db_trace.c
index 9d9a2cd4a7bb..a57b38dd0818 100644
--- a/sys/amd64/amd64/db_trace.c
+++ b/sys/amd64/amd64/db_trace.c
@@ -205,7 +205,8 @@ db_nextframe(db_addr_t *fp, db_addr_t *ip, struct thread 
*td)
         */
        tf_addr = *fp + 16;
 
-       if (!__is_aligned(tf_addr, _Alignof(*tf)) || !INKERNEL(tf_addr)) {
+       if (!__is_aligned(tf_addr, _Alignof(struct trapframe)) ||
+           !INKERNEL(tf_addr)) {
                db_printf("--- invalid trapframe %p\n", (void *)tf_addr);
                *ip = 0;
                *fp = 0;
diff --git a/sys/arm64/arm64/db_trace.c b/sys/arm64/arm64/db_trace.c
index 1c9290f19ed5..4bc6af26a023 100644
--- a/sys/arm64/arm64/db_trace.c
+++ b/sys/arm64/arm64/db_trace.c
@@ -92,7 +92,7 @@ db_stack_trace_cmd(struct thread *td, struct unwind_state 
*frame)
                        struct trapframe *tf;
 
                        tf = (struct trapframe *)(uintptr_t)frame->fp - 1;
-                       if (!__is_aligned(tf, _Alignof(*tf)) ||
+                       if (!__is_aligned(tf, _Alignof(struct trapframe)) ||
                            !kstack_contains(td, (vm_offset_t)tf,
                            sizeof(*tf))) {
                                db_printf("--- invalid trapframe %p\n", tf);
diff --git a/sys/riscv/riscv/db_trace.c b/sys/riscv/riscv/db_trace.c
index d3a52ecf59bf..0d374b1493d7 100644
--- a/sys/riscv/riscv/db_trace.c
+++ b/sys/riscv/riscv/db_trace.c
@@ -83,7 +83,7 @@ db_stack_trace_cmd(struct thread *td, struct unwind_state 
*frame)
                        struct trapframe *tf;
 
                        tf = (struct trapframe *)(uintptr_t)frame->sp;
-                       if (!__is_aligned(tf, _Alignof(*tf)) ||
+                       if (!__is_aligned(tf, _Alignof(struct trapframe)) ||
                            !kstack_contains(td, (vm_offset_t)tf,
                            sizeof(*tf))) {
                                db_printf("--- invalid trapframe %p\n", tf);