Don't dead-end asan_foo() entrypoints in the shim

[rsundahl]

Summary

Some entrypoints supporting LLDB process introspection were not
being forwarded to asan_abi_foo() stable ABI entrypoints which
effectively dead-ended them in NOPs that could not be implemented
by Stable ABI.

rdar://115974403

[wrotki]

Vitaly, thanks for looking at this.

[MaskRay]

Are __asan_abi_register_elf_globals needed if non-Apple systems don't build lib/asan_abi?

[rsundahl]

In D159545#4651099, @MaskRay wrote:

Are __asan_abi_register_elf_globals needed if non-Apple systems don't build lib/asan_abi?

Shouldn't need it for now but I put it there for completeness and I'm even though asan_abi is only building for Apple platforms, I'm also not trying to design other platforms out necessarily.

compiler-rt/lib/asan_abi/asan_abi.h

 //===-asan_abi.h - ASan Stable ABI Interface-------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef ASAN_ABI_H
 #define ASAN_ABI_H
 
 #include <stdbool.h>
 #include <stddef.h>
+#include <sys/cdefs.h>
 #include <sys/types.h>
 
-extern "C" {
+__BEGIN_DECLS
+
 // Functions concerning instrumented global variables:
 void __asan_abi_register_image_globals();
 void __asan_abi_unregister_image_globals();
+void __asan_abi_register_elf_globals(bool *flag, void *start, void *stop);
+void __asan_abi_unregister_elf_globals(bool *flag, void *start, void *stop);
+void __asan_abi_register_globals(void *globals, size_t n);
+void __asan_abi_unregister_globals(void *globals, size_t n);
 
 // Functions concerning dynamic library initialization
 void __asan_abi_before_dynamic_init(const char *module_name);
 void __asan_abi_after_dynamic_init();
 
 // Functions concerning block memory destinations
 void *__asan_abi_memcpy(void *d, const void *s, size_t n);
 void *__asan_abi_memmove(void *d, const void *s, size_t n);

 void __asan_abi_allocas_unpoison(void *top, void *bottom);
 
 // Functions concerning fake stack malloc
 void *__asan_abi_stack_malloc_n(size_t scale, size_t size);
 void *__asan_abi_stack_malloc_always_n(size_t scale, size_t size);
 
 // Functions concerning fake stack free
 void __asan_abi_stack_free_n(int scale, void *p, size_t n);
-}
+
+// Functions concerning introspection (including lldb support)
+void *__asan_abi_get_alloc_stack(void *addr, void **trace, size_t size,
+                                 int *thread_id);
+void __asan_abi_report_error(void *pc, void *bp, void *sp, void *addr,
+                             bool is_write, size_t access_size, int exp);
+void __asan_abi_set_error_report_callback(void (*callback)(const char *));
+void __asan_abi_describe_address(void *addr);
+bool __asan_abi_report_present(void);
+void *__asan_abi_get_report_pc(void);
+void *__asan_abi_get_report_bp(void);
+void *__asan_abi_get_report_sp(void);
+void *__asan_abi_get_report_address(void);
+int __asan_abi_get_report_access_type(void);
+size_t __asan_abi_get_report_access_size(void);
+const char *__asan_abi_get_report_description(void);
+
+__END_DECLS
 #endif // ASAN_ABI_H

compiler-rt/lib/asan_abi/asan_abi.cpp

 //===-asan_abi.cpp - ASan Stable ABI---------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "asan_abi.h"
 
 extern "C" {
 // Functions concerning instrumented global variables:
 void __asan_abi_register_image_globals(void) {}
 void __asan_abi_unregister_image_globals(void) {}
+void __asan_abi_register_elf_globals(bool *flag, void *start, void *stop) {}
+void __asan_abi_unregister_elf_globals(bool *flag, void *start, void *stop) {}
+void __asan_abi_register_globals(void *globals, size_t n) {}
+void __asan_abi_unregister_globals(void *globals, size_t n) {}
 
 // Functions concerning dynamic library initialization
 void __asan_abi_before_dynamic_init(const char *module_name) {}
 void __asan_abi_after_dynamic_init(void) {}
 
 // Functions concerning block memory destinations
 void *__asan_abi_memcpy(void *d, const void *s, size_t n) { return NULL; }
 void *__asan_abi_memmove(void *d, const void *s, size_t n) { return NULL; }

 // Functions concerning fake stack malloc
 void *__asan_abi_stack_malloc_n(size_t scale, size_t size) { return NULL; }
 void *__asan_abi_stack_malloc_always_n(size_t scale, size_t size) {
   return NULL;
 }
 
 // Functions concerning fake stack free
 void __asan_abi_stack_free_n(int scale, void *p, size_t n) {}
+
+// Functions concerning introspection (including lldb support)
+void *__asan_abi_get_alloc_stack(void *addr, void **trace, size_t size,
+                                 int *thread_id) {
+  return NULL;
+}
+void __asan_abi_report_error(void *pc, void *bp, void *sp, void *addr,
+                             bool is_write, size_t access_size, int exp) {}
+void __asan_abi_set_error_report_callback(void (*callback)(const char *)) {}
+void __asan_abi_describe_address(void *addr) {}
+bool __asan_abi_report_present(void) { return false; }
+void *__asan_abi_get_report_pc(void) { return NULL; }
+void *__asan_abi_get_report_bp(void) { return NULL; }
+void *__asan_abi_get_report_sp(void) { return NULL; }
+void *__asan_abi_get_report_address(void) { return NULL; }
+int __asan_abi_get_report_access_type(void) { return 0; }
+size_t __asan_abi_get_report_access_size(void) { return 0; }
+const char *__asan_abi_get_report_description(void) { return NULL; }
 }

compiler-rt/lib/asan_abi/asan_abi_shim.cpp

 #include "asan_abi.h"
 #include <assert.h>
 
 extern "C" {
 // Functions concerning instrumented global variables
 void __asan_register_image_globals(uptr *flag) {
   __asan_abi_register_image_globals();
 }
-
 void __asan_unregister_image_globals(uptr *flag) {
   __asan_abi_unregister_image_globals();
 }
-void __asan_register_elf_globals(uptr *flag, void *start, void *stop) {}
-void __asan_unregister_elf_globals(uptr *flag, void *start, void *stop) {}
-void __asan_register_globals(__asan_global *globals, uptr n) {}
-void __asan_unregister_globals(__asan_global *globals, uptr n) {}
+void __asan_register_elf_globals(uptr *flag, void *start, void *stop) {
+  bool bFlag = *flag;
+  __asan_abi_register_elf_globals(&bFlag, start, stop);
+  *flag = bFlag;
+}
+void __asan_unregister_elf_globals(uptr *flag, void *start, void *stop) {
+  bool bFlag = *flag;
+  __asan_abi_unregister_elf_globals(&bFlag, start, stop);
+  *flag = bFlag;
+}
+void __asan_register_globals(__asan_global *globals, uptr n) {
+  __asan_abi_register_globals(globals, n);
+}
+void __asan_unregister_globals(__asan_global *globals, uptr n) {
+  __asan_abi_unregister_globals(globals, n);
+}
 
 // Functions concerning dynamic library initialization
 void __asan_before_dynamic_init(const char *module_name) {
   __asan_abi_before_dynamic_init(module_name);
 }
 void __asan_after_dynamic_init(void) { __asan_abi_after_dynamic_init(); }
 
 // Functions concerning block memory destinations

 void __asan_poison_stack_memory(uptr addr, uptr size) {
   __asan_abi_poison_stack_memory((void *)addr, size);
 }
 void __asan_unpoison_stack_memory(uptr addr, uptr size) {
   __asan_abi_unpoison_stack_memory((void *)addr, size);
 }
 
 // Functions concerning redzone poisoning
-void __asan_poison_intra_object_redzone(uptr p, uptr size) {}
-void __asan_unpoison_intra_object_redzone(uptr p, uptr size) {}
+void __asan_poison_intra_object_redzone(uptr p, uptr size) {
+  __asan_abi_poison_intra_object_redzone((void *)p, size);
+}
+void __asan_unpoison_intra_object_redzone(uptr p, uptr size) {
+  __asan_abi_unpoison_intra_object_redzone((void *)p, size);
+}
 
 // Functions concerning array cookie poisoning
-void __asan_poison_cxx_array_cookie(uptr p) {}
+void __asan_poison_cxx_array_cookie(uptr p) {
+  __asan_abi_poison_cxx_array_cookie((void *)p);
+}
 uptr __asan_load_cxx_array_cookie(uptr *p) {
-  // TBD: Fail here
-  return (uptr)0;
+  return (uptr)__asan_abi_load_cxx_array_cookie((void **)p);
 }
 
 // Functions concerning fake stacks
 void *__asan_get_current_fake_stack(void) {
-  // TBD: Fail here
-  return (void *)0;
+  return __asan_abi_get_current_fake_stack();
 }
 void *__asan_addr_is_in_fake_stack(void *fake_stack, void *addr, void **beg,
                                    void **end) {
-  // TBD: Fail here
-  return (void *)0;
+  return __asan_abi_addr_is_in_fake_stack(fake_stack, addr, beg, end);
 }
 
 // Functions concerning poisoning and unpoisoning fake stack alloca
 void __asan_alloca_poison(uptr addr, uptr size) {
   __asan_abi_alloca_poison((void *)addr, size);
 }
 void __asan_allocas_unpoison(uptr top, uptr bottom) {
   __asan_abi_allocas_unpoison((void *)top, (void *)bottom);
void __asan_stack_free_9(uptr ptr, uptr size) {
   __asan_abi_stack_free_n(9, (void *)ptr, size);
 }
 void __asan_stack_free_10(uptr ptr, uptr size) {
   __asan_abi_stack_free_n(10, (void *)ptr, size);
 }
 
 // Functions concerning introspection (including lldb support)
 uptr __asan_get_alloc_stack(uptr addr, uptr *trace, uptr size, u32 *thread_id) {
-  // TBD: Fail here
-  return (uptr)0;
+  return (uptr)__asan_abi_get_alloc_stack((void *)addr, (void **)trace,
+                                          (size_t)size, (int *)thread_id);
 }
 void __asan_report_error(uptr pc, uptr bp, uptr sp, uptr addr, int is_write,
-                         uptr access_size, u32 exp) {}
-void __asan_set_error_report_callback(void (*callback)(const char *)) {}
-void __asan_describe_address(uptr addr) {}
-int __asan_report_present(void) { return (int)0; }
-uptr __asan_get_report_pc(void) { return (uptr)0; }
-uptr __asan_get_report_bp(void) { return (uptr)0; }
-uptr __asan_get_report_sp(void) { return (uptr)0; }
-uptr __asan_get_report_address(void) { return (uptr)0; }
-int __asan_get_report_access_type(void) { return (int)0; }
-uptr __asan_get_report_access_size(void) { return (uptr)0; }
-const char *__asan_get_report_description(void) { return (const char *)0; }
+                         uptr access_size, u32 exp) {
+  __asan_abi_report_error((void *)pc, (void *)bp, (void *)sp, (void *)addr,
+                          (bool)is_write, (size_t)access_size, (int)exp);
+}
+void __asan_set_error_report_callback(void (*callback)(const char *)) {
+  __asan_abi_set_error_report_callback(callback);
+}
+void __asan_describe_address(uptr addr) {
+  __asan_abi_describe_address((void *)addr);
+}
+int __asan_report_present(void) { return __asan_abi_report_present(); }
+uptr __asan_get_report_pc(void) { return (uptr)__asan_abi_get_report_pc(); }
+uptr __asan_get_report_bp(void) { return (uptr)__asan_abi_get_report_bp(); }
+uptr __asan_get_report_sp(void) { return (uptr)__asan_abi_get_report_sp(); }
+uptr __asan_get_report_address(void) {
+  return (uptr)__asan_abi_get_report_address();
+}
+int __asan_get_report_access_type(void) {
+  return __asan_abi_get_report_access_type();
+}
+uptr __asan_get_report_access_size(void) {
+  return (uptr)__asan_abi_get_report_access_size();
+}
+const char *__asan_get_report_description(void) {
+  return __asan_abi_get_report_description();
+}
 }