[ASan] Reland of D116182 to always link asan_static library.

[kstoimenov]

Summary

After landing D121813 the binary size increase introduced by this change can be minimized by using --gc-sections link options. D121813 allows each individual callbacks to be optimized out if not used.

[MaskRay]

State in the description whether this is a partial or full revert of D121405?

[MaskRay]

In D122407#3406066, @MaskRay wrote:

State in the description whether this is a partial or full revert of D121405?

The commit message does not mention D121405.

clang/lib/Driver/ToolChains/CommonArgs.cpp

if (SanArgs.needsHwasanRt() && SanArgs.linkRuntimes()) {
         HelperStaticRuntimes.push_back("hwasan-preinit");
     }
   }
 
   // The stats_client library is also statically linked into DSOs.
   if (SanArgs.needsStatsRt() && SanArgs.linkRuntimes())
     StaticRuntimes.push_back("stats_client");
 
+  // Always link the static runtime regardless of DSO or executable.
+  if (SanArgs.needsAsanRt())
+    HelperStaticRuntimes.push_back("asan_static");
+
   // Collect static runtimes.
   if (Args.hasArg(options::OPT_shared)) {
     // Don't link static runtimes into DSOs.
     return;
   }
 
   // Each static runtime that has a DSO counterpart above is excluded below,
   // but runtimes that exist only as static are not affected by needsSharedRt.

clang/test/Driver/sanitizer-ld.c

 // CHECK-ASAN-NO-LINK-RUNTIME-LINUX-NOT: libclang_rt.asan-x86_64
 
 // RUN: %clang -fsanitize=address %s -### -o %t.o 2>&1 \
 // RUN:     -target x86_64-unknown-linux -fuse-ld=ld \
 // RUN:     -resource-dir=%S/Inputs/resource_dir \
 // RUN:     --sysroot=%S/Inputs/basic_linux_tree \
 // RUN:   | FileCheck --check-prefix=CHECK-ASAN-EXECUTABLE-LINUX %s
 //
+// CHECK-ASAN-EXECUTABLE-LINUX: libclang_rt.asan_static-x86_64
 // CHECK-ASAN-EXECUTABLE-LINUX: libclang_rt.asan-x86_64
 
 // RUN: %clang -fsanitize=address -shared %s -### -o %t.o 2>&1  \
 // RUN:     -target x86_64-unknown-linux -fuse-ld=ld \
 // RUN:     -resource-dir=%S/Inputs/resource_dir \
 // RUN:     --sysroot=%S/Inputs/basic_linux_tree \
 // RUN:   | FileCheck --check-prefix=CHECK-ASAN-SHARED-LINUX %s
 //
+// CHECK-ASAN-SHARED-LINUX: libclang_rt.asan_static-x86_64
 // CHECK-ASAN-SHARED-LINUX-NOT: libclang_rt.asan-x86_64
 
 // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
 // RUN:     -target i386-unknown-linux -fuse-ld=ld -fsanitize=address -shared-libsan \
 // RUN:     -resource-dir=%S/Inputs/resource_dir \
 // RUN:     --sysroot=%S/Inputs/basic_linux_tree \
 // RUN:   | FileCheck --check-prefix=CHECK-SHARED-ASAN-LINUX %s
 

compiler-rt/lib/asan/CMakeLists.txt

set(ASAN_SOURCES
   asan_stats.cpp
   asan_suppressions.cpp
   asan_thread.cpp
   asan_win.cpp
   )
 
 if (NOT WIN32 AND NOT APPLE)
   list(APPEND ASAN_SOURCES
-    asan_rtl_x86_64.S
     asan_interceptors_vfork.S
     )
 endif()
 
 set(ASAN_CXX_SOURCES
   asan_new_delete.cpp
   )
 
 set(ASAN_STATIC_SOURCES
   asan_rtl_static.cpp
   )
 
 if (NOT WIN32 AND NOT APPLE)
   list(APPEND ASAN_STATIC_SOURCES
+    asan_rtl_x86_64.S
   )
 endif()
 
 set(ASAN_PREINIT_SOURCES
   asan_preinit.cpp
   )
 
 SET(ASAN_HEADERS

compiler-rt/lib/asan/asan_interface.inc

 INTERFACE_FUNCTION(__sanitizer_unaligned_load64)
 INTERFACE_FUNCTION(__sanitizer_unaligned_store16)
 INTERFACE_FUNCTION(__sanitizer_unaligned_store32)
 INTERFACE_FUNCTION(__sanitizer_unaligned_store64)
 INTERFACE_FUNCTION(__asan_update_allocation_context)
 INTERFACE_WEAK_FUNCTION(__asan_default_options)
 INTERFACE_WEAK_FUNCTION(__asan_default_suppressions)
 INTERFACE_WEAK_FUNCTION(__asan_on_error)
-
-#if defined(__x86_64__) && !defined(__APPLE__) && !defined(_WIN32)
-
-#  define ASAN_MEMORY_ACCESS_CALLBACK_ADD(s, reg, op) \
-    INTERFACE_FUNCTION(__asan_check_##op##_add_##s##_##reg)
-
-#  define ASAN_MEMORY_ACCESS_CALLBACKS_ADD(reg)    \
-    ASAN_MEMORY_ACCESS_CALLBACK_ADD(1, reg, load)  \
-    ASAN_MEMORY_ACCESS_CALLBACK_ADD(1, reg, store) \
-    ASAN_MEMORY_ACCESS_CALLBACK_ADD(2, reg, load)  \
-    ASAN_MEMORY_ACCESS_CALLBACK_ADD(2, reg, store) \
-    ASAN_MEMORY_ACCESS_CALLBACK_ADD(4, reg, load)  \
-    ASAN_MEMORY_ACCESS_CALLBACK_ADD(4, reg, store) \
-    ASAN_MEMORY_ACCESS_CALLBACK_ADD(8, reg, load)  \
-    ASAN_MEMORY_ACCESS_CALLBACK_ADD(8, reg, store) \
-    ASAN_MEMORY_ACCESS_CALLBACK_ADD(16, reg, load) \
-    ASAN_MEMORY_ACCESS_CALLBACK_ADD(16, reg, store)
-
-ASAN_MEMORY_ACCESS_CALLBACKS_ADD(RAX)
-ASAN_MEMORY_ACCESS_CALLBACKS_ADD(RBX)
-ASAN_MEMORY_ACCESS_CALLBACKS_ADD(RCX)
-ASAN_MEMORY_ACCESS_CALLBACKS_ADD(RDX)
-ASAN_MEMORY_ACCESS_CALLBACKS_ADD(RSI)
-ASAN_MEMORY_ACCESS_CALLBACKS_ADD(RDI)
-ASAN_MEMORY_ACCESS_CALLBACKS_ADD(RBP)
-ASAN_MEMORY_ACCESS_CALLBACKS_ADD(R8)
-ASAN_MEMORY_ACCESS_CALLBACKS_ADD(R9)
-ASAN_MEMORY_ACCESS_CALLBACKS_ADD(R12)
-ASAN_MEMORY_ACCESS_CALLBACKS_ADD(R13)
-ASAN_MEMORY_ACCESS_CALLBACKS_ADD(R14)
-ASAN_MEMORY_ACCESS_CALLBACKS_ADD(R15)
-
-#endif  // defined(__x86_64__) && !defined(__APPLE__) && !defined(_WIN32)
-

compiler-rt/lib/asan/asan_rtl_x86_64.S

 #define FNAME(reg, op, s, i) NAME(__asan_check, reg, op, s, i)
 #define RLABEL(reg, op, s, i) NAME(.return, reg, op, s, i)
 #define CLABEL(reg, op, s, i) NAME(.check, reg, op, s, i)
 #define FLABEL(reg, op, s, i) NAME(.fail, reg, op, s, i)
 
 #define BEGINF(reg, op, s, i) \
 .section .text.FNAME(reg, op, s, i),"ax",@progbits ;\
 .globl  FNAME(reg, op, s, i) ;\
+.hidden  FNAME(reg, op, s, i) ;\
 ASM_TYPE_FUNCTION(FNAME(reg, op, s, i)) ;\
 .cfi_startproc ;\
 FNAME(reg, op, s, i): ;\
 
 #define ENDF .cfi_endproc ;\
 
 // Access check functions for 1,2 and 4 byte types, which require extra checks.
 #define ASAN_MEMORY_ACCESS_INITIAL_CHECK_ADD(reg, op, s) \

 CLABEL(reg, op, 1, i): ;\
         push   %rcx ;\
         mov    %##reg,%rcx ;\
         and    $0x7,%ecx ;\
         cmp    %r10d,%ecx ;\
         pop    %rcx ;\
         jl     RLABEL(reg, op, 1, i);\
         mov    %##reg,%rdi ;\
-        jmp    __asan_report_##op##1@PLT ;\
+        jmp    __asan_report_##op##1_asm ;\
 
 #define ASAN_MEMORY_ACCESS_EXTRA_CHECK_2(reg, op, i) \
 CLABEL(reg, op, 2, i): ;\
         push   %rcx ;\
         mov    %##reg,%rcx ;\
         and    $0x7,%ecx ;\
         add    $0x1,%ecx ;\
         cmp    %r10d,%ecx ;\
         pop    %rcx ;\
         jl     RLABEL(reg, op, 2, i);\
         mov    %##reg,%rdi ;\
-        jmp    __asan_report_##op##2@PLT ;\
+        jmp    __asan_report_##op##2_asm ;\
 
 #define ASAN_MEMORY_ACCESS_EXTRA_CHECK_4(reg, op, i) \
 CLABEL(reg, op, 4, i): ;\
         push   %rcx ;\
         mov    %##reg,%rcx ;\
         and    $0x7,%ecx ;\
         add    $0x3,%ecx ;\
         cmp    %r10d,%ecx ;\
         pop    %rcx ;\
         jl     RLABEL(reg, op, 4, i);\
         mov    %##reg,%rdi ;\
-        jmp    __asan_report_##op##4@PLT ;\
+        jmp    __asan_report_##op##4_asm ;\
 
 #define ASAN_MEMORY_ACCESS_CALLBACK_ADD_1(reg, op) \
 BEGINF(reg, op, 1, add) ;\
         ASAN_MEMORY_ACCESS_INITIAL_CHECK_ADD(reg, op, 1) ;\
         ASAN_MEMORY_ACCESS_EXTRA_CHECK_1(reg, op, add) ;\
 ENDF
 
 #define ASAN_MEMORY_ACCESS_CALLBACK_ADD_2(reg, op) \
#define ASAN_MEMORY_ACCESS_CHECK_ADD(reg, op, s, c) \
         shr    $0x3,%r10 ;\
         ##c    $0x0,ASAN_SHADOW_OFFSET_CONST(%r10) ;\
         jne    FLABEL(reg, op, s, add) ;\
         retq  ;\
 
 #define ASAN_MEMORY_ACCESS_FAIL(reg, op, s, i) \
 FLABEL(reg, op, s, i): ;\
         mov    %##reg,%rdi ;\
-        jmp    __asan_report_##op##s@PLT;\
+        jmp    __asan_report_##op##s##_asm;\
 
 #define ASAN_MEMORY_ACCESS_CALLBACK_ADD_8(reg, op) \
 BEGINF(reg, op, 8, add) ;\
         ASAN_MEMORY_ACCESS_CHECK_ADD(reg, op, 8, cmpb) ;\
         ASAN_MEMORY_ACCESS_FAIL(reg, op, 8, add) ;\
 ENDF
 
 #define ASAN_MEMORY_ACCESS_CALLBACK_ADD_16(reg, op) \