diff options
| author | Tom Tan <Tom.Tan@microsoft.com> | 2020-01-10 18:55:56 -0800 |
|---|---|---|
| committer | Tom Tan <Tom.Tan@microsoft.com> | 2020-01-10 19:03:17 -0800 |
| commit | 7c816492197aefbaa2ea3ba0e391f7c6905956bc (patch) | |
| tree | e3807f2153a7259a4a1d92fa4108b4f23950a168 /lld/test | |
| parent | de0a2247115729eade8249267a47f96f070a7666 (diff) | |
| download | bcm5719-llvm-7c816492197aefbaa2ea3ba0e391f7c6905956bc.tar.gz bcm5719-llvm-7c816492197aefbaa2ea3ba0e391f7c6905956bc.zip | |
[COFF] Align ARM64 range extension thunks at instruction boundary
RangeExtensionThunkARM64 is created for out-of-range branches on Windows ARM64
because branch instructions has limited bits to encode target address.
Currently, RangeExtensionThunkARM64 is appended to its referencing COFF section
from object file at link time without any alignment requirement, so if size of
the preceding COFF section is not aligned to instruction boundary (4 bytes),
RangeExtensionThunkARM64 will emit thunk instructions at unaligned address
which is never a valid branch target on ARM64, and usually triggers invalid
instruction exception when branching to it.
This PR fixes it by requiring such thunks to align at 4 bytes.
Differential revision: https://reviews.llvm.org/D72473
Diffstat (limited to 'lld/test')
| -rw-r--r-- | lld/test/COFF/arm64-thunks.s | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/lld/test/COFF/arm64-thunks.s b/lld/test/COFF/arm64-thunks.s index 49004544c43..eb71241d419 100644 --- a/lld/test/COFF/arm64-thunks.s +++ b/lld/test/COFF/arm64-thunks.s @@ -3,10 +3,11 @@ // RUN: lld-link -entry:main -subsystem:console %t.obj -out:%t.exe -verbose 2>&1 | FileCheck -check-prefix=VERBOSE %s // RUN: llvm-objdump -d %t.exe | FileCheck -check-prefix=DISASM %s -// VERBOSE: Added 1 thunks with margin {{.*}} in 1 passes +// VERBOSE: Added 2 thunks with margin {{.*}} in 1 passes .globl main .globl func1 + .globl func2 .text main: tbz w0, #0, func1 @@ -15,6 +16,14 @@ main: .space 0x8000 .section .text$b, "xr" func1: + tbz w0, #0, func2 + ret + .space 1 + .section .text$c, "xr" + .space 0x8000 + .section .text$d, "xr" + .align 2 +func2: ret // DISASM: 0000000140001000 .text: @@ -24,4 +33,11 @@ func1: // DISASM: 14000100c: 10 52 00 91 add x16, x16, #20 // DISASM: 140001010: 00 02 1f d6 br x16 -// DISASM: 140009014: c0 03 5f d6 ret +// DISASM: 140009014: 60 00 00 36 tbz w0, #0, #12 <.text+0x8020> +// DISASM: 140009018: c0 03 5f d6 ret + +// DISASM: 140009020: 50 00 00 90 adrp x16, #32768 +// DISASM: 140009024: 10 b2 00 91 add x16, x16, #44 +// DISASM: 140009028: 00 02 1f d6 br x16 + +// DISASM: 14001102c: c0 03 5f d6 ret |
