This is an archive of the discontinued LLVM Phabricator instance.

Differential D64022

[TSan] Improve handling of stack pointer mangling in {set,long}jmp, pt.5
ClosedPublic

Authored by yln on Jul 1 2019, 10:44 AM.

Details

Reviewers
dvyukov
Commits
rCRT365230: [TSan] Improve handling of stack pointer mangling in {set,long}jmp, pt.5
rG515fdfd5125f: [TSan] Improve handling of stack pointer mangling in {set,long}jmp, pt.5
rL365230: [TSan] Improve handling of stack pointer mangling in {set,long}jmp, pt.5
Summary

Remove unnecessary computation of mangled SP for ARM64 architecture.

Diff Detail

Repository
rL LLVM

Event Timeline

yln created this revision.Jul 1 2019, 10:44 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptJul 1 2019, 10:44 AM
Herald added subscribers: llvm-commits, Restricted Project, kristof.beyls and 2 others. · View Herald Transcript
Harbormaster completed remote builds in B34147: Diff 207375.Jul 1 2019, 10:44 AM
dvyukov accepted this revision.Jul 4 2019, 11:22 AM

Everything that deletes code LGTM :)

This revision is now accepted and ready to land.Jul 4 2019, 11:22 AM
Closed by commit rL365230: [TSan] Improve handling of stack pointer mangling in {set,long}jmp, pt.5 (authored by yln). · Explain WhyJul 5 2019, 11:02 AM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: delcypher. · View Herald TranscriptJul 5 2019, 11:02 AM

Revision Contents

PathSize
compiler-rt/
trunk/
lib/
tsan/
rtl/
43 lines

Diff 208212

compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_aarch64.S

Show First 20 Lines • Show All 99 Lines • ▼ Show 20 LinesASM_SYMBOL_INTERCEPTOR(setjmp):
add x29, sp, 0 add x29, sp, 0
CFI_DEF_CFA_REGISTER (29) CFI_DEF_CFA_REGISTER (29)
// Save jmp_buf // Save jmp_buf
str x19, [sp, 16] str x19, [sp, 16]
CFI_OFFSET (19, -16) CFI_OFFSET (19, -16)
mov x19, x0 mov x19, x0
#if !defined(__APPLE__) // Obtain SP, first argument to `void __tsan_setjmp(uptr sp)`
// SP pointer mangling (see glibc setjmp)
adrp x2, __tsan_pointer_chk_guard
ldr x2, [x2, #:lo12:__tsan_pointer_chk_guard]
add x0, x29, 32 add x0, x29, 32
eor x1, x2, x0
#else
adrp x2, ___tsan_darwin_setjmp_xor_key@page
ldr x2, [x2, ___tsan_darwin_setjmp_xor_key@pageoff]
add x0, x29, 32
eor x1, x2, x0
#endif
// call tsan interceptor // call tsan interceptor
bl ASM_SYMBOL(__tsan_setjmp) bl ASM_SYMBOL(__tsan_setjmp)
// restore env parameter // restore env parameter
mov x0, x19 mov x0, x19
ldr x19, [sp, 16] ldr x19, [sp, 16]
ldp x29, x30, [sp], 32 ldp x29, x30, [sp], 32
Show All 32 LinesASM_SYMBOL_INTERCEPTOR(_setjmp):
add x29, sp, 0 add x29, sp, 0
CFI_DEF_CFA_REGISTER (29) CFI_DEF_CFA_REGISTER (29)
// Save jmp_buf // Save jmp_buf
str x19, [sp, 16] str x19, [sp, 16]
CFI_OFFSET (19, -16) CFI_OFFSET (19, -16)
mov x19, x0 mov x19, x0
#if !defined(__APPLE__) // Obtain SP, first argument to `void __tsan_setjmp(uptr sp)`
// SP pointer mangling (see glibc setjmp)
adrp x2, __tsan_pointer_chk_guard
ldr x2, [x2, #:lo12:__tsan_pointer_chk_guard]
add x0, x29, 32
eor x1, x2, x0
#else
adrp x2, ___tsan_darwin_setjmp_xor_key@page
ldr x2, [x2, ___tsan_darwin_setjmp_xor_key@pageoff]
add x0, x29, 32 add x0, x29, 32
eor x1, x2, x0
#endif
// call tsan interceptor // call tsan interceptor
bl ASM_SYMBOL(__tsan_setjmp) bl ASM_SYMBOL(__tsan_setjmp)
// Restore jmp_buf parameter // Restore jmp_buf parameter
mov x0, x19 mov x0, x19
ldr x19, [sp, 16] ldr x19, [sp, 16]
ldp x29, x30, [sp], 32 ldp x29, x30, [sp], 32
Show All 34 LinesASM_SYMBOL_INTERCEPTOR(sigsetjmp):
// Save jmp_buf and savesigs // Save jmp_buf and savesigs
stp x19, x20, [sp, 16] stp x19, x20, [sp, 16]
CFI_OFFSET (19, -16) CFI_OFFSET (19, -16)
CFI_OFFSET (20, -8) CFI_OFFSET (20, -8)
mov w20, w1 mov w20, w1
mov x19, x0 mov x19, x0
#if !defined(__APPLE__) // Obtain SP, first argument to `void __tsan_setjmp(uptr sp)`
// SP pointer mangling (see glibc setjmp)
adrp x2, __tsan_pointer_chk_guard
ldr x2, [x2, #:lo12:__tsan_pointer_chk_guard]
add x0, x29, 32
eor x1, x2, x0
#else
adrp x2, ___tsan_darwin_setjmp_xor_key@page
ldr x2, [x2, ___tsan_darwin_setjmp_xor_key@pageoff]
add x0, x29, 32 add x0, x29, 32
eor x1, x2, x0
#endif
// call tsan interceptor // call tsan interceptor
bl ASM_SYMBOL(__tsan_setjmp) bl ASM_SYMBOL(__tsan_setjmp)
// restore env parameter // restore env parameter
mov w1, w20 mov w1, w20
mov x0, x19 mov x0, x19
ldp x19, x20, [sp, 16] ldp x19, x20, [sp, 16]
Show All 37 LinesASM_SYMBOL_INTERCEPTOR(__sigsetjmp):
// Save jmp_buf and savesigs // Save jmp_buf and savesigs
stp x19, x20, [sp, 16] stp x19, x20, [sp, 16]
CFI_OFFSET (19, -16) CFI_OFFSET (19, -16)
CFI_OFFSET (20, -8) CFI_OFFSET (20, -8)
mov w20, w1 mov w20, w1
mov x19, x0 mov x19, x0
#if !defined(__APPLE__) // Obtain SP, first argument to `void __tsan_setjmp(uptr sp)`
// SP pointer mangling (see glibc setjmp)
adrp x2, __tsan_pointer_chk_guard
ldr x2, [x2, #:lo12:__tsan_pointer_chk_guard]
add x0, x29, 32 add x0, x29, 32
eor x1, x2, x0
#endif
// call tsan interceptor // call tsan interceptor
bl ASM_SYMBOL(__tsan_setjmp) bl ASM_SYMBOL(__tsan_setjmp)
mov w1, w20 mov w1, w20
mov x0, x19 mov x0, x19
ldp x19, x20, [sp, 16] ldp x19, x20, [sp, 16]
ldp x29, x30, [sp], 32 ldp x29, x30, [sp], 32
Show All 23 Lines