afd20587f9
Fix https://github.com/llvm/llvm-project/issues/63579 ``` % cat a.c void foo() {} % clang --target=arm-none-eabi -mthumb -mno-unaligned-access -fsanitize=kcfi a.c -S -o - | grep p2align .p2align 1 % clang --target=armv6m-none-eabi -fsanitize=function a.c -S -o - | grep p2align .p2align 1 ``` Ensure that -fsanitize={function,kcfi} instrumented functions are aligned by at least 4, so that loading the type hash before the function label will not cause a misaligned access. This is especially important for -mno-unaligned-access configurations that don't set `setMinFunctionAlignment` to 4 or greater. With this patch, the generated assembly for the examples above will contain `.p2align 2` before the type hash. If `__attribute__((aligned(N)))` or `-falign-functions=N` is specified, the larger alignment will be used. Reviewed By: simon_tatham, samitolvanen Differential Revision: https://reviews.llvm.org/D154125
42 lines
1.1 KiB
LLVM
42 lines
1.1 KiB
LLVM
; RUN: llc -mtriple=thumbv6m-none-eabi < %s | FileCheck %s
|
|
|
|
; CHECK-LABEL: .globl nosan
|
|
; CHECK-NEXT: .p2align 1
|
|
; CHECK-NEXT: .type nosan,%function
|
|
; CHECK-NEXT: .code 16
|
|
; CHECK-NEXT: .thumb_func
|
|
; CHECK-NEXT: nosan:
|
|
define dso_local void @nosan() nounwind {
|
|
ret void
|
|
}
|
|
|
|
;; The alignment is at least 4 to avoid unaligned type hash loads when this
|
|
;; instrumented function is indirectly called.
|
|
; CHECK-LABEL: .globl foo
|
|
; CHECK-NEXT: .p2align 2
|
|
; CHECK-NEXT: .type foo,%function
|
|
; CHECK-NEXT: .long 3238382334
|
|
; CHECK-NEXT: .long 3170468932
|
|
; CHECK-NEXT: .code 16
|
|
; CHECK-NEXT: .thumb_func
|
|
; CHECK-NEXT: foo:
|
|
define dso_local void @foo() nounwind !func_sanitize !0 {
|
|
ret void
|
|
}
|
|
|
|
;; If "align" is smaller than 4 (required alignment from !func_sanitize), use 4.
|
|
; CHECK-LABEL: .globl align2
|
|
; CHECK-NEXT: .p2align 2
|
|
define dso_local void @align2() nounwind align 2 !func_sanitize !0 {
|
|
ret void
|
|
}
|
|
|
|
;; If "align" is larger than 4, use its value.
|
|
; CHECK-LABEL: .globl align8
|
|
; CHECK-NEXT: .p2align 3
|
|
define dso_local void @align8() nounwind align 8 !func_sanitize !0 {
|
|
ret void
|
|
}
|
|
|
|
!0 = !{i32 -1056584962, i32 -1124498364}
|