Skip to content

Commit d477f1b

Browse files
committed
[ASan] Export optimized callbacks.
This is a part of optimized callback reverts. This is needed to export the callbacks from the rt-asan libraries. Reviewed By: kstoimenov Differential Revision: https://reviews.llvm.org/D121464
1 parent 1a41486 commit d477f1b

File tree

2 files changed

+34
-1
lines changed

2 files changed

+34
-1
lines changed

compiler-rt/lib/asan/asan_interface.inc

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,3 +180,37 @@ INTERFACE_FUNCTION(__asan_update_allocation_context)
180180
INTERFACE_WEAK_FUNCTION(__asan_default_options)
181181
INTERFACE_WEAK_FUNCTION(__asan_default_suppressions)
182182
INTERFACE_WEAK_FUNCTION(__asan_on_error)
183+
184+
#if defined(__x86_64__)
185+
186+
# define ASAN_MEMORY_ACCESS_CALLBACK_ADD(s, reg, op) \
187+
INTERFACE_FUNCTION(__asan_check_##op##_add_##s##_##reg)
188+
189+
# define ASAN_MEMORY_ACCESS_CALLBACKS_ADD(reg) \
190+
ASAN_MEMORY_ACCESS_CALLBACK_ADD(1, reg, load) \
191+
ASAN_MEMORY_ACCESS_CALLBACK_ADD(1, reg, store) \
192+
ASAN_MEMORY_ACCESS_CALLBACK_ADD(2, reg, load) \
193+
ASAN_MEMORY_ACCESS_CALLBACK_ADD(2, reg, store) \
194+
ASAN_MEMORY_ACCESS_CALLBACK_ADD(4, reg, load) \
195+
ASAN_MEMORY_ACCESS_CALLBACK_ADD(4, reg, store) \
196+
ASAN_MEMORY_ACCESS_CALLBACK_ADD(8, reg, load) \
197+
ASAN_MEMORY_ACCESS_CALLBACK_ADD(8, reg, store) \
198+
ASAN_MEMORY_ACCESS_CALLBACK_ADD(16, reg, load) \
199+
ASAN_MEMORY_ACCESS_CALLBACK_ADD(16, reg, store)
200+
201+
ASAN_MEMORY_ACCESS_CALLBACKS_ADD(RAX)
202+
ASAN_MEMORY_ACCESS_CALLBACKS_ADD(RBX)
203+
ASAN_MEMORY_ACCESS_CALLBACKS_ADD(RCX)
204+
ASAN_MEMORY_ACCESS_CALLBACKS_ADD(RDX)
205+
ASAN_MEMORY_ACCESS_CALLBACKS_ADD(RSI)
206+
ASAN_MEMORY_ACCESS_CALLBACKS_ADD(RDI)
207+
ASAN_MEMORY_ACCESS_CALLBACKS_ADD(RBP)
208+
ASAN_MEMORY_ACCESS_CALLBACKS_ADD(R8)
209+
ASAN_MEMORY_ACCESS_CALLBACKS_ADD(R9)
210+
ASAN_MEMORY_ACCESS_CALLBACKS_ADD(R12)
211+
ASAN_MEMORY_ACCESS_CALLBACKS_ADD(R13)
212+
ASAN_MEMORY_ACCESS_CALLBACKS_ADD(R14)
213+
ASAN_MEMORY_ACCESS_CALLBACKS_ADD(R15)
214+
215+
#endif // defined(__x86_64__)
216+

compiler-rt/lib/asan/asan_rtl_x86_64.S

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
#define BEGINF(reg, op, s, i) \
1818
.globl FNAME(reg, op, s, i) ;\
19-
.hidden FNAME(reg, op, s, i) ;\
2019
ASM_TYPE_FUNCTION(FNAME(reg, op, s, i)) ;\
2120
.cfi_startproc ;\
2221
FNAME(reg, op, s, i): ;\

0 commit comments

Comments
 (0)