[ASan] Shared optimized callbacks implementation.

[kstoimenov]

Summary

This change moves optimized callbacks from each .o file to compiler-rt. Instead of using code generation it uses direct assembly implementation. Please note that the 'or' version is not implemented and it will produce unresolved external if somehow 'or' version is requested.

[kstoimenov]

Reformat.

[kstoimenov]

Reformat.

[kstoimenov]

Removed 'or'.

[kstoimenov]

Removed/renamed.

[kstoimenov]

Removed RSP.

[kstoimenov]

Removed unused flag.

[vitalybuka]

compiler-rt/lib/asan/tests/asan_noinst_test.cpp

13–29

can you commit this line reordering separately and rebase the patch

351

I see SHADOW_OFFSET_STR neither in existing code nor in the patch
Is some file is missing or another patch.

compiler-rt/lib/sanitizer_common/sanitizer_shadow_defines.h

14 ↗

(On Diff #389622)

why it's in common? these constants are asan specific

llvm/test/CodeGen/X86/asan-check-memaccess-add.ll

61–62

why do you need x86_64 in nname?

[morehouse]

compiler-rt/lib/asan/asan_rtl_x86_64.S

19

Nit: Can we omit the semicolons?

89

100

I think we also need to handle the 16 byte case.

compiler-rt/lib/sanitizer_common/sanitizer_shadow_defines.h

32 ↗

(On Diff #389622)

Looks like in asan_mapping.h this value is 0xd55550000.

46 ↗

(On Diff #389622)

Why is the offset 0 for all these platforms? It looks like they have non-zero in asan_mapping.h.

compiler-rt/test/asan/TestCases/Linux/interface_symbols_linux.cpp

4

Why is this step required now?

[morehouse]

compiler-rt/lib/asan/asan_rtl_x86_64.S

43

Maybe I've confused myself, but isn't this condition opposite of what we want?

if (last_accessed_byte >= shadow_value) crash()

would translate to

cmp %ecx, %r8d
...
jl RLABEL(...)

or

cmp %r8d, %ecx
...
jg RLABEL(...)

[kstoimenov]

After rebase.

[kstoimenov]

Addressed comments.

[kstoimenov]

Update.

[kstoimenov]

Addressed comments.

[kstoimenov]

compiler-rt/lib/asan/asan_rtl_x86_64.S

19

Unfortunately no. The issue is that macros are expanded as single line and ; is used instead of a new line character.

43

Here is the disassembled version of __asan_load1:

mov    %rdi,%rax
shr    $0x3,%rax
movsbl 0x7fff8000(%rax),%eax
test   %eax,%eax
jne    <__asan_load1+0x13>
ret    
mov    %edi,%ecx
and    $0x7,%ecx
cmp    %eax,%ecx
jl     <__asan_load1+0x12>
xor    %esi,%esi
mov    $0x1,%edx
xor    %ecx,%ecx
mov    $0x1,%r8d
jmp    <_ZN6__asanL25ReportGenericErrorWrapperEmbiib>

100

Good catch!

compiler-rt/lib/asan/asan_shadow_defines.h

32–50

Fixed 0 constants. @morehouse PTAL.

compiler-rt/lib/asan/tests/asan_noinst_test.cpp

351

It is supposed to be SHADOW_OFFSET. Good catch.

compiler-rt/test/asan/TestCases/Linux/interface_symbols_linux.cpp

4

It runs the preprocessor, which will produce platform specific files for the platform as they are guarded by #ifdef in the asan_interface.inc file.

llvm/test/CodeGen/X86/asan-check-memaccess-add.ll

61–62

No, it doesn't. Removed.

[kstoimenov]

Updated comments to reflect the R10, R11 change.

[kstoimenov]

Fixed SHADOW_OFFSET_CONST.

compiler-rt/lib/asan/tests/asan_noinst_test.cpp

351

Correction:
It should be SHADOW_OFFSET_CONST.

[kstoimenov]

Fixed the test and SHADOW_OFFSET_CONST.

[kstoimenov]

Added an error message.

[vitalybuka]

I would recommend to separate llvm into a separate patch, so you can land compiler-rt separately. That part is likely NFC on it's own, but you can wait some time to see if it was not reverted because of breaking. And then you can land/revert llvm part as many times you want

compiler-rt/lib/asan/asan_mapping.h

155–202

it would be nice to move formating out of the patch and submit separately, review is not required

compiler-rt/lib/asan/asan_rtl_x86_64.S

89

it's back again?

compiler-rt/lib/asan/asan_shadow_defines.h

18

why can't you move this into asan_mapping.h?

compiler-rt/lib/asan/tests/asan_noinst_test.cpp

331

ASAN_MEMORY_ACCESS_CALLBACKS_ADD -> TEST_ASAN_MEMORY_ACCESS_CALLBACKS_ADD

because it instantiates tests

[kstoimenov]

After landing format fix.

[kstoimenov]

After landing PLT Safe.

[kstoimenov]

Fixed build after merge.

[kstoimenov]

Fixed old problems.

[kstoimenov]

Renamed test macros.

[kstoimenov]

compiler-rt/lib/asan/asan_shadow_defines.h

18

I can't include asan_mapping.h from .S files.

[vitalybuka]

compiler-rt/lib/asan/asan_shadow_defines.h

18

Can you do an opposite? include this one into asan_mapping and use SHADOW_OFFSET_CONST there.

[kstoimenov]

Used macros and added clang-format off/on.

[vitalybuka]

compiler-rt/lib/asan/asan_interface.inc

184

why?
I applied and clang-format does a reasonable job

[vitalybuka]

compiler-rt/lib/asan/asan_interface.inc

184

btw
check-asan fails like that

=== NOTE === If you see a mismatch below, please update sanitizer_interface.inc files.
7,19c7,136
< __asan_check_op_add_s_R12
< __asan_check_op_add_s_R13
< __asan_check_op_add_s_R14
< __asan_check_op_add_s_R15
< __asan_check_op_add_s_R8
< __asan_check_op_add_s_R9
< __asan_check_op_add_s_RAX
< __asan_check_op_add_s_RBP
< __asan_check_op_add_s_RBX
< __asan_check_op_add_s_RCX
< __asan_check_op_add_s_RDI
< __asan_check_op_add_s_RDX
< __asan_check_op_add_s_RSI
---
> __asan_check_load_add_16_R12
> __asan_check_load_add_16_R13
> __asan_check_load_add_16_R14
> __asan_check_load_add_16_R15
> __asan_check_load_add_16_R8
> __asan_check_load_add_16_R9
> __asan_check_load_add_16_RAX
> __asan_check_load_add_16_RBP
> __asan_check_load_add_16_RBX
> __asan_check_load_add_16_RCX
> __asan_check_load_add_16_RDI
> __asan_check_load_add_16_RDX
> __asan_check_load_add_16_RSI
> __asan_check_load_add_1_R12
> __asan_check_load_add_1_R13
> __asan_check_load_add_1_R14
> __asan_check_load_add_1_R15
> __asan_check_load_add_1_R8
> __asan_check_load_add_1_R9
> __asan_check_load_add_1_RAX
> __asan_check_load_add_1_RBP
> __asan_check_load_add_1_RBX
> __asan_check_load_add_1_RCX
> __asan_check_load_add_1_RDI
> __asan_check_load_add_1_RDX
> __asan_check_load_add_1_RSI
> __asan_check_load_add_2_R12
> __asan_check_load_add_2_R13
> __asan_check_load_add_2_R14
> __asan_check_load_add_2_R15
> __asan_check_load_add_2_R8
> __asan_check_load_add_2_R9
> __asan_check_load_add_2_RAX
> __asan_check_load_add_2_RBP
> __asan_check_load_add_2_RBX
> __asan_check_load_add_2_RCX
> __asan_check_load_add_2_RDI
> __asan_check_load_add_2_RDX
> __asan_check_load_add_2_RSI
> __asan_check_load_add_4_R12
> __asan_check_load_add_4_R13
> __asan_check_load_add_4_R14
> __asan_check_load_add_4_R15
> __asan_check_load_add_4_R8
> __asan_check_load_add_4_R9
> __asan_check_load_add_4_RAX
> __asan_check_load_add_4_RBP
> __asan_check_load_add_4_RBX
> __asan_check_load_add_4_RCX
> __asan_check_load_add_4_RDI
> __asan_check_load_add_4_RDX
> __asan_check_load_add_4_RSI
> __asan_check_load_add_8_R12
> __asan_check_load_add_8_R13
> __asan_check_load_add_8_R14
> __asan_check_load_add_8_R15
> __asan_check_load_add_8_R8
> __asan_check_load_add_8_R9
> __asan_check_load_add_8_RAX
> __asan_check_load_add_8_RBP
> __asan_check_load_add_8_RBX
> __asan_check_load_add_8_RCX
> __asan_check_load_add_8_RDI
> __asan_check_load_add_8_RDX
> __asan_check_load_add_8_RSI
> __asan_check_store_add_16_R12
> __asan_check_store_add_16_R13
> __asan_check_store_add_16_R14
> __asan_check_store_add_16_R15
> __asan_check_store_add_16_R8
> __asan_check_store_add_16_R9
> __asan_check_store_add_16_RAX
> __asan_check_store_add_16_RBP
> __asan_check_store_add_16_RBX
> __asan_check_store_add_16_RCX
> __asan_check_store_add_16_RDI
> __asan_check_store_add_16_RDX
> __asan_check_store_add_16_RSI
> __asan_check_store_add_1_R12
> __asan_check_store_add_1_R13
> __asan_check_store_add_1_R14
> __asan_check_store_add_1_R15
> __asan_check_store_add_1_R8
> __asan_check_store_add_1_R9
> __asan_check_store_add_1_RAX
> __asan_check_store_add_1_RBP
> __asan_check_store_add_1_RBX
> __asan_check_store_add_1_RCX
> __asan_check_store_add_1_RDI
> __asan_check_store_add_1_RDX
> __asan_check_store_add_1_RSI
> __asan_check_store_add_2_R12
> __asan_check_store_add_2_R13
> __asan_check_store_add_2_R14
> __asan_check_store_add_2_R15
> __asan_check_store_add_2_R8
> __asan_check_store_add_2_R9
> __asan_check_store_add_2_RAX
> __asan_check_store_add_2_RBP
> __asan_check_store_add_2_RBX
> __asan_check_store_add_2_RCX
> __asan_check_store_add_2_RDI
> __asan_check_store_add_2_RDX
> __asan_check_store_add_2_RSI
> __asan_check_store_add_4_R12
> __asan_check_store_add_4_R13
> __asan_check_store_add_4_R14
> __asan_check_store_add_4_R15
> __asan_check_store_add_4_R8
> __asan_check_store_add_4_R9
> __asan_check_store_add_4_RAX
> __asan_check_store_add_4_RBP
> __asan_check_store_add_4_RBX
> __asan_check_store_add_4_RCX
> __asan_check_store_add_4_RDI
> __asan_check_store_add_4_RDX
> __asan_check_store_add_4_RSI
> __asan_check_store_add_8_R12
> __asan_check_store_add_8_R13
> __asan_check_store_add_8_R14
> __asan_check_store_add_8_R15
> __asan_check_store_add_8_R8
> __asan_check_store_add_8_R9
> __asan_check_store_add_8_RAX
> __asan_check_store_add_8_RBP
> __asan_check_store_add_8_RBX
> __asan_check_store_add_8_RCX
> __asan_check_store_add_8_RDI
> __asan_check_store_add_8_RDX
> __asan_check_store_add_8_RSI

--

********************
********************
Failed Tests (1):
  AddressSanitizer-x86_64-linux :: TestCases/Linux/interface_symbols_linux.cpp

[kstoimenov]

Removed clang format on/off.

[kstoimenov]

Update.

[vitalybuka]

In D114558#3170148, @kstoimenov wrote:

Removed clang format on/off.

you didn't re-format without the switch

[kstoimenov]

Fixed the test.

[kstoimenov]

compiler-rt/lib/asan/asan_interface.inc

184

Removed.

184

I fixed that. The issue is that macro expansion doesn't produce new lines so I had to use sed to force that.

[vitalybuka]

In D114558#3167454, @vitalybuka wrote:

I would recommend to separate llvm into a separate patch, so you can land compiler-rt separately. That part is likely NFC on it's own, but you can wait some time to see if it was not reverted because of breaking. And then you can land/revert llvm part as many times you want

This one is unrelieved. I don't insist. Just checking if you seen this.

compiler-rt/lib/asan/asan_interface.inc

184

please clang-format this now
I expect "# defines"

compiler-rt/lib/asan/asan_shadow_defines.h

18

this comment is unreplied

[kstoimenov]

Clang-format.

[kstoimenov]

compiler-rt/lib/asan/asan_shadow_defines.h

18

Sent in a separate patch: D115075.

[morehouse]

compiler-rt/lib/asan/asan_rtl_x86_64.S

38

Can use r11 instead of rcx to avoid the push/pop.

43

Yep, I confused the cmp operand order.

[kstoimenov]

Alternative implemenation.

[kstoimenov]

After pull.

[kstoimenov]

Added a comment.

[kstoimenov]

Removed asan_shadow_defines.h.

[kstoimenov]

Brought back asan_mapping.h.

[kstoimenov]

Removed test and fixed assembly code.

[kstoimenov]

After pull.

[kstoimenov]

After split.

[vitalybuka]

It's reverted?

[kstoimenov]

Yes, because it broke this: https://lab.llvm.org/buildbot/#/builders/165/builds/11459.

[vitalybuka]

In D114558#3183693, @kstoimenov wrote:

Yes, because it broke this: https://lab.llvm.org/buildbot/#/builders/165/builds/11459.

I mean if you revert own or someone else patch it's nice (not required) to reopen the review.

[kstoimenov]

Added PLT.

[kstoimenov]

After rebase.

[vitalybuka]

https://lab.llvm.org/buildbot/#/builders/19

[kstoimenov]

Updated.

[aeubanks]

This is breaking check-asan on Windows, see https://crbug.com/1279386. I've repro'd locally, and reverting this change (along with a dependent change) causes the tests to pass again.

$ FILECHECK_OPTS=-dump-input=always ./bin/llvm-lit.py -vv projects/compiler-rt/test/asan/X86_64WindowsConfig/TestCases/Windows/report_globals_vs_freelibrary.cpp
-- Testing: 1 tests, 1 workers --
FAIL: AddressSanitizer-x86_64-windows :: TestCases/Windows/report_globals_vs_freelibrary.cpp (1 of 1)
******************** TEST 'AddressSanitizer-x86_64-windows :: TestCases/Windows/report_globals_vs_freelibrary.cpp' FAILED ********************
Script:
--
: 'RUN: at line 1';      C:/src/llvm-mint/build/cmake/./bin/clang-cl.exe  -fsanitize=address -Wno-deprecated-declarations -WX -D_HAS_EXCEPTIONS=0 -Zi   -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta   -LD -Od -DDLL C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp -FeC:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmp.dll
: 'RUN: at line 2';      C:/src/llvm-mint/build/cmake/./bin/clang-cl.exe  -fsanitize=address -Wno-deprecated-declarations -WX -D_HAS_EXCEPTIONS=0 -Zi   -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta   -Od -DEXE C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp -FeC:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmpe.exe
: 'RUN: at line 3';   env ASAN_OPTIONS=report_globals=2  C:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmpe.exe C:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmp.dll 2>&1 | FileCheck C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp
--
Exit Code: 1

Command Output (stdout):
--
$ ":" "RUN: at line 1"
$ "C:/src/llvm-mint/build/cmake/./bin/clang-cl.exe" "-fsanitize=address" "-Wno-deprecated-declarations" "-WX" "-D_HAS_EXCEPTIONS=0" "-Zi" "-Wthread-safety" "-Wthread-safety-reference" "-Wthread-safety-beta" "-LD" "-Od" "-DDLL" "C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp" "-FeC:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmp.dll"
$ ":" "RUN: at line 2"
$ "C:/src/llvm-mint/build/cmake/./bin/clang-cl.exe" "-fsanitize=address" "-Wno-deprecated-declarations" "-WX" "-D_HAS_EXCEPTIONS=0" "-Zi" "-Wthread-safety" "-Wthread-safety-reference" "-Wthread-safety-beta" "-Od" "-DEXE" "C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp" "-FeC:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmpe.exe"
# command output:
   Creating library C:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmpe.lib and object C:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmpe.exp

$ ":" "RUN: at line 3"
$ "env" "ASAN_OPTIONS=report_globals=2" "C:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmpe.exe" "C:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmp.dll"
note: command had no output on stdout or stderr
error: command failed with exit status: 3221226505
$ "FileCheck" "C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp"
# command stderr:
C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp:23:11: error: CHECK: expected string not found in input
// CHECK: Added Global{{.*}} size=19
          ^
<stdin>:18:17: note: scanning from here
time to load DLL
                ^

Input file: <stdin>
Check file: C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp

-dump-input=help explains the following input dump.

Input was:
<<<<<<
          1:  #0 0x7ff7fe7607c6 in __asan_register_globals C:\src\llvm-mint\compiler-rt\lib\asan\asan_globals.cpp:370
          2:  #1 0x7ff7fe762fdb in __asan::call_on_globals C:\src\llvm-mint\compiler-rt\lib\asan\asan_globals_win.cpp:40
          3:  #2 0x7ff7fe762edf in __asan::register_dso_globals C:\src\llvm-mint\compiler-rt\lib\asan\asan_globals_win.cpp:44
          4:  #3 0x7ff7fe7e7bc2 in _initterm minkernel\crts\ucrt\src\appcrt\startup\initterm.cpp:21
          5:  #4 0x7ff7fe7b8bac in __scrt_common_main_seh d:\agent\_work\2\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl:256
          6:  #5 0x7ffc23cf7c23 (C:\Windows\System32\KERNEL32.DLL+0x180017c23)
          7:  #6 0x7ffc25cad720 (C:\Windows\SYSTEM32\ntdll.dll+0x18006d720)
          8:
          9: === ID 11; 0x7ff7fe830040 0x7ff7fe830100
         10: ==36748==Added Global[0x7ff7fe830040]: beg=0x7ff7fe8074c0 size=24/64 name=<string literal> module=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp dyn_init=0 odr_indicator=0x000000000000
         11: ==36748== location (0x7ff7fe807640): name=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp[0x7ff7fe8075e3], 13 12
         12: ==36748==Added Global[0x7ff7fe830080]: beg=0x7ff7fe807500 size=18/64 name=<string literal> module=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp dyn_init=0 odr_indicator=0x000000000000
         13: ==36748== location (0x7ff7fe8076c0): name=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp[0x7ff7fe807661], 19 10
         14: ==36748==Added Global[0x7ff7fe8300c0]: beg=0x7ff7fe807540 size=6/32 name=<string literal> module=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp dyn_init=0 odr_indicator=0x000000000000
         15: ==36748== location (0x7ff7fe807740): name=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp[0x7ff7fe8076e1], 35 10
         16: ==36748==Added Global[0x7ff7fe830100]: beg=0x7ff7fe833000 size=8/32 name=_OptionsStorage module=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp dyn_init=0 odr_indicator=0x000000000000
         17: ==36748== location (0x7ff7fe8077b0): name=C:/PROGRA~2/WI3CF2~1/10/Include/10.0.17763.0/ucrt\corecrt_stdio_config.h[0x7ff7fe807760], 87 33
         18: time to load DLL
check:23                     X error: no match found
>>>>>>

error: command failed with exit status: 1

--

********************
********************
Failed Tests (1):
  AddressSanitizer-x86_64-windows :: TestCases/Windows/report_globals_vs_freelibrary.cpp


Testing Time: 60.84s
  Failed: 1

$ ninja check-asan
...
Failed Tests (22):
  AddressSanitizer-x86_64-windows :: TestCases/Windows/coverage-dll-stdio.cpp
  AddressSanitizer-x86_64-windows :: TestCases/Windows/dll_aligned_mallocs.cpp
  AddressSanitizer-x86_64-windows :: TestCases/Windows/dll_allocators_sanity.cpp
  AddressSanitizer-x86_64-windows :: TestCases/Windows/dll_cerr.cpp
  AddressSanitizer-x86_64-windows :: TestCases/Windows/dll_global_dead_strip.c
  AddressSanitizer-x86_64-windows :: TestCases/Windows/dll_intercept_memcpy.cpp
  AddressSanitizer-x86_64-windows :: TestCases/Windows/dll_intercept_memcpy_indirect.cpp
  AddressSanitizer-x86_64-windows :: TestCases/Windows/dll_intercept_memset.cpp
  AddressSanitizer-x86_64-windows :: TestCases/Windows/dll_intercept_strlen.cpp
  AddressSanitizer-x86_64-windows :: TestCases/Windows/dll_malloc_left_oob.cpp
  AddressSanitizer-x86_64-windows :: TestCases/Windows/dll_malloc_uaf.cpp
  AddressSanitizer-x86_64-windows :: TestCases/Windows/dll_noreturn.cpp
  AddressSanitizer-x86_64-windows :: TestCases/Windows/dll_null_deref.cpp
  AddressSanitizer-x86_64-windows :: TestCases/Windows/dll_operator_array_new_left_oob.cpp
  AddressSanitizer-x86_64-windows :: TestCases/Windows/dll_operator_array_new_with_dtor_left_oob.cpp
  AddressSanitizer-x86_64-windows :: TestCases/Windows/dll_poison_unpoison.cpp
  AddressSanitizer-x86_64-windows :: TestCases/Windows/dll_seh.cpp
  AddressSanitizer-x86_64-windows :: TestCases/Windows/dll_stack_use_after_return.cpp
  AddressSanitizer-x86_64-windows :: TestCases/Windows/dll_thread_stack_array_left_oob.cpp
  AddressSanitizer-x86_64-windows :: TestCases/Windows/null_deref_multiple_dlls.cpp
  AddressSanitizer-x86_64-windows :: TestCases/Windows/report_globals_reload_dll.cpp
  AddressSanitizer-x86_64-windows :: TestCases/Windows/report_globals_vs_freelibrary.cpp

[aeubanks]

I've reverted this (along with D115552), let me know in the bug (or ping me directly) if you'd like help reproing.

[aeubanks]

after revert

$ FILECHECK_OPTS=-dump-input=always ./bin/llvm-lit.py -a projects/compiler-rt/test/asan/X86_64WindowsConfig/TestCases/Windows/report_globals_vs_freelibrary.cpp                                    -- Testing: 1 tests, 1 workers --
PASS: AddressSanitizer-x86_64-windows :: TestCases/Windows/report_globals_vs_freelibrary.cpp (1 of 1)
Script:
--
: 'RUN: at line 1';      C:/src/llvm-mint/build/cmake/./bin/clang-cl.exe  -fsanitize=address -Wno-deprecated-declarations -WX -D_HAS_EXCEPTIONS=0 -Zi   -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta   -LD -Od -DDLL C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp -FeC:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmp.dll
: 'RUN: at line 2';      C:/src/llvm-mint/build/cmake/./bin/clang-cl.exe  -fsanitize=address -Wno-deprecated-declarations -WX -D_HAS_EXCEPTIONS=0 -Zi   -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta   -Od -DEXE C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp -FeC:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmpe.exe
: 'RUN: at line 3';   env ASAN_OPTIONS=report_globals=2  C:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmpe.exe C:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmp.dll 2>&1 | FileCheck C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp
--
Exit Code: 0

Command Output (stdout):
--
$ ":" "RUN: at line 1"
$ "C:/src/llvm-mint/build/cmake/./bin/clang-cl.exe" "-fsanitize=address" "-Wno-deprecated-declarations" "-WX" "-D_HAS_EXCEPTIONS=0" "-Zi" "-Wthread-safety" "-Wthread-safety-reference" "-Wthread-safety-beta" "-LD" "-Od" "-DDLL" "C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp" "-FeC:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmp.dll"
$ ":" "RUN: at line 2"
$ "C:/src/llvm-mint/build/cmake/./bin/clang-cl.exe" "-fsanitize=address" "-Wno-deprecated-declarations" "-WX" "-D_HAS_EXCEPTIONS=0" "-Zi" "-Wthread-safety" "-Wthread-safety-reference" "-Wthread-safety-beta" "-Od" "-DEXE" "C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp" "-FeC:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmpe.exe"
# command output:
   Creating library C:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmpe.lib and object C:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmpe.exp

$ ":" "RUN: at line 3"
$ "env" "ASAN_OPTIONS=report_globals=2" "C:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmpe.exe" "C:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmp.dll"
$ "FileCheck" "C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp"
# command stderr:

Input file: <stdin>
Check file: C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp

-dump-input=help explains the following input dump.

Input was:
<<<<<<
    1:  #0 0x7ff660ed07c6 in __asan_register_globals C:\src\llvm-mint\compiler-rt\lib\asan\asan_globals.cpp:370
    2:  #1 0x7ff660ed2fdb in __asan::call_on_globals C:\src\llvm-mint\compiler-rt\lib\asan\asan_globals_win.cpp:40
    3:  #2 0x7ff660ed2edf in __asan::register_dso_globals C:\src\llvm-mint\compiler-rt\lib\asan\asan_globals_win.cpp:44
    4:  #3 0x7ff660f57bc2 in _initterm minkernel\crts\ucrt\src\appcrt\startup\initterm.cpp:21
    5:  #4 0x7ff660f28bac in __scrt_common_main_seh d:\agent\_work\2\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl:256
    6:  #5 0x7ffc23cf7c23 (C:\Windows\System32\KERNEL32.DLL+0x180017c23)
    7:  #6 0x7ffc25cad720 (C:\Windows\SYSTEM32\ntdll.dll+0x18006d720)
    8:
    9: === ID 11; 0x7ff660fa0040 0x7ff660fa0100
   10: ==43580==Added Global[0x7ff660fa0040]: beg=0x7ff660f774c0 size=24/64 name=<string literal> module=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp dyn_init=0 odr_indicator=0x000000000000
   11: ==43580== location (0x7ff660f77640): name=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp[0x7ff660f775e3], 13 12
   12: ==43580==Added Global[0x7ff660fa0080]: beg=0x7ff660f77500 size=18/64 name=<string literal> module=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp dyn_init=0 odr_indicator=0x000000000000
   13: ==43580== location (0x7ff660f776c0): name=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp[0x7ff660f77661], 19 10
   14: ==43580==Added Global[0x7ff660fa00c0]: beg=0x7ff660f77540 size=6/32 name=<string literal> module=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp dyn_init=0 odr_indicator=0x000000000000
   15: ==43580== location (0x7ff660f77740): name=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp[0x7ff660f776e1], 35 10
   16: ==43580==Added Global[0x7ff660fa0100]: beg=0x7ff660fa3000 size=8/32 name=_OptionsStorage module=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp dyn_init=0 odr_indicator=0x000000000000
   17: ==43580== location (0x7ff660f777b0): name=C:/PROGRA~2/WI3CF2~1/10/Include/10.0.17763.0/ucrt\corecrt_stdio_config.h[0x7ff660f77760], 87 33
   18: time to load DLL
   19:  #0 0x7ff660ed07c6 in __asan_register_globals C:\src\llvm-mint\compiler-rt\lib\asan\asan_globals.cpp:370
   20:  #1 0x7ffc08b37e71 in __asan::call_on_globals C:\src\llvm-mint\compiler-rt\lib\asan\asan_globals_win.cpp:40
   21:  #2 0x7ffc08b37dcf in __asan::register_dso_globals C:\src\llvm-mint\compiler-rt\lib\asan\asan_globals_win.cpp:44
   22:  #3 0x7ffc08b6632e in _initterm minkernel\crts\ucrt\src\appcrt\startup\initterm.cpp:21
   23:  #4 0x7ffc08b3a751 in dllmain_crt_process_attach d:\agent\_work\2\s\src\vctools\crt\vcstartup\src\startup\dll_dllmain.cpp:64
   24:  #5 0x7ffc08b3a8c3 in dllmain_dispatch d:\agent\_work\2\s\src\vctools\crt\vcstartup\src\startup\dll_dllmain.cpp:195
   25:  #6 0x7ffc25c65020 (C:\Windows\SYSTEM32\ntdll.dll+0x180025020)
   26:  #7 0x7ffc25ca9c54 (C:\Windows\SYSTEM32\ntdll.dll+0x180069c54)
   27:  #8 0x7ffc25ca9a47 (C:\Windows\SYSTEM32\ntdll.dll+0x180069a47)
   28:  #9 0x7ffc25c6aa16 (C:\Windows\SYSTEM32\ntdll.dll+0x18002aa16)
   29:  #10 0x7ffc25c62510 (C:\Windows\SYSTEM32\ntdll.dll+0x180022510)
   30:  #11 0x7ffc25c62227 (C:\Windows\SYSTEM32\ntdll.dll+0x180022227)
   31:  #12 0x7ffc25c616e3 (C:\Windows\SYSTEM32\ntdll.dll+0x1800216e3)
   32:  #13 0x7ffc2376eb9f (C:\Windows\System32\KERNELBASE.dll+0x18002eb9f)
   33:  #14 0x7ffc23797920 (C:\Windows\System32\KERNELBASE.dll+0x180057920)
   34:  #15 0x7ffc23796eee (C:\Windows\System32\KERNELBASE.dll+0x180056eee)
   35:  #16 0x7ff660eb10cf in main C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp:25
   36:  #17 0x7ff660f28c37 in invoke_main d:\agent\_work\2\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl:78
   37:  #18 0x7ff660f28c37 in __scrt_common_main_seh d:\agent\_work\2\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl:288
   38:  #19 0x7ffc23cf7c23 (C:\Windows\System32\KERNEL32.DLL+0x180017c23)
   39:  #20 0x7ffc25cad720 (C:\Windows\SYSTEM32\ntdll.dll+0x18006d720)
   40:
   41: === ID 22; 0x7ffc08b9d040 0x7ffc08b9d080
   42: ==43580==Added Global[0x7ffc08b9d040]: beg=0x7ffc08b88380 size=19/64 name=<string literal> module=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp dyn_init=0 odr_indicator=0x000000000000
   43: ==43580== location (0x7ffc08b884a0): name=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp[0x7ffc08b88443], 40 10
   44: ==43580==Added Global[0x7ffc08b9d080]: beg=0x7ffc08b9dd20 size=8/32 name=_OptionsStorage module=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp dyn_init=0 odr_indicator=0x000000000000
   45: ==43580== location (0x7ffc08b88510): name=C:/PROGRA~2/WI3CF2~1/10/Include/10.0.17763.0/ucrt\corecrt_stdio_config.h[0x7ffc08b884c0], 87 33
   46: in DLL(reason=1)
   47: in DLL(reason=0)
   48: ==43580==Removed Global[0x7ffc08b9d040]: beg=0x7ffc08b88380 size=19/64 name=<string literal> module=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp dyn_init=0 odr_indicator=0x000000000000
   49: ==43580== location (0x7ffc08b884a0): name=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp[0x7ffc08b88443], 40 10
   50: ==43580==Removed Global[0x7ffc08b9d080]: beg=0x7ffc08b9dd20 size=8/32 name=_OptionsStorage module=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp dyn_init=0 odr_indicator=0x000000000000
   51: ==43580== location (0x7ffc08b88510): name=C:/PROGRA~2/WI3CF2~1/10/Include/10.0.17763.0/ucrt\corecrt_stdio_config.h[0x7ffc08b884c0], 87 33
   52: bye!
   53: ==43580==Removed Global[0x7ff660fa0040]: beg=0x7ff660f774c0 size=24/64 name=<string literal> module=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp dyn_init=0 odr_indicator=0x000000000000
   54: ==43580== location (0x7ff660f77640): name=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp[0x7ff660f775e3], 13 12
   55: ==43580==Removed Global[0x7ff660fa0080]: beg=0x7ff660f77500 size=18/64 name=<string literal> module=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp dyn_init=0 odr_indicator=0x000000000000
   56: ==43580== location (0x7ff660f776c0): name=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp[0x7ff660f77661], 19 10
   57: ==43580==Removed Global[0x7ff660fa00c0]: beg=0x7ff660f77540 size=6/32 name=<string literal> module=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp dyn_init=0 odr_indicator=0x000000000000
   58: ==43580== location (0x7ff660f77740): name=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp[0x7ff660f776e1], 35 10
   59: ==43580==Removed Global[0x7ff660fa0100]: beg=0x7ff660fa3000 size=8/32 name=_OptionsStorage module=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp dyn_init=0 odr_indicator=0x000000000000
   60: ==43580== location (0x7ff660f777b0): name=C:/PROGRA~2/WI3CF2~1/10/Include/10.0.17763.0/ucrt\corecrt_stdio_config.h[0x7ff660f77760], 87 33
>>>>>>


--

********************

Testing Time: 20.57s
  Passed: 1

before revert

$ FILECHECK_OPTS=-dump-input=always ./bin/llvm-lit.py -a projects/compiler-rt/test/asan/X86_64WindowsConfig/TestCases/Windows/report_globals_vs_freelibrary.cpp
-- Testing: 1 tests, 1 workers --
FAIL: AddressSanitizer-x86_64-windows :: TestCases/Windows/report_globals_vs_freelibrary.cpp (1 of 1)
******************** TEST 'AddressSanitizer-x86_64-windows :: TestCases/Windows/report_globals_vs_freelibrary.cpp' FAILED ********************
Script:
--
: 'RUN: at line 1';      C:/src/llvm-mint/build/cmake/./bin/clang-cl.exe  -fsanitize=address -Wno-deprecated-declarations -WX -D_HAS_EXCEPTIONS=0 -Zi   -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta   -LD -Od -DDLL C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp -FeC:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmp.dll
: 'RUN: at line 2';      C:/src/llvm-mint/build/cmake/./bin/clang-cl.exe  -fsanitize=address -Wno-deprecated-declarations -WX -D_HAS_EXCEPTIONS=0 -Zi   -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta   -Od -DEXE C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp -FeC:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmpe.exe
: 'RUN: at line 3';   env ASAN_OPTIONS=report_globals=2  C:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmpe.exe C:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmp.dll 2>&1 | FileCheck C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp
--
Exit Code: 1

Command Output (stdout):
--
$ ":" "RUN: at line 1"
$ "C:/src/llvm-mint/build/cmake/./bin/clang-cl.exe" "-fsanitize=address" "-Wno-deprecated-declarations" "-WX" "-D_HAS_EXCEPTIONS=0" "-Zi" "-Wthread-safety" "-Wthread-safety-reference" "-Wthread-safety-beta" "-LD" "-Od" "-DDLL" "C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp" "-FeC:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmp.dll"
$ ":" "RUN: at line 2"
$ "C:/src/llvm-mint/build/cmake/./bin/clang-cl.exe" "-fsanitize=address" "-Wno-deprecated-declarations" "-WX" "-D_HAS_EXCEPTIONS=0" "-Zi" "-Wthread-safety" "-Wthread-safety-reference" "-Wthread-safety-beta" "-Od" "-DEXE" "C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp" "-FeC:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmpe.exe"
# command output:
   Creating library C:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmpe.lib and object C:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmpe.exp

$ ":" "RUN: at line 3"
$ "env" "ASAN_OPTIONS=report_globals=2" "C:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmpe.exe" "C:\src\llvm-mint\build\cmake\projects\compiler-rt\test\asan\X86_64WindowsConfig\TestCases\Windows\Output\report_globals_vs_freelibrary.cpp.tmp.dll"
note: command had no output on stdout or stderr
error: command failed with exit status: 3221226505
$ "FileCheck" "C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp"
# command stderr:
C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp:23:11: error: CHECK: expected string not found in input
// CHECK: Added Global{{.*}} size=19
          ^
<stdin>:18:17: note: scanning from here
time to load DLL
                ^

Input file: <stdin>
Check file: C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp

-dump-input=help explains the following input dump.

Input was:
<<<<<<
          1:  #0 0x7ff7a3ff07c6 in __asan_register_globals C:\src\llvm-mint\compiler-rt\lib\asan\asan_globals.cpp:370
          2:  #1 0x7ff7a3ff2fdb in __asan::call_on_globals C:\src\llvm-mint\compiler-rt\lib\asan\asan_globals_win.cpp:40
          3:  #2 0x7ff7a3ff2edf in __asan::register_dso_globals C:\src\llvm-mint\compiler-rt\lib\asan\asan_globals_win.cpp:44
          4:  #3 0x7ff7a4077bc2 in _initterm minkernel\crts\ucrt\src\appcrt\startup\initterm.cpp:21
          5:  #4 0x7ff7a4048bac in __scrt_common_main_seh d:\agent\_work\2\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl:256
          6:  #5 0x7ffc23cf7c23 (C:\Windows\System32\KERNEL32.DLL+0x180017c23)
          7:  #6 0x7ffc25cad720 (C:\Windows\SYSTEM32\ntdll.dll+0x18006d720)
          8:
          9: === ID 11; 0x7ff7a40c0040 0x7ff7a40c0100
         10: ==6872==Added Global[0x7ff7a40c0040]: beg=0x7ff7a40974c0 size=24/64 name=<string literal> module=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp dyn_init=0 odr_indicator=0x000000000000
         11: ==6872== location (0x7ff7a4097640): name=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp[0x7ff7a40975e3], 13 12
         12: ==6872==Added Global[0x7ff7a40c0080]: beg=0x7ff7a4097500 size=18/64 name=<string literal> module=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp dyn_init=0 odr_indicator=0x000000000000
         13: ==6872== location (0x7ff7a40976c0): name=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp[0x7ff7a4097661], 19 10
         14: ==6872==Added Global[0x7ff7a40c00c0]: beg=0x7ff7a4097540 size=6/32 name=<string literal> module=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp dyn_init=0 odr_indicator=0x000000000000
         15: ==6872== location (0x7ff7a4097740): name=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp[0x7ff7a40976e1], 35 10
         16: ==6872==Added Global[0x7ff7a40c0100]: beg=0x7ff7a40c3000 size=8/32 name=_OptionsStorage module=C:\src\llvm-mint\compiler-rt\test\asan\TestCases\Windows\report_globals_vs_freelibrary.cpp dyn_init=0 odr_indicator=0x000000000000
         17: ==6872== location (0x7ff7a40977b0): name=C:/PROGRA~2/WI3CF2~1/10/Include/10.0.17763.0/ucrt\corecrt_stdio_config.h[0x7ff7a4097760], 87 33
         18: time to load DLL
check:23                     X error: no match found
>>>>>>

error: command failed with exit status: 1

--

********************
********************
Failed Tests (1):
  AddressSanitizer-x86_64-windows :: TestCases/Windows/report_globals_vs_freelibrary.cpp


Testing Time: 61.07s
  Failed: 1

[kstoimenov]

Excluded exports on Win.

[wolfgangp]

Hi. This patch is causing a couple of test failures on one of our internal bots which is still running Ubuntu 18.04. Do you have any idea what could be causing it? I'm posting the test output:

• AddressSanitizer-x86_64-linux.TestCases.non-executable-pc.cpp

Stacktrace
Script:
--
: 'RUN: at line 1';      /home/siadmin/jenkins/w/opensource/opensource_build/build/./bin/clang  --driver-mode=g++ -fsanitize=address -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer -fno-optimize-sibling-calls -gline-tables-only  -m64  /home/siadmin/jenkins/w/opensource/opensource_build/working_dir/compiler-rt/test/asan/TestCases/non-executable-pc.cpp -o /home/siadmin/jenkins/w/opensource/opensource_build/build/projects/compiler-rt/test/asan/X86_64LinuxConfig/TestCases/Output/non-executable-pc.cpp.tmp
: 'RUN: at line 2';   not  /home/siadmin/jenkins/w/opensource/opensource_build/build/projects/compiler-rt/test/asan/X86_64LinuxConfig/TestCases/Output/non-executable-pc.cpp.tmp 0 2>&1 | FileCheck /home/siadmin/jenkins/w/opensource/opensource_build/working_dir/compiler-rt/test/asan/TestCases/non-executable-pc.cpp
: 'RUN: at line 3';   not  /home/siadmin/jenkins/w/opensource/opensource_build/build/projects/compiler-rt/test/asan/X86_64LinuxConfig/TestCases/Output/non-executable-pc.cpp.tmp n 2>&1 | FileCheck /home/siadmin/jenkins/w/opensource/opensource_build/working_dir/compiler-rt/test/asan/TestCases/non-executable-pc.cpp -check-prefix=CHECK -check-prefix=NON_EXEC
--
Exit Code: 1

Command Output (stderr):
--
/home/siadmin/jenkins/w/opensource/opensource_build/working_dir/compiler-rt/test/asan/TestCases/non-executable-pc.cpp:28:15: error: NON_EXEC: expected string not found in input
 // NON_EXEC: PC is at a non-executable region. Maybe a wild jump?
              ^
<stdin>:3:77: note: scanning from here
==6109==ERROR: AddressSanitizer: SEGV on unknown address 0x604000010000 (pc 0x60400000ffff bp 0x7fff5e741a70 sp 0x7fff5e741a18 T0)
                                                                            ^
<stdin>:8:15: note: possible intended match here
AddressSanitizer can not provide additional info.
              ^

Input file: <stdin>
Check file: /home/siadmin/jenkins/w/opensource/opensource_build/working_dir/compiler-rt/test/asan/TestCases/non-executable-pc.cpp

-dump-input=help explains the following input dump.

Input was:
<<<<<<
            1: AddressSanitizer:DEADLYSIGNAL 
            2: ================================================================= 
            3: ==6109==ERROR: AddressSanitizer: SEGV on unknown address 0x604000010000 (pc 0x60400000ffff bp 0x7fff5e741a70 sp 0x7fff5e741a18 T0) 
check:28'0                                                                                 X~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ error: no match found
            4: ==6109==The signal is caused by a READ memory access. 
check:28'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
            5:  #0 0x60400000ffff (<unknown module>) 
check:28'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
            6:  #1 0x7f16edc37bf6 in __libc_start_main /build/glibc-S9d2JN/glibc-2.27/csu/../csu/libc-start.c:310 
check:28'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
            7:  
check:28'0     ~
            8: AddressSanitizer can not provide additional info. 
check:28'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
check:28'1                   ?                                    possible intended match
            9: SUMMARY: AddressSanitizer: SEGV (<unknown module>)  
check:28'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           10: ==6109==ABORTING 
check:28'0     ~~~~~~~~~~~~~~~~~
>>>>>>

• SanitizerCommon-asan-x86_64-Linux.Linux.decorate_proc_maps.cpp

Stacktrace
Script:
--
: 'RUN: at line 1';      /home/siadmin/jenkins/w/opensource/opensource_build/build/./bin/clang  --driver-mode=g++ -gline-tables-only -fsanitize=address  -m64 -funwind-tables  -ldl -g /home/siadmin/jenkins/w/opensource/opensource_build/working_dir/compiler-rt/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cpp -o /home/siadmin/jenkins/w/opensource/opensource_build/build/projects/compiler-rt/test/sanitizer_common/asan-x86_64-Linux/Linux/Output/decorate_proc_maps.cpp.tmp
: 'RUN: at line 2';   env ASAN_OPTIONS=decorate_proc_maps=1  /home/siadmin/jenkins/w/opensource/opensource_build/build/projects/compiler-rt/test/sanitizer_common/asan-x86_64-Linux/Linux/Output/decorate_proc_maps.cpp.tmp 2>&1 | FileCheck /home/siadmin/jenkins/w/opensource/opensource_build/working_dir/compiler-rt/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cpp --check-prefix=CHECK-asan
--
Exit Code: 1

Command Output (stderr):
--
/home/siadmin/jenkins/w/opensource/opensource_build/working_dir/compiler-rt/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cpp:48:16: error: CHECK-asan: expected string not found in input
// CHECK-asan: rw-p {{.*}} [low shadow]
               ^
<stdin>:1:1: note: scanning from here
00400000-00542000 r-xp 00000000 08:01 3149254 /home/siadmin/jenkins/w/opensource/opensource_build/build/projects/compiler-rt/test/sanitizer_common/asan-x86_64-Linux/Linux/Output/decorate_proc_maps.cpp.tmp
^
<stdin>:5:44: note: possible intended match here
7fff7000-8fff7000 rwxp 00000000 00:18 24 /dev/shm/5194 [low shadow] (deleted)
                                           ^

Input file: <stdin>
Check file: /home/siadmin/jenkins/w/opensource/opensource_build/working_dir/compiler-rt/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cpp

-dump-input=help explains the following input dump.

Input was:
<<<<<<
            1: 00400000-00542000 r-xp 00000000 08:01 3149254 /home/siadmin/jenkins/w/opensource/opensource_build/build/projects/compiler-rt/test/sanitizer_common/asan-x86_64-Linux/Linux/Output/decorate_proc_maps.cpp.tmp 
check:48'0     X~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ error: no match found
            2: 00742000-00743000 r-xp 00142000 08:01 3149254 /home/siadmin/jenkins/w/opensource/opensource_build/build/projects/compiler-rt/test/sanitizer_common/asan-x86_64-Linux/Linux/Output/decorate_proc_maps.cpp.tmp 
check:48'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
            3: 00743000-00746000 rwxp 00143000 08:01 3149254 /home/siadmin/jenkins/w/opensource/opensource_build/build/projects/compiler-rt/test/sanitizer_common/asan-x86_64-Linux/Linux/Output/decorate_proc_maps.cpp.tmp 
check:48'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
            4: 00746000-0112e000 rwxp 00000000 00:00 0  
check:48'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
            5: 7fff7000-8fff7000 rwxp 00000000 00:18 24 /dev/shm/5194 [low shadow] (deleted) 
check:48'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
check:48'1                                                ?                                   possible intended match
            6: 8fff7000-2008fff7000 ---p 00000000 00:18 26 /dev/shm/5194 [shadow gap] (deleted) 
check:48'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
            7: 2008fff7000-ff73b5d8000 rwxp 00000000 00:18 25 /dev/shm/5194 [high shadow] (deleted) 
check:48'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
            8: ff73b5d8000-ff73b6d7000 rwxp 00000000 00:00 0  
check:48'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
            9: ff73b6d7000-100037932000 rwxp df6ab6e0000 00:18 25 /dev/shm/5194 [high shadow] (deleted) 
check:48'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           10: 100037932000-100037a31000 rwxp 00000000 00:00 0  
check:48'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
            .
            .
            .
>>>>>>

[vitalybuka]

I just landed the fix da7e9e34104e83fc792b599936a11f91faa43e18

In D114558#3193922, @wolfgangp wrote:

Hi. This patch is causing a couple of test failures on one of our internal bots which is still running Ubuntu 18.04. Do you have any idea what could be causing it? I'm posting the test output:

• AddressSanitizer-x86_64-linux.TestCases.non-executable-pc.cpp

Stacktrace
Script:
--
: 'RUN: at line 1';      /home/siadmin/jenkins/w/opensource/opensource_build/build/./bin/clang  --driver-mode=g++ -fsanitize=address -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer -fno-optimize-sibling-calls -gline-tables-only  -m64  /home/siadmin/jenkins/w/opensource/opensource_build/working_dir/compiler-rt/test/asan/TestCases/non-executable-pc.cpp -o /home/siadmin/jenkins/w/opensource/opensource_build/build/projects/compiler-rt/test/asan/X86_64LinuxConfig/TestCases/Output/non-executable-pc.cpp.tmp
: 'RUN: at line 2';   not  /home/siadmin/jenkins/w/opensource/opensource_build/build/projects/compiler-rt/test/asan/X86_64LinuxConfig/TestCases/Output/non-executable-pc.cpp.tmp 0 2>&1 | FileCheck /home/siadmin/jenkins/w/opensource/opensource_build/working_dir/compiler-rt/test/asan/TestCases/non-executable-pc.cpp
: 'RUN: at line 3';   not  /home/siadmin/jenkins/w/opensource/opensource_build/build/projects/compiler-rt/test/asan/X86_64LinuxConfig/TestCases/Output/non-executable-pc.cpp.tmp n 2>&1 | FileCheck /home/siadmin/jenkins/w/opensource/opensource_build/working_dir/compiler-rt/test/asan/TestCases/non-executable-pc.cpp -check-prefix=CHECK -check-prefix=NON_EXEC
--
Exit Code: 1

Command Output (stderr):
--
/home/siadmin/jenkins/w/opensource/opensource_build/working_dir/compiler-rt/test/asan/TestCases/non-executable-pc.cpp:28:15: error: NON_EXEC: expected string not found in input
 // NON_EXEC: PC is at a non-executable region. Maybe a wild jump?
              ^
<stdin>:3:77: note: scanning from here
==6109==ERROR: AddressSanitizer: SEGV on unknown address 0x604000010000 (pc 0x60400000ffff bp 0x7fff5e741a70 sp 0x7fff5e741a18 T0)
                                                                            ^
<stdin>:8:15: note: possible intended match here
AddressSanitizer can not provide additional info.
              ^

Input file: <stdin>
Check file: /home/siadmin/jenkins/w/opensource/opensource_build/working_dir/compiler-rt/test/asan/TestCases/non-executable-pc.cpp

-dump-input=help explains the following input dump.

Input was:
<<<<<<
            1: AddressSanitizer:DEADLYSIGNAL 
            2: ================================================================= 
            3: ==6109==ERROR: AddressSanitizer: SEGV on unknown address 0x604000010000 (pc 0x60400000ffff bp 0x7fff5e741a70 sp 0x7fff5e741a18 T0) 
check:28'0                                                                                 X~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ error: no match found
            4: ==6109==The signal is caused by a READ memory access. 
check:28'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
            5:  #0 0x60400000ffff (<unknown module>) 
check:28'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
            6:  #1 0x7f16edc37bf6 in __libc_start_main /build/glibc-S9d2JN/glibc-2.27/csu/../csu/libc-start.c:310 
check:28'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
            7:  
check:28'0     ~
            8: AddressSanitizer can not provide additional info. 
check:28'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
check:28'1                   ?                                    possible intended match
            9: SUMMARY: AddressSanitizer: SEGV (<unknown module>)  
check:28'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           10: ==6109==ABORTING 
check:28'0     ~~~~~~~~~~~~~~~~~
>>>>>>

• SanitizerCommon-asan-x86_64-Linux.Linux.decorate_proc_maps.cpp

Stacktrace
Script:
--
: 'RUN: at line 1';      /home/siadmin/jenkins/w/opensource/opensource_build/build/./bin/clang  --driver-mode=g++ -gline-tables-only -fsanitize=address  -m64 -funwind-tables  -ldl -g /home/siadmin/jenkins/w/opensource/opensource_build/working_dir/compiler-rt/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cpp -o /home/siadmin/jenkins/w/opensource/opensource_build/build/projects/compiler-rt/test/sanitizer_common/asan-x86_64-Linux/Linux/Output/decorate_proc_maps.cpp.tmp
: 'RUN: at line 2';   env ASAN_OPTIONS=decorate_proc_maps=1  /home/siadmin/jenkins/w/opensource/opensource_build/build/projects/compiler-rt/test/sanitizer_common/asan-x86_64-Linux/Linux/Output/decorate_proc_maps.cpp.tmp 2>&1 | FileCheck /home/siadmin/jenkins/w/opensource/opensource_build/working_dir/compiler-rt/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cpp --check-prefix=CHECK-asan
--
Exit Code: 1

Command Output (stderr):
--
/home/siadmin/jenkins/w/opensource/opensource_build/working_dir/compiler-rt/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cpp:48:16: error: CHECK-asan: expected string not found in input
// CHECK-asan: rw-p {{.*}} [low shadow]
               ^
<stdin>:1:1: note: scanning from here
00400000-00542000 r-xp 00000000 08:01 3149254 /home/siadmin/jenkins/w/opensource/opensource_build/build/projects/compiler-rt/test/sanitizer_common/asan-x86_64-Linux/Linux/Output/decorate_proc_maps.cpp.tmp
^
<stdin>:5:44: note: possible intended match here
7fff7000-8fff7000 rwxp 00000000 00:18 24 /dev/shm/5194 [low shadow] (deleted)
                                           ^

Input file: <stdin>
Check file: /home/siadmin/jenkins/w/opensource/opensource_build/working_dir/compiler-rt/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cpp

-dump-input=help explains the following input dump.

Input was:
<<<<<<
            1: 00400000-00542000 r-xp 00000000 08:01 3149254 /home/siadmin/jenkins/w/opensource/opensource_build/build/projects/compiler-rt/test/sanitizer_common/asan-x86_64-Linux/Linux/Output/decorate_proc_maps.cpp.tmp 
check:48'0     X~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ error: no match found
            2: 00742000-00743000 r-xp 00142000 08:01 3149254 /home/siadmin/jenkins/w/opensource/opensource_build/build/projects/compiler-rt/test/sanitizer_common/asan-x86_64-Linux/Linux/Output/decorate_proc_maps.cpp.tmp 
check:48'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
            3: 00743000-00746000 rwxp 00143000 08:01 3149254 /home/siadmin/jenkins/w/opensource/opensource_build/build/projects/compiler-rt/test/sanitizer_common/asan-x86_64-Linux/Linux/Output/decorate_proc_maps.cpp.tmp 
check:48'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
            4: 00746000-0112e000 rwxp 00000000 00:00 0  
check:48'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
            5: 7fff7000-8fff7000 rwxp 00000000 00:18 24 /dev/shm/5194 [low shadow] (deleted) 
check:48'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
check:48'1                                                ?                                   possible intended match
            6: 8fff7000-2008fff7000 ---p 00000000 00:18 26 /dev/shm/5194 [shadow gap] (deleted) 
check:48'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
            7: 2008fff7000-ff73b5d8000 rwxp 00000000 00:18 25 /dev/shm/5194 [high shadow] (deleted) 
check:48'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
            8: ff73b5d8000-ff73b6d7000 rwxp 00000000 00:00 0  
check:48'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
            9: ff73b6d7000-100037932000 rwxp df6ab6e0000 00:18 25 /dev/shm/5194 [high shadow] (deleted) 
check:48'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           10: 100037932000-100037a31000 rwxp 00000000 00:00 0  
check:48'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
            .
            .
            .
>>>>>>

compiler-rt/lib/asan/CMakeLists.txt

set(ASAN_SOURCES
   asan_malloc_mac.cpp
   asan_malloc_win.cpp
   asan_memory_profile.cpp
   asan_poisoning.cpp
   asan_posix.cpp
   asan_premap_shadow.cpp
   asan_report.cpp
   asan_rtl.cpp
+  asan_rtl_x86_64.S
   asan_shadow_setup.cpp
   asan_stack.cpp
   asan_stats.cpp
   asan_suppressions.cpp
   asan_thread.cpp
   asan_win.cpp
   )
 

compiler-rt/lib/asan/asan_interface.inc

 //===-- asan_interface.inc ------------------------------------------------===//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 // Asan interface list.
 //===----------------------------------------------------------------------===//
+
 INTERFACE_FUNCTION(__asan_addr_is_in_fake_stack)
 INTERFACE_FUNCTION(__asan_address_is_poisoned)
 INTERFACE_FUNCTION(__asan_after_dynamic_init)
 INTERFACE_FUNCTION(__asan_alloca_poison)
 INTERFACE_FUNCTION(__asan_allocas_unpoison)
 INTERFACE_FUNCTION(__asan_before_dynamic_init)
 INTERFACE_FUNCTION(__asan_describe_address)
 INTERFACE_FUNCTION(__asan_exp_load1)

 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__)
+
+#  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__)

compiler-rt/lib/asan/asan_mapping.h

 //===-- asan_mapping.h ------------------------------------------*- C++ -*-===//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 //
 // This file is a part of AddressSanitizer, an address sanity checker.
 //
 // Defines ASan memory mapping.
 //===----------------------------------------------------------------------===//
 #ifndef ASAN_MAPPING_H
 #define ASAN_MAPPING_H
 
-#include "asan_internal.h"
+#if defined(__cplusplus)
+#  include "asan_internal.h"
+#endif
 
 // The full explanation of the memory mapping could be found here:
 // https://github.com/google/sanitizers/wiki/AddressSanitizerAlgorithm
 //
 // Typical shadow mapping on Linux/x86_64 with SHADOW_OFFSET == 0x00007fff8000:
 // || `[0x10007fff8000, 0x7fffffffffff]` || HighMem    ||
 // || `[0x02008fff7000, 0x10007fff7fff]` || HighShadow ||
 // || `[0x00008fff7000, 0x02008fff6fff]` || ShadowGap  ||

 // Default Windows/i386 mapping:
 // (the exact location of HighShadow/HighMem may vary depending
 //  on WoW64, /LARGEADDRESSAWARE, etc).
 // || `[0x50000000, 0xffffffff]` || HighMem    ||
 // || `[0x3a000000, 0x4fffffff]` || HighShadow ||
 // || `[0x36000000, 0x39ffffff]` || ShadowGap  ||
 // || `[0x30000000, 0x35ffffff]` || LowShadow  ||
 // || `[0x00000000, 0x2fffffff]` || LowMem     ||
 
-#if defined(ASAN_SHADOW_SCALE)
-static const u64 kDefaultShadowScale = ASAN_SHADOW_SCALE;
-#else
-static const u64 kDefaultShadowScale = 3;
-#endif
-static const u64 kDefaultShadowSentinel = ~(uptr)0;
-
-#define SHADOW_SCALE kDefaultShadowScale
-
 #if SANITIZER_FUCHSIA
 #  define SHADOW_OFFSET_CONST (0)
 #elif SANITIZER_WORDSIZE == 32
 #  if SANITIZER_ANDROID
 #    define SHADOW_OFFSET_DYNAMIC
 #  elif defined(__mips__)
 #    define SHADOW_OFFSET_CONST 0x0aaa0000
 #  elif SANITIZER_FREEBSD
 #    define SHADOW_OFFSET_CONST 0x40000000
 #  elif SANITIZER_NETBSD
 #    define SHADOW_OFFSET_CONST 0x40000000
 #  elif SANITIZER_WINDOWS
 #    define SHADOW_OFFSET_CONST 0x30000000
 #  elif SANITIZER_IOS
 #    define SHADOW_OFFSET_DYNAMIC
 #  else
 #    define SHADOW_OFFSET_CONST 0x20000000
 #  endif
 #else
 #  if SANITIZER_IOS
 #    define SHADOW_OFFSET_DYNAMIC
 #  elif SANITIZER_MAC && defined(__aarch64__)
 #    define SHADOW_OFFSET_DYNAMIC
 #  elif SANITIZER_RISCV64
 #    define SHADOW_OFFSET_CONST 0x0000000d55550000
 #  elif defined(__aarch64__)
 #    define SHADOW_OFFSET_CONST 0x0000001000000000
 #  elif defined(__powerpc64__)
 #    define SHADOW_OFFSET_CONST 0x0000100000000000
 #  elif defined(__s390x__)
 #    define SHADOW_OFFSET_CONST 0x0010000000000000
 #  elif SANITIZER_FREEBSD
 #    define SHADOW_OFFSET_CONST 0x0000400000000000
 #  elif SANITIZER_NETBSD
 #    define SHADOW_OFFSET_CONST 0x0000400000000000
 #  elif SANITIZER_MAC
 #    define SHADOW_OFFSET_CONST 0x0000100000000000
 #  elif defined(__mips64)
 #    define SHADOW_OFFSET_CONST 0x0000002000000000
 #  elif defined(__sparc__)
 #    define SHADOW_OFFSET_CONST 0x0000080000000000
 #  elif SANITIZER_WINDOWS64
 #    define SHADOW_OFFSET_DYNAMIC
 #  else
-#    define SHADOW_OFFSET_CONST \
-      0x000000007FFFFFFF & (~0xFFFULL << kDefaultShadowScale)
-#  endif
-#endif
+#    define SHADOW_OFFSET_CONST 0x000000007fff8000
+#  endif
+#endif
+
+#if defined(__cplusplus)
+#  if defined(ASAN_SHADOW_SCALE)
+static const u64 kDefaultShadowScale = ASAN_SHADOW_SCALE;
+#  else
+static const u64 kDefaultShadowScale = 3;
+#  endif
 
-#if defined(SHADOW_OFFSET_CONST)
+#  define SHADOW_SCALE kDefaultShadowScale
+
+static const u64 kDefaultShadowSentinel = ~(uptr)0;
+
+#  if defined(SHADOW_OFFSET_CONST)
 static const u64 kConstShadowOffset = SHADOW_OFFSET_CONST;
 #  define SHADOW_OFFSET kConstShadowOffset
 #elif defined(SHADOW_OFFSET_DYNAMIC)
 #  define SHADOW_OFFSET __asan_shadow_memory_dynamic_address
 #else
 #  error "SHADOW_OFFSET can't be determined."
 #endif
 
static inline bool AddressIsPoisoned(uptr a) {
   return false;
 }
 
 // Must be after all calls to PROFILE_ASAN_MAPPING().
 static const uptr kAsanMappingProfileSize = __LINE__;
 
 }  // namespace __asan
 
+#endif
+
 #endif  // ASAN_MAPPING_H

compiler-rt/lib/asan/asan_rtl_x86_64.S

+#include "asan_mapping.h"
+#include "sanitizer_common/sanitizer_asm.h"
+
+#if defined(__x86_64__)
+#include "sanitizer_common/sanitizer_platform.h"
+
+.section .text
+.file "asan_rtl_x86_64.S"
+
+#define NAME(n, reg, op, s, i) n##_##op##_##i##_##s##_##reg
+
+#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) \
+.globl  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) \
+        mov    %##reg,%r10 ;\
+        shr    $0x3,%r10 ;\
+        movsbl SHADOW_OFFSET_CONST(%r10),%r10d ;\
+        test   %r10d,%r10d ;\
+        jne    CLABEL(reg, op, s, add) ;\
+RLABEL(reg, op, s, add): ;\
+        retq  ;\
+
+#define ASAN_MEMORY_ACCESS_EXTRA_CHECK_1(reg, op, i) \
+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 ;\
+
+#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 ;\
+
+#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 ;\
+
+#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) \
+BEGINF(reg, op, 2, add) ;\
+        ASAN_MEMORY_ACCESS_INITIAL_CHECK_ADD(reg, op, 2) ;\
+        ASAN_MEMORY_ACCESS_EXTRA_CHECK_2(reg, op, add) ;\
+ENDF
+
+#define ASAN_MEMORY_ACCESS_CALLBACK_ADD_4(reg, op) \
+BEGINF(reg, op, 4, add) ;\
+        ASAN_MEMORY_ACCESS_INITIAL_CHECK_ADD(reg, op, 4) ;\
+        ASAN_MEMORY_ACCESS_EXTRA_CHECK_4(reg, op, add) ;\
+ENDF
+
+// Access check functions for 8 and 16 byte types: no extra checks required.
+#define ASAN_MEMORY_ACCESS_CHECK_ADD(reg, op, s, c) \
+        mov    %##reg,%r10 ;\
+        shr    $0x3,%r10 ;\
+        ##c    $0x0,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 ;\
+
+#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) \
+BEGINF(reg, op, 16, add) ;\
+        ASAN_MEMORY_ACCESS_CHECK_ADD(reg, op, 16, cmpw) ;\
+        ASAN_MEMORY_ACCESS_FAIL(reg, op, 16, add) ;\
+ENDF
+
+#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) \
+
+
+// Instantiate all but R10 and R11 callbacks. We are using PLTSafe class with
+// the intrinsic, which guarantees that the code generation will never emit
+// R10 or R11 callback.
+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

compiler-rt/lib/asan/asan_shadow_defines.h

+//===-- asan_shadow_defines.h -----------------------------------*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+//
+// This file is a part of AddressSanitizer, an address sanity checker.
+//
+// Defines ASan memory mapping used by assembly portion.
+//===----------------------------------------------------------------------===//
+
+#include "sanitizer_common/sanitizer_platform.h"
+
+#if !defined(SANITIZER_WORDSIZE)
+#  error "SANITIZER_WORDSIZE must be defined."
+#endif
+
+#if SANITIZER_FUCHSIA
+#  define SHADOW_OFFSET_CONST 0
+#elif SANITIZER_WORDSIZE == 32
+#  if defined(__mips__)
+#    define SHADOW_OFFSET_CONST 0xaaa0000
+#  elif SANITIZER_FREEBSD
+#    define SHADOW_OFFSET_CONST 0x40000000
+#  elif SANITIZER_NETBSD
+#    define SHADOW_OFFSET_CONST 0x40000000
+#  elif SANITIZER_WINDOWS
+#    define SHADOW_OFFSET_CONST 0x30000000
+#  elif SANITIZER_IOS
+#    define SHADOW_OFFSET_CONST 0
+#  else
+#    define SHADOW_OFFSET_CONST 0x20000000
+#  endif
+#else
+#  if SANITIZER_RISCV64
+#    define SHADOW_OFFSET_CONST 0x55550000
+#  elif defined(__aarch64__)
+#    define SHADOW_OFFSET_CONST 0x1000000000
+#  elif defined(__powerpc64__)
+#    define SHADOW_OFFSET_CONST 0x100000000000
+#  elif defined(__s390x__)
+#    define SHADOW_OFFSET_CONST 0x10000000000000
+#  elif SANITIZER_FREEBSD
+#    define SHADOW_OFFSET_CONST 0x400000000000
+#  elif SANITIZER_NETBSD
+#    define SHADOW_OFFSET_CONST 0x400000000000
+#  elif SANITIZER_MAC
+#    define SHADOW_OFFSET_CONST 0x7fff8000
+#  elif defined(__mips64)
+#    define SHADOW_OFFSET_CONST 0x2000000000
+#  else
+#    define SHADOW_OFFSET_CONST 0x7fff8000
+#  endif
+#endif

compiler-rt/lib/asan/tests/asan_noinst_test.cpp

 //===-- asan_noinst_test.cpp ----------------------------------------------===//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 //
 // This file is a part of AddressSanitizer, an address sanity checker.
 //
 // This test file should be compiled w/o asan instrumentation.
 //===----------------------------------------------------------------------===//
 
+#include <asan_shadow_defines.h>
 #include <assert.h>
 #include <sanitizer/allocator_interface.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>  // for memset()
 
 #include <algorithm>
 #include <limits>
 #include <vector>
 
 #include "asan_allocator.h"
 #include "asan_internal.h"
 #include "asan_mapping.h"
 #include "asan_test_utils.h"
 
 using namespace __sanitizer;
 
 // ATTENTION!
 // Please don't call intercepted functions (including malloc() and friends)
 // in this test. The static runtime library is linked explicitly (without
 // -fsanitize=address), thus the interceptors do not work correctly on OS X.
 
 // Make sure __asan_init is called before any test case is run.
 struct AsanInitCaller {
TEST(AddressSanitizer, ShadowRegionIsPoisonedTest) {
   EXPECT_EQ(ptr, __asan_region_is_poisoned(ptr, 100));
   ptr = kShadowGapBeg + 200;
   EXPECT_EQ(ptr, __asan_region_is_poisoned(ptr, 100));
   ptr = kHighShadowBeg + 200;
   EXPECT_EQ(ptr, __asan_region_is_poisoned(ptr, 100));
 }
 
 // Test __asan_load1 & friends.
-TEST(AddressSanitizer, LoadStoreCallbacks) {
-  typedef void (*CB)(uptr p);
-  CB cb[2][5] = {
-      {
-        __asan_load1, __asan_load2, __asan_load4, __asan_load8, __asan_load16,
-      }, {
-        __asan_store1, __asan_store2, __asan_store4, __asan_store8,
-        __asan_store16,
-      }
-  };
-
+static void TestLoadStoreCallbacks(CB cb[2][5]) {
   uptr buggy_ptr;
 
   __asan_test_only_reported_buggy_pointer = &buggy_ptr;
   BufferedStackTrace stack;
   stack.trace_buffer[0] = 0x890;
   stack.size = 1;
 
   for (uptr len = 16; len <= 32; len++) {
for (uptr is_write = 0; is_write <= 1; is_write++) {
             EXPECT_EQ(buggy_ptr, p + offset);
         }
       }
     }
     __asan::asan_free(ptr, &stack, __asan::FROM_MALLOC);
   }
   __asan_test_only_reported_buggy_pointer = 0;
 }
+
+TEST(AddressSanitizer, LoadStoreCallbacks) {
+  CB cb[2][5] = {{
+                     __asan_load1,
+                     __asan_load2,
+                     __asan_load4,
+                     __asan_load8,
+                     __asan_load16,
+                 },
+                 {
+                     __asan_store1,
+                     __asan_store2,
+                     __asan_store4,
+                     __asan_store8,
+                     __asan_store16,
+                 }};
+  TestLoadStoreCallbacks(cb);
+}
+
+// clang-format off
+#if defined(__x86_64__)
+
+#define CALL_ASAN_MEMORY_ACCESS_CALLBACK_ADD(s, reg, op)        \
+  void CallAsanMemoryAccessAdd##reg##op##s(uptr address) {      \
+  asm("push  %%" #reg " \n"                                     \
+  "mov   %[x], %%" #reg " \n"                                   \
+  "call  __asan_check_" #op "_add_" #s "_" #reg "\n"            \
+  "pop   %%" #reg " \n"                                         \
+  :                                                             \
+  : [x] "r"(address)                                            \
+      : "r8", "rdi");                                           \
+  }
+
+#define TEST_ASAN_MEMORY_ACCESS_CALLBACKS_ADD(reg)            \
+  CALL_ASAN_MEMORY_ACCESS_CALLBACK_ADD(1, reg, load)          \
+  CALL_ASAN_MEMORY_ACCESS_CALLBACK_ADD(1, reg, store)         \
+  CALL_ASAN_MEMORY_ACCESS_CALLBACK_ADD(2, reg, load)          \
+  CALL_ASAN_MEMORY_ACCESS_CALLBACK_ADD(2, reg, store)         \
+  CALL_ASAN_MEMORY_ACCESS_CALLBACK_ADD(4, reg, load)          \
+  CALL_ASAN_MEMORY_ACCESS_CALLBACK_ADD(4, reg, store)         \
+  CALL_ASAN_MEMORY_ACCESS_CALLBACK_ADD(8, reg, load)          \
+  CALL_ASAN_MEMORY_ACCESS_CALLBACK_ADD(8, reg, store)         \
+  CALL_ASAN_MEMORY_ACCESS_CALLBACK_ADD(16, reg, load)         \
+  CALL_ASAN_MEMORY_ACCESS_CALLBACK_ADD(16, reg, store)        \
+                                                              \
+  TEST(AddressSanitizer, LoadStoreCallbacksAddX86##reg) {     \
+    CB cb[2][5] = {{                                          \
+                       CallAsanMemoryAccessAdd##reg##load1,   \
+                       CallAsanMemoryAccessAdd##reg##load2,   \
+                       CallAsanMemoryAccessAdd##reg##load4,   \
+                       CallAsanMemoryAccessAdd##reg##load8,   \
+                       CallAsanMemoryAccessAdd##reg##load16,  \
+                   },                                         \
+                   {                                          \
+                       CallAsanMemoryAccessAdd##reg##store1,  \
+                       CallAsanMemoryAccessAdd##reg##store2,  \
+                       CallAsanMemoryAccessAdd##reg##store4,  \
+                       CallAsanMemoryAccessAdd##reg##store8,  \
+                       CallAsanMemoryAccessAdd##reg##store16, \
+                   }};                                        \
+    TestLoadStoreCallbacks(cb);                               \
+  }
+
+// Instantiate all but R10 and R11 callbacks. We are using PLTSafe class with
+// the intrinsic, which guarantees that the code generation will never emit
+// R10 or R11 callbacks.
+TEST_ASAN_MEMORY_ACCESS_CALLBACKS_ADD(RAX)
+TEST_ASAN_MEMORY_ACCESS_CALLBACKS_ADD(RBX)
+TEST_ASAN_MEMORY_ACCESS_CALLBACKS_ADD(RCX)
+TEST_ASAN_MEMORY_ACCESS_CALLBACKS_ADD(RDX)
+TEST_ASAN_MEMORY_ACCESS_CALLBACKS_ADD(RSI)
+TEST_ASAN_MEMORY_ACCESS_CALLBACKS_ADD(RDI)
+TEST_ASAN_MEMORY_ACCESS_CALLBACKS_ADD(RBP)
+TEST_ASAN_MEMORY_ACCESS_CALLBACKS_ADD(R8)
+TEST_ASAN_MEMORY_ACCESS_CALLBACKS_ADD(R9)
+TEST_ASAN_MEMORY_ACCESS_CALLBACKS_ADD(R12)
+TEST_ASAN_MEMORY_ACCESS_CALLBACKS_ADD(R13)
+TEST_ASAN_MEMORY_ACCESS_CALLBACKS_ADD(R14)
+TEST_ASAN_MEMORY_ACCESS_CALLBACKS_ADD(R15)
+
+#endif  // defined(__x86_64__)
+// clang-format on
+
+#if defined(SHADOW_OFFSET_CONST)
+TEST(AddressSanitizer, TestShadowGlobalVar) {
+  constexpr u64 shadow_offset = SHADOW_OFFSET_CONST;
+  EXPECT_EQ(SHADOW_OFFSET, shadow_offset);
+}
+#endif

compiler-rt/test/asan/TestCases/Linux/interface_symbols_linux.cpp

 // Check the presence of interface symbols in compiled file.
 
+// RUN: %clangxx -x c++-header -o - -E %p/../../../../lib/asan/asan_interface.inc  \
+// RUN:  | sed "s/INTERFACE_FUNCTION/\nINTERFACE_FUNCTION/g" >  %t.asan_interface.inc
 // RUN: %clangxx_asan -O2 %s -o %t.exe
 // RUN: nm -D %t.exe | grep " [TWw] "                                          \
 // RUN:  | grep -o "\(__asan_\|__ubsan_\|__sancov_\|__sanitizer_\)[^ ]*"       \
 // RUN:  | grep -v "__sanitizer_syscall"                                       \
 // RUN:  | grep -v "__sanitizer_weak_hook"                                     \
 // RUN:  | grep -v "__sancov_lowest_stack"                                     \
 // RUN:  | sed -e "s/__asan_version_mismatch_check_v[0-9]+/__asan_version_mismatch_check/" \
 // RUN:  > %t.exports
 //
 // RUN: grep -e "INTERFACE_\(WEAK_\)\?FUNCTION"                                \
-// RUN:  %p/../../../../lib/asan/asan_interface.inc                            \
+// RUN:  %t.asan_interface.inc                                                 \
 // RUN:  %p/../../../../lib/ubsan/ubsan_interface.inc                          \
 // RUN:  %p/../../../../lib/sanitizer_common/sanitizer_common_interface.inc    \
 // RUN:  %p/../../../../lib/sanitizer_common/sanitizer_common_interface_posix.inc \
 // RUN:  %p/../../../../lib/sanitizer_common/sanitizer_coverage_interface.inc  \
 // RUN:  | grep -v "__sanitizer_weak_hook"                                     \
 // RUN:  | sed -e "s/.*(//" -e "s/).*//" > %t.imports
 //
 // RUN: cat %t.imports | sort | uniq > %t.imports-sorted

llvm/lib/Target/X86/X86AsmPrinter.h

class LLVM_LIBRARY_VISIBILITY X86AsmPrinter : public AsmPrinter {
   void LowerPATCHABLE_EVENT_CALL(const MachineInstr &MI, X86MCInstLower &MCIL);
   void LowerPATCHABLE_TYPED_EVENT_CALL(const MachineInstr &MI,
                                        X86MCInstLower &MCIL);
 
   void LowerFENTRY_CALL(const MachineInstr &MI, X86MCInstLower &MCIL);
 
   // Address sanitizer specific lowering for X86.
   void LowerASAN_CHECK_MEMACCESS(const MachineInstr &MI);
-  void emitAsanMemaccessSymbols(Module &M);
-  void emitAsanMemaccessPartial(Module &M, unsigned Reg,
-                                const ASanAccessInfo &AccessInfo,
-                                MCSubtargetInfo &STI);
-  void emitAsanMemaccessFull(Module &M, unsigned Reg,
-                             const ASanAccessInfo &AccessInfo,
-                             MCSubtargetInfo &STI);
-  void emitAsanReportError(Module &M, unsigned Reg,
-                           const ASanAccessInfo &AccessInfo,
-                           MCSubtargetInfo &STI);
-
-  typedef std::tuple<unsigned /*Reg*/, uint32_t /*AccessInfo*/>
-      AsanMemaccessTuple;
-  std::map<AsanMemaccessTuple, MCSymbol *> AsanMemaccessSymbols;
 
   // Choose between emitting .seh_ directives and .cv_fpo_ directives.
   void EmitSEHInstruction(const MachineInstr *MI);
 
   void PrintSymbolOperand(const MachineOperand &MO, raw_ostream &O) override;
   void PrintOperand(const MachineInstr *MI, unsigned OpNo, raw_ostream &O);
   void PrintModifiedOperand(const MachineInstr *MI, unsigned OpNo,
                             raw_ostream &O, const char *Modifier);

llvm/lib/Target/X86/X86AsmPrinter.cpp

if (!Stubs.empty()) {
     Stubs.clear();
     OutStreamer.AddBlankLine();
   }
 }
 
 void X86AsmPrinter::emitEndOfAsmFile(Module &M) {
   const Triple &TT = TM.getTargetTriple();
 
-  emitAsanMemaccessSymbols(M);
-
   if (TT.isOSBinFormatMachO()) {
     // Mach-O uses non-lazy symbol stubs to encode per-TU information into
     // global table for symbol lookup.
     emitNonLazyStubs(MMI, *OutStreamer);
 
     // Emit stack and fault map information.
     emitStackMaps(SM);
     FM.serializeToFaultMapSection();

llvm/lib/Target/X86/X86MCInstLower.cpp

 #include "llvm/MC/MCStreamer.h"
 #include "llvm/MC/MCSymbol.h"
 #include "llvm/MC/MCSymbolELF.h"
 #include "llvm/MC/TargetRegistry.h"
 #include "llvm/Target/TargetLoweringObjectFile.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Transforms/Instrumentation/AddressSanitizer.h"
 #include "llvm/Transforms/Instrumentation/AddressSanitizerCommon.h"
+#include <string>
 
 using namespace llvm;
 
 namespace {
 
 /// X86MCInstLower - This class is used to lower an MachineInstr into an MCInst.
 class X86MCInstLower {
   MCContext &Ctx;

 
 void X86AsmPrinter::LowerASAN_CHECK_MEMACCESS(const MachineInstr &MI) {
   // FIXME: Make this work on non-ELF.
   if (!TM.getTargetTriple().isOSBinFormatELF()) {
     report_fatal_error("llvm.asan.check.memaccess only supported on ELF");
     return;
   }
 
-  unsigned Reg = MI.getOperand(0).getReg().id();
+  const auto &Reg = MI.getOperand(0).getReg();
   ASanAccessInfo AccessInfo(MI.getOperand(1).getImm());
 
-  MCSymbol *&Sym =
-      AsanMemaccessSymbols[AsanMemaccessTuple(Reg, AccessInfo.Packed)];
-  if (!Sym) {
-    std::string Name = AccessInfo.IsWrite ? "store" : "load";
-    std::string SymName = "__asan_check_" + Name +
-                          utostr(1ULL << AccessInfo.AccessSizeIndex) + "_rn" +
-                          utostr(Reg);
-    Sym = OutContext.getOrCreateSymbol(SymName);
-  }
-
-  EmitAndCountInstruction(
-      MCInstBuilder(X86::CALL64pcrel32)
-          .addExpr(MCSymbolRefExpr::create(Sym, OutContext)));
-}
-
-void X86AsmPrinter::emitAsanMemaccessPartial(Module &M, unsigned Reg,
-                                             const ASanAccessInfo &AccessInfo,
-                                             MCSubtargetInfo &STI) {
-  assert(AccessInfo.AccessSizeIndex == 0 || AccessInfo.AccessSizeIndex == 1 ||
-         AccessInfo.AccessSizeIndex == 2);
-  assert(Reg != X86::R10);
-  assert(Reg != X86::R11);
-
   uint64_t ShadowBase;
   int MappingScale;
   bool OrShadowOffset;
-  getAddressSanitizerParams(
-      Triple(M.getTargetTriple()), M.getDataLayout().getPointerSizeInBits(),
-      AccessInfo.CompileKernel, &ShadowBase, &MappingScale, &OrShadowOffset);
-
-  OutStreamer->emitInstruction(MCInstBuilder(X86::MOV64rr)
-                                   .addReg(X86::R10)
-                                   .addReg(X86::NoRegister + Reg),
-                               STI);
-  OutStreamer->emitInstruction(MCInstBuilder(X86::SHR64ri)
-                                   .addReg(X86::R10)
-                                   .addReg(X86::R10)
-                                   .addImm(MappingScale),
-                               STI);
-  if (OrShadowOffset) {
-    OutStreamer->emitInstruction(MCInstBuilder(X86::OR64ri32)
-                                     .addReg(X86::R10)
-                                     .addReg(X86::R10)
-                                     .addImm(ShadowBase),
-                                 STI);
-    OutStreamer->emitInstruction(MCInstBuilder(X86::MOV8rm)
-                                     .addReg(X86::R10B)
-                                     .addReg(X86::R10)
-                                     .addImm(1)
-                                     .addReg(X86::NoRegister)
-                                     .addImm(0)
-                                     .addReg(X86::NoRegister),
-                                 STI);
-    OutStreamer->emitInstruction(
-        MCInstBuilder(X86::TEST8rr).addReg(X86::R10B).addReg(X86::R10B), STI);
-  } else {
-    OutStreamer->emitInstruction(MCInstBuilder(X86::MOVSX32rm8)
-                                     .addReg(X86::R10D)
-                                     .addReg(X86::R10)
-                                     .addImm(1)
-                                     .addReg(X86::NoRegister)
-                                     .addImm(ShadowBase)
-                                     .addReg(X86::NoRegister),
-                                 STI);
-    OutStreamer->emitInstruction(
-        MCInstBuilder(X86::TEST32rr).addReg(X86::R10D).addReg(X86::R10D), STI);
-  }
-  MCSymbol *AdditionalCheck = OutContext.createTempSymbol();
-  OutStreamer->emitInstruction(
-      MCInstBuilder(X86::JCC_1)
-          .addExpr(MCSymbolRefExpr::create(AdditionalCheck, OutContext))
-          .addImm(X86::COND_NE),
-      STI);
-  MCSymbol *ReturnSym = OutContext.createTempSymbol();
-  OutStreamer->emitLabel(ReturnSym);
-  OutStreamer->emitInstruction(MCInstBuilder(getRetOpcode(*Subtarget)), STI);
-
-  // Shadow byte is non-zero so we need to perform additional checks.
-  OutStreamer->emitLabel(AdditionalCheck);
-  OutStreamer->emitInstruction(MCInstBuilder(X86::MOV64rr)
-                                   .addReg(X86::R11)
-                                   .addReg(X86::NoRegister + Reg),
-                               STI);
-  const size_t Granularity = 1ULL << MappingScale;
-  OutStreamer->emitInstruction(MCInstBuilder(X86::AND32ri8)
-                                   .addReg(X86::NoRegister)
-                                   .addReg(X86::R11D)
-                                   .addImm(Granularity - 1),
-                               STI);
-  if (AccessInfo.AccessSizeIndex == 1) {
-    OutStreamer->emitInstruction(MCInstBuilder(X86::ADD32ri8)
-                                     .addReg(X86::NoRegister)
-                                     .addReg(X86::R11D)
-                                     .addImm(1),
-                                 STI);
-  } else if (AccessInfo.AccessSizeIndex == 2) {
-    OutStreamer->emitInstruction(MCInstBuilder(X86::ADD32ri8)
-                                     .addReg(X86::NoRegister)
-                                     .addReg(X86::R11D)
-                                     .addImm(3),
-                                 STI);
-  }
+  getAddressSanitizerParams(Triple(TM.getTargetTriple()), 64,
+                            AccessInfo.CompileKernel, &ShadowBase,
+                            &MappingScale, &OrShadowOffset);
 
-  OutStreamer->emitInstruction(
-      MCInstBuilder(X86::CMP32rr).addReg(X86::R11D).addReg(X86::R10D).addImm(1),
-      STI);
-  OutStreamer->emitInstruction(
-      MCInstBuilder(X86::JCC_1)
-          .addExpr(MCSymbolRefExpr::create(ReturnSym, OutContext))
-          .addImm(X86::COND_L),
-      STI);
-
-  emitAsanReportError(M, Reg, AccessInfo, STI);
-}
-
-void X86AsmPrinter::emitAsanMemaccessFull(Module &M, unsigned Reg,
-                                          const ASanAccessInfo &AccessInfo,
-                                          MCSubtargetInfo &STI) {
-  assert(AccessInfo.AccessSizeIndex == 3 || AccessInfo.AccessSizeIndex == 4);
-  assert(Reg != X86::R10);
-  assert(Reg != X86::R11);
-
-  uint64_t ShadowBase;
-  int MappingScale;
-  bool OrShadowOffset;
-  getAddressSanitizerParams(
-      Triple(M.getTargetTriple()), M.getDataLayout().getPointerSizeInBits(),
-      AccessInfo.CompileKernel, &ShadowBase, &MappingScale, &OrShadowOffset);
-
-  OutStreamer->emitInstruction(MCInstBuilder(X86::MOV64rr)
-                                   .addReg(X86::R10)
-                                   .addReg(X86::NoRegister + Reg),
-                               STI);
-  OutStreamer->emitInstruction(MCInstBuilder(X86::SHR64ri)
-                                   .addReg(X86::R10)
-                                   .addReg(X86::R10)
-                                   .addImm(MappingScale),
-                               STI);
-  if (OrShadowOffset) {
-    OutStreamer->emitInstruction(MCInstBuilder(X86::OR64ri32)
-                                     .addReg(X86::R10)
-                                     .addReg(X86::R10)
-                                     .addImm(ShadowBase),
-                                 STI);
-    auto OpCode = AccessInfo.AccessSizeIndex == 3 ? X86::CMP8mi : X86::CMP16mi8;
-    OutStreamer->emitInstruction(MCInstBuilder(OpCode)
-                                     .addReg(X86::R10)
-                                     .addImm(1)
-                                     .addReg(X86::NoRegister)
-                                     .addImm(0)
-                                     .addReg(X86::NoRegister)
-                                     .addImm(0),
-                                 STI);
-  } else {
-    auto OpCode = AccessInfo.AccessSizeIndex == 3 ? X86::CMP8mi : X86::CMP16mi8;
-    OutStreamer->emitInstruction(MCInstBuilder(OpCode)
-                                     .addReg(X86::R10)
-                                     .addImm(1)
-                                     .addReg(X86::NoRegister)
-                                     .addImm(ShadowBase)
-                                     .addReg(X86::NoRegister)
-                                     .addImm(0),
-                                 STI);
-  }
-  MCSymbol *ReportCode = OutContext.createTempSymbol();
-  OutStreamer->emitInstruction(
-      MCInstBuilder(X86::JCC_1)
-          .addExpr(MCSymbolRefExpr::create(ReportCode, OutContext))
-          .addImm(X86::COND_NE),
-      STI);
-  MCSymbol *ReturnSym = OutContext.createTempSymbol();
-  OutStreamer->emitLabel(ReturnSym);
-  OutStreamer->emitInstruction(MCInstBuilder(getRetOpcode(*Subtarget)), STI);
-
-  OutStreamer->emitLabel(ReportCode);
-  emitAsanReportError(M, Reg, AccessInfo, STI);
-}
-
-void X86AsmPrinter::emitAsanReportError(Module &M, unsigned Reg,
-                                        const ASanAccessInfo &AccessInfo,
-                                        MCSubtargetInfo &STI) {
   std::string Name = AccessInfo.IsWrite ? "store" : "load";
-  MCSymbol *ReportError = OutContext.getOrCreateSymbol(
-      "__asan_report_" + Name + utostr(1ULL << AccessInfo.AccessSizeIndex));
-  OutStreamer->emitInstruction(MCInstBuilder(X86::MOV64rr)
-                                   .addReg(X86::RDI)
-                                   .addReg(X86::NoRegister + Reg),
-                               STI);
-  OutStreamer->emitInstruction(
-      MCInstBuilder(X86::JMP_4)
-          .addExpr(MCSymbolRefExpr::create(ReportError, MCSymbolRefExpr::VK_PLT,
-                                           OutContext)),
-      STI);
-}
-
-void X86AsmPrinter::emitAsanMemaccessSymbols(Module &M) {
-  if (AsanMemaccessSymbols.empty())
-    return;
-
-  const Triple &TT = TM.getTargetTriple();
-  assert(TT.isOSBinFormatELF());
-  std::unique_ptr<MCSubtargetInfo> STI(
-      TM.getTarget().createMCSubtargetInfo(TT.str(), "", ""));
-  assert(STI && "Unable to create subtarget info");
-
-  for (auto &P : AsanMemaccessSymbols) {
-    MCSymbol *Sym = P.second;
-    OutStreamer->SwitchSection(OutContext.getELFSection(
-        ".text.hot", ELF::SHT_PROGBITS,
-        ELF::SHF_EXECINSTR | ELF::SHF_ALLOC | ELF::SHF_GROUP, 0, Sym->getName(),
-        /*IsComdat=*/true));
-
-    OutStreamer->emitSymbolAttribute(Sym, MCSA_ELF_TypeFunction);
-    OutStreamer->emitSymbolAttribute(Sym, MCSA_Weak);
-    OutStreamer->emitSymbolAttribute(Sym, MCSA_Hidden);
-    OutStreamer->emitLabel(Sym);
+  std::string Op = OrShadowOffset ? "or" : "add";
+  std::string SymName = "__asan_check_" + Name + "_" + Op + "_" +
+                        utostr(1ULL << AccessInfo.AccessSizeIndex) + "_" +
+                        TM.getMCRegisterInfo()->getName(Reg.asMCReg());
 
-    unsigned Reg = std::get<0>(P.first);
-    ASanAccessInfo AccessInfo(std::get<1>(P.first));
-
-    if (AccessInfo.AccessSizeIndex < 3) {
-      emitAsanMemaccessPartial(M, Reg, AccessInfo, *STI);
-    } else {
-      emitAsanMemaccessFull(M, Reg, AccessInfo, *STI);
-    }
-  }
+  EmitAndCountInstruction(
+      MCInstBuilder(X86::CALL64pcrel32)
+          .addExpr(MCSymbolRefExpr::create(
+              OutContext.getOrCreateSymbol(SymName), OutContext)));
 }
 
 void X86AsmPrinter::LowerPATCHABLE_OP(const MachineInstr &MI,
                                       X86MCInstLower &MCIL) {
   // PATCHABLE_OP minsize, opcode, operands
 
   NoAutoPaddingScope NoPadScope(*OutStreamer);
 

llvm/test/CodeGen/X86/asan-check-memaccess-add.ll

 ; RUN: llc < %s | FileCheck %s
 
 target triple = "x86_64-unknown-linux-gnu"
 
 define void @load1(i8* nocapture readonly %x) {
 ; CHECK:              pushq   %rax
 ; CHECK-NOT:          push    %rbp
-; CHECK:              callq   __asan_check_load1_rn[[RN1:.*]]
-; CHECK:              callq   __asan_check_store1_rn[[RN1]]
+; CHECK:              callq   __asan_check_load_add_1_[[REG1:.*]]
+; CHECK:              callq   __asan_check_store_add_1_[[REG1]]
 ; CHECK-NOT:          pop     %rbp
 ; CHECK:              popq    %rax
   call void @llvm.asan.check.memaccess(i8* %x, i32 0)
   call void @llvm.asan.check.memaccess(i8* %x, i32 32)
   ret void
 }
 
 define void @load2(i16* nocapture readonly %x) {
 ; CHECK:              pushq   %rax
 ; CHECK-NOT:          push    %rbp
-; CHECK:              callq   __asan_check_load2_rn[[RN2:.*]]
-; CHECK:              callq   __asan_check_store2_rn[[RN2]]
+; CHECK:              callq   __asan_check_load_add_2_[[REG2:.*]]
+; CHECK:              callq   __asan_check_store_add_2_[[REG2]]
 ; CHECK-NOT:          pop     %rbp
 ; CHECK:              popq    %rax
   %1 = ptrtoint i16* %x to i64
   %2 = bitcast i16* %x to i8*
   call void @llvm.asan.check.memaccess(i8* %2, i32 2)
   call void @llvm.asan.check.memaccess(i8* %2, i32 34)
   ret void
 }
 
 define void @load4(i32* nocapture readonly %x) {
 ; CHECK:              pushq   %rax
 ; CHECK-NOT:          push    %rbp
-; CHECK:              callq   __asan_check_load4_rn[[RN4:.*]]
-; CHECK:              callq   __asan_check_store4_rn[[RN4]]
+; CHECK:              callq   __asan_check_load_add_4_[[REG4:.*]]
+; CHECK:              callq   __asan_check_store_add_4_[[REG4]]
 ; CHECK-NOT:          pop     %rbp
 ; CHECK:              popq    %rax
   %1 = ptrtoint i32* %x to i64
   %2 = bitcast i32* %x to i8*
   call void @llvm.asan.check.memaccess(i8* %2, i32 4)
   call void @llvm.asan.check.memaccess(i8* %2, i32 36)
   ret void
 }
 define void @load8(i64* nocapture readonly %x) {
 ; CHECK:              pushq   %rax
 ; CHECK-NOT:          push    %rbp
-; CHECK:              callq   __asan_check_load8_rn[[RN8:.*]]
-; CHECK:              callq   __asan_check_store8_rn[[RN8]]
+; CHECK:              callq   __asan_check_load_add_8_[[REG8:.*]]
+; CHECK:              callq   __asan_check_store_add_8_[[REG8]]
 ; CHECK-NOT:          pop     %rbp
 ; CHECK:              popq    %rax
   %1 = ptrtoint i64* %x to i64
   %2 = bitcast i64* %x to i8*
   call void @llvm.asan.check.memaccess(i8* %2, i32 6)
   call void @llvm.asan.check.memaccess(i8* %2, i32 38)
   ret void
 }
 
 define void @load16(i128* nocapture readonly %x) {
 ; CHECK:              pushq   %rax
 ; CHECK-NOT:          push    %rbp
-; CHECK:              callq   __asan_check_load16_rn[[RN16:.*]]
-; CHECK:              callq   __asan_check_store16_rn[[RN16]]
+; CHECK:              callq   __asan_check_load_add_16_[[REG16:.*]]
+; CHECK:              callq   __asan_check_store_add_16_[[REG16]]
 ; CHECK-NOT:          pop     %rbp
 ; CHECK:              popq    %rax
   %1 = ptrtoint i128* %x to i64
   %2 = bitcast i128* %x to i8*
   call void @llvm.asan.check.memaccess(i8* %2, i32 8)
   call void @llvm.asan.check.memaccess(i8* %2, i32 40)
   ret void
 }
 
-; CHECK:              .type   __asan_check_load1_rn[[RN1]],@function
-; CHECK-NEXT:         .weak   __asan_check_load1_rn[[RN1]]
-; CHECK-NEXT:         .hidden __asan_check_load1_rn[[RN1]]
-; CHECK-NEXT: __asan_check_load1_rn[[RN1]]:
-; CHECK-NEXT:         movq    [[REG:.*]], %r10
-; CHECK-NEXT:         shrq    $3, %r10
-; CHECK-NEXT:         movsbl  2147450880(%r10), %r10d
-; CHECK-NEXT:         testl   %r10d, %r10d
-; CHECK-NEXT:         jne     [[EXTRA:.*]]
-; CHECK-NEXT: [[RET:.*]]:
-; CHECK-NEXT:         retq
-; CHECK-NEXT: [[EXTRA]]:
-; CHECK-NEXT:         movq    [[REG]], %r11
-; CHECK-NEXT:         andl    $7, %r11d
-; CHECK-NEXT:         cmpl    %r10d, %r11d
-; CHECK-NEXT:         jl      [[RET]]
-; CHECK-NEXT:         movq    [[REG:.*]], %rdi
-; CHECK-NEXT:         jmp     __asan_report_load1
-
-; CHECK:              .type   __asan_check_load2_rn[[RN2]],@function
-; CHECK-NEXT:         .weak   __asan_check_load2_rn[[RN2]]
-; CHECK-NEXT:         .hidden __asan_check_load2_rn[[RN2]]
-; CHECK-NEXT: __asan_check_load2_rn[[RN2]]:
-; CHECK-NEXT:         movq    [[REG:.*]], %r10
-; CHECK-NEXT:         shrq    $3, %r10
-; CHECK-NEXT:         movsbl  2147450880(%r10), %r10d
-; CHECK-NEXT:         testl   %r10d, %r10d
-; CHECK-NEXT:         jne     [[EXTRA:.*]]
-; CHECK-NEXT: [[RET:.*]]:
-; CHECK-NEXT:         retq
-; CHECK-NEXT: [[EXTRA]]:
-; CHECK-NEXT:         movq    [[REG]], %r11
-; CHECK-NEXT:         andl    $7, %r11d
-; CHECK-NEXT:         addl    $1, %r11d
-; CHECK-NEXT:         cmpl    %r10d, %r11d
-; CHECK-NEXT:         jl      [[RET]]
-; CHECK-NEXT:         movq    [[REG:.*]], %rdi
-; CHECK-NEXT:         jmp     __asan_report_load2
-
-; CHECK:              .type   __asan_check_load4_rn[[RN4]],@function
-; CHECK-NEXT:         .weak   __asan_check_load4_rn[[RN4]]
-; CHECK-NEXT:         .hidden __asan_check_load4_rn[[RN4]]
-; CHECK-NEXT: __asan_check_load4_rn[[RN4]]:
-; CHECK-NEXT:         movq    [[REG:.*]], %r10
-; CHECK-NEXT:         shrq    $3, %r10
-; CHECK-NEXT:         movsbl  2147450880(%r10), %r10d
-; CHECK-NEXT:         testl   %r10d, %r10d
-; CHECK-NEXT:         jne     [[EXTRA:.*]]
-; CHECK-NEXT: [[RET:.*]]:
-; CHECK-NEXT:         retq
-; CHECK-NEXT: [[EXTRA]]:
-; CHECK-NEXT:         movq    [[REG]], %r11
-; CHECK-NEXT:         andl    $7, %r11d
-; CHECK-NEXT:         addl    $3, %r11d
-; CHECK-NEXT:         cmpl    %r10d, %r11d
-; CHECK-NEXT:         jl      [[RET]]
-; CHECK-NEXT:         movq    [[REG:.*]], %rdi
-; CHECK-NEXT:         jmp     __asan_report_load4
-
-; CHECK:              .type   __asan_check_load8_rn[[RN8]],@function
-; CHECK-NEXT:         .weak   __asan_check_load8_rn[[RN8]]
-; CHECK-NEXT:         .hidden __asan_check_load8_rn[[RN8]]
-; CHECK-NEXT: __asan_check_load8_rn[[RN8]]:
-; CHECK-NEXT:         movq    [[REG:.*]], %r10
-; CHECK-NEXT:         shrq    $3, %r10
-; CHECK-NEXT:         cmpb    $0, 2147450880(%r10)
-; CHECK-NEXT:         jne     [[FAIL:.*]]
-; CHECK-NEXT: [[RET:.*]]:
-; CHECK-NEXT:         retq
-; CHECK-NEXT: [[FAIL]]:
-; CHECK-NEXT:         movq    [[REG:.*]], %rdi
-; CHECK-NEXT:         jmp     __asan_report_load8
-
-; CHECK:              .type   __asan_check_load16_rn[[RN16]],@function
-; CHECK-NEXT:         .weak   __asan_check_load16_rn[[RN16]]
-; CHECK-NEXT:         .hidden __asan_check_load16_rn[[RN16]]
-; CHECK-NEXT: __asan_check_load16_rn[[RN16]]:
-; CHECK-NEXT:         movq    [[REG:.*]], %r10
-; CHECK-NEXT:         shrq    $3, %r10
-; CHECK-NEXT:         cmpw    $0, 2147450880(%r10)
-; CHECK-NEXT:         jne     [[FAIL:.*]]
-; CHECK-NEXT: [[RET:.*]]:
-; CHECK-NEXT:         retq
-; CHECK-NEXT: [[FAIL]]:
-; CHECK-NEXT:         movq    [[REG:.*]], %rdi
-; CHECK-NEXT:         jmp     __asan_report_load16
-
-; CHECK:              .type   __asan_check_store1_rn[[RN1]],@function
-; CHECK-NEXT:         .weak   __asan_check_store1_rn[[RN1]]
-; CHECK-NEXT:         .hidden __asan_check_store1_rn[[RN1]]
-; CHECK-NEXT: __asan_check_store1_rn[[RN1]]:
-; CHECK-NEXT:         movq    [[REG:.*]], %r10
-; CHECK-NEXT:         shrq    $3, %r10
-; CHECK-NEXT:         movsbl  2147450880(%r10), %r10d
-; CHECK-NEXT:         testl   %r10d, %r10d
-; CHECK-NEXT:         jne     [[EXTRA:.*]]
-; CHECK-NEXT: [[RET:.*]]:
-; CHECK-NEXT:         retq
-; CHECK-NEXT: [[EXTRA]]:
-; CHECK-NEXT:         movq    [[REG]], %r11
-; CHECK-NEXT:         andl    $7, %r11d
-; CHECK-NEXT:         cmpl    %r10d, %r11d
-; CHECK-NEXT:         jl      [[RET]]
-; CHECK-NEXT:         movq    [[REG:.*]], %rdi
-; CHECK-NEXT:         jmp     __asan_report_store1@PLT
-
-; CHECK:              .type   __asan_check_store2_rn[[RN2]],@function
-; CHECK-NEXT:         .weak   __asan_check_store2_rn[[RN2]]
-; CHECK-NEXT:         .hidden __asan_check_store2_rn[[RN2]]
-; CHECK-NEXT: __asan_check_store2_rn[[RN2]]:
-; CHECK-NEXT:         movq    [[REG:.*]], %r10
-; CHECK-NEXT:         shrq    $3, %r10
-; CHECK-NEXT:         movsbl  2147450880(%r10), %r10d
-; CHECK-NEXT:         testl   %r10d, %r10d
-; CHECK-NEXT:         jne     [[EXTRA:.*]]
-; CHECK-NEXT: [[RET:.*]]:
-; CHECK-NEXT:         retq
-; CHECK-NEXT: [[EXTRA]]:
-; CHECK-NEXT:         movq    [[REG]], %r11
-; CHECK-NEXT:         andl    $7, %r11d
-; CHECK-NEXT:         addl    $1, %r11d
-; CHECK-NEXT:         cmpl    %r10d, %r11d
-; CHECK-NEXT:         jl      [[RET]]
-; CHECK-NEXT:         movq    [[REG:.*]], %rdi
-; CHECK-NEXT:         jmp     __asan_report_store2@PLT
-
-; CHECK:              .type   __asan_check_store4_rn[[RN4]],@function
-; CHECK-NEXT:         .weak   __asan_check_store4_rn[[RN4]]
-; CHECK-NEXT:         .hidden __asan_check_store4_rn[[RN4]]
-; CHECK-NEXT: __asan_check_store4_rn[[RN4]]:
-; CHECK-NEXT:         movq    [[REG:.*]], %r10
-; CHECK-NEXT:         shrq    $3, %r10
-; CHECK-NEXT:         movsbl  2147450880(%r10), %r10d
-; CHECK-NEXT:         testl   %r10d, %r10d
-; CHECK-NEXT:         jne     [[EXTRA:.*]]
-; CHECK-NEXT: [[RET:.*]]:
-; CHECK-NEXT:         retq
-; CHECK-NEXT: [[EXTRA]]:
-; CHECK-NEXT:         movq    [[REG]], %r11
-; CHECK-NEXT:         andl    $7, %r11d
-; CHECK-NEXT:         addl    $3, %r11d
-; CHECK-NEXT:         cmpl    %r10d, %r11d
-; CHECK-NEXT:         jl      [[RET]]
-; CHECK-NEXT:         movq    [[REG:.*]], %rdi
-; CHECK-NEXT:         jmp     __asan_report_store4@PLT
-
-; CHECK:              .type   __asan_check_store8_rn[[RN8]],@function
-; CHECK-NEXT:         .weak   __asan_check_store8_rn[[RN8]]
-; CHECK-NEXT:         .hidden __asan_check_store8_rn[[RN8]]
-; CHECK-NEXT: __asan_check_store8_rn[[RN8]]:
-; CHECK-NEXT:         movq    [[REG:.*]], %r10
-; CHECK-NEXT:         shrq    $3, %r10
-; CHECK-NEXT:         cmpb    $0, 2147450880(%r10)
-; CHECK-NEXT:         jne     [[FAIL:.*]]
-; CHECK-NEXT: [[RET:.*]]:
-; CHECK-NEXT:         retq
-; CHECK-NEXT: [[FAIL]]:
-; CHECK-NEXT:         movq    [[REG:.*]], %rdi
-; CHECK-NEXT:         jmp     __asan_report_store8@PLT
-
-; CHECK:              .type   __asan_check_store16_rn[[RN16]],@function
-; CHECK-NEXT:         .weak   __asan_check_store16_rn[[RN16]]
-; CHECK-NEXT:         .hidden __asan_check_store16_rn[[RN16]]
-; CHECK-NEXT: __asan_check_store16_rn[[RN16]]:
-; CHECK-NEXT:         movq    [[REG:.*]], %r10
-; CHECK-NEXT:         shrq    $3, %r10
-; CHECK-NEXT:         cmpw    $0, 2147450880(%r10)
-; CHECK-NEXT:         jne     [[FAIL:.*]]
-; CHECK-NEXT: [[RET:.*]]:
-; CHECK-NEXT:         retq
-; CHECK-NEXT: [[FAIL]]:
-; CHECK-NEXT:         movq    [[REG:.*]], %rdi
-; CHECK-NEXT:         jmp     __asan_report_store16@PLT
-
 declare void @llvm.asan.check.memaccess(i8*, i32 immarg)

llvm/test/CodeGen/X86/asan-check-memaccess-or.ll

 ; RUN: llc < %s | FileCheck %s
 
 target triple = "x86_64-pc-win"
 
 define void @load1(i8* nocapture readonly %x) {
 ; CHECK:              pushq   %rax
 ; CHECK-NOT:          push    %rbp
-; CHECK:              callq   __asan_check_load1_rn[[RN1:.*]]
-; CHECK:              callq   __asan_check_store1_rn[[RN1]]
+; CHECK:              callq   __asan_check_load_or_1_[[REG1:.*]]
+; CHECK:              callq   __asan_check_store_or_1_[[REG1]]
 ; CHECK-NOT:          pop     %rbp
 ; CHECK:              popq    %rax
   call void @llvm.asan.check.memaccess(i8* %x, i32 0)
   call void @llvm.asan.check.memaccess(i8* %x, i32 32)
   ret void
 }
 
 define void @load2(i16* nocapture readonly %x) {
 ; CHECK:              pushq   %rax
 ; CHECK-NOT:          push    %rbp
-; CHECK:              callq   __asan_check_load2_rn[[RN2:.*]]
-; CHECK:              callq   __asan_check_store2_rn[[RN2]]
+; CHECK:              callq   __asan_check_load_or_2_[[REG2:.*]]
+; CHECK:              callq   __asan_check_store_or_2_[[REG2]]
 ; CHECK-NOT:          pop     %rbp
 ; CHECK:              popq    %rax
   %1 = ptrtoint i16* %x to i64
   %2 = bitcast i16* %x to i8*
   call void @llvm.asan.check.memaccess(i8* %2, i32 2)
   call void @llvm.asan.check.memaccess(i8* %2, i32 34)
   ret void
 }
 
 define void @load4(i32* nocapture readonly %x) {
 ; CHECK:              pushq   %rax
 ; CHECK-NOT:          push    %rbp
-; CHECK:              callq   __asan_check_load4_rn[[RN4:.*]]
-; CHECK:              callq   __asan_check_store4_rn[[RN4]]
+; CHECK:              callq   __asan_check_load_or_4_[[REG4:.*]]
+; CHECK:              callq   __asan_check_store_or_4_[[REG4]]
 ; CHECK-NOT:          pop     %rbp
 ; CHECK:              popq    %rax
   %1 = ptrtoint i32* %x to i64
   %2 = bitcast i32* %x to i8*
   call void @llvm.asan.check.memaccess(i8* %2, i32 4)
   call void @llvm.asan.check.memaccess(i8* %2, i32 36)
   ret void
 }
 define void @load8(i64* nocapture readonly %x) {
 ; CHECK:              pushq   %rax
 ; CHECK-NOT:          push    %rbp
-; CHECK:              callq   __asan_check_load8_rn[[RN8:.*]]
-; CHECK:              callq   __asan_check_store8_rn[[RN8]]
+; CHECK:              callq   __asan_check_load_or_8_[[REG8:.*]]
+; CHECK:              callq   __asan_check_store_or_8_[[REG8]]
 ; CHECK-NOT:          pop     %rbp
 ; CHECK:              popq    %rax
   %1 = ptrtoint i64* %x to i64
   %2 = bitcast i64* %x to i8*
   call void @llvm.asan.check.memaccess(i8* %2, i32 6)
   call void @llvm.asan.check.memaccess(i8* %2, i32 38)
   ret void
 }
 
 define void @load16(i128* nocapture readonly %x) {
 ; CHECK:              pushq   %rax
 ; CHECK-NOT:          push    %rbp
-; CHECK:              callq   __asan_check_load16_rn[[RN16:.*]]
-; CHECK:              callq   __asan_check_store16_rn[[RN16]]
+; CHECK:              callq   __asan_check_load_or_16_[[REG16:.*]]
+; CHECK:              callq   __asan_check_store_or_16_[[REG16]]
 ; CHECK-NOT:          pop     %rbp
 ; CHECK:              popq    %rax
   %1 = ptrtoint i128* %x to i64
   %2 = bitcast i128* %x to i8*
   call void @llvm.asan.check.memaccess(i8* %2, i32 8)
   call void @llvm.asan.check.memaccess(i8* %2, i32 40)
   ret void
 }
 
-; CHECK:              .type   __asan_check_load1_rn[[RN1]],@function
-; CHECK-NEXT:         .weak   __asan_check_load1_rn[[RN1]]
-; CHECK-NEXT:         .hidden __asan_check_load1_rn[[RN1]]
-; CHECK-NEXT: __asan_check_load1_rn[[RN1]]:
-; CHECK-NEXT:         movq    [[REG:.*]], %r10
-; CHECK-NEXT:         shrq    $3, %r10
-; CHECK-NEXT:         orq     $17592186044416, %r10{{.*}}
-; CHECK-NEXT:         movb    (%r10), %r10b
-; CHECK-NEXT:         testb   %r10b, %r10b
-; CHECK-NEXT:         jne     [[EXTRA:.*]]
-; CHECK-NEXT: [[RET:.*]]:
-; CHECK-NEXT:         retq
-; CHECK-NEXT: [[EXTRA]]:
-; CHECK-NEXT:         movq    [[REG]], %r11
-; CHECK-NEXT:         andl    $7, %r11d
-; CHECK-NEXT:         cmpl    %r10d, %r11d
-; CHECK-NEXT:         jl      [[RET]]
-; CHECK-NEXT:         movq    [[REG:.*]], %rdi
-; CHECK-NEXT:         jmp     __asan_report_load1
-
-; CHECK:              .type   __asan_check_load2_rn[[RN2]],@function
-; CHECK-NEXT:         .weak   __asan_check_load2_rn[[RN2]]
-; CHECK-NEXT:         .hidden __asan_check_load2_rn[[RN2]]
-; CHECK-NEXT: __asan_check_load2_rn[[RN2]]:
-; CHECK-NEXT:         movq    [[REG:.*]], %r10
-; CHECK-NEXT:         shrq    $3, %r10
-; CHECK-NEXT:         orq     $17592186044416, %r10{{.*}}
-; CHECK-NEXT:         movb    (%r10), %r10b
-; CHECK-NEXT:         testb   %r10b, %r10b
-; CHECK-NEXT:         jne     [[EXTRA:.*]]
-; CHECK-NEXT: [[RET:.*]]:
-; CHECK-NEXT:         retq
-; CHECK-NEXT: [[EXTRA]]:
-; CHECK-NEXT:         movq    [[REG]], %r11
-; CHECK-NEXT:         andl    $7, %r11d
-; CHECK-NEXT:         addl    $1, %r11d
-; CHECK-NEXT:         cmpl    %r10d, %r11d
-; CHECK-NEXT:         jl      [[RET]]
-; CHECK-NEXT:         movq    [[REG:.*]], %rdi
-; CHECK-NEXT:         jmp     __asan_report_load2
-
-; CHECK:              .type   __asan_check_load4_rn[[RN4]],@function
-; CHECK-NEXT:         .weak   __asan_check_load4_rn[[RN4]]
-; CHECK-NEXT:         .hidden __asan_check_load4_rn[[RN4]]
-; CHECK-NEXT: __asan_check_load4_rn[[RN4]]:
-; CHECK-NEXT:         movq    [[REG:.*]], %r10
-; CHECK-NEXT:         shrq    $3, %r10
-; CHECK-NEXT:         orq     $17592186044416, %r10{{.*}}
-; CHECK-NEXT:         movb    (%r10), %r10b
-; CHECK-NEXT:         testb   %r10b, %r10b
-; CHECK-NEXT:         jne     [[EXTRA:.*]]
-; CHECK-NEXT: [[RET:.*]]:
-; CHECK-NEXT:         retq
-; CHECK-NEXT: [[EXTRA]]:
-; CHECK-NEXT:         movq    [[REG]], %r11
-; CHECK-NEXT:         andl    $7, %r11d
-; CHECK-NEXT:         addl    $3, %r11d
-; CHECK-NEXT:         cmpl    %r10d, %r11d
-; CHECK-NEXT:         jl      [[RET]]
-; CHECK-NEXT:         movq    [[REG:.*]], %rdi
-; CHECK-NEXT:         jmp     __asan_report_load4
-
-; CHECK:              .type   __asan_check_load8_rn[[RN8]],@function
-; CHECK-NEXT:         .weak   __asan_check_load8_rn[[RN8]]
-; CHECK-NEXT:         .hidden __asan_check_load8_rn[[RN8]]
-; CHECK-NEXT: __asan_check_load8_rn[[RN8]]:
-; CHECK-NEXT:         movq    [[REG:.*]], %r10
-; CHECK-NEXT:         shrq    $3, %r10
-; CHECK-NEXT:         orq     $17592186044416, %r10{{.*}}
-; CHECK-NEXT:         cmpb    $0, (%r10)
-; CHECK-NEXT:         jne     [[FAIL:.*]]
-; CHECK-NEXT: [[RET:.*]]:
-; CHECK-NEXT:         retq
-; CHECK-NEXT: [[FAIL]]:
-; CHECK-NEXT:         movq    [[REG:.*]], %rdi
-; CHECK-NEXT:         jmp     __asan_report_load8
-
-; CHECK:              .type   __asan_check_load16_rn[[RN16]],@function
-; CHECK-NEXT:         .weak   __asan_check_load16_rn[[RN16]]
-; CHECK-NEXT:         .hidden __asan_check_load16_rn[[RN16]]
-; CHECK-NEXT: __asan_check_load16_rn[[RN16]]:
-; CHECK-NEXT:         movq    [[REG:.*]], %r10
-; CHECK-NEXT:         shrq    $3, %r10
-; CHECK-NEXT:         orq     $17592186044416, %r10{{.*}}
-; CHECK-NEXT:         cmpw    $0, (%r10)
-; CHECK-NEXT:         jne     [[FAIL:.*]]
-; CHECK-NEXT: [[RET:.*]]:
-; CHECK-NEXT:         retq
-; CHECK-NEXT: [[FAIL]]:
-; CHECK-NEXT:         movq    [[REG:.*]], %rdi
-; CHECK-NEXT:         jmp     __asan_report_load16
-
-; CHECK:              .type   __asan_check_store1_rn[[RN1]],@function
-; CHECK-NEXT:         .weak   __asan_check_store1_rn[[RN1]]
-; CHECK-NEXT:         .hidden __asan_check_store1_rn[[RN1]]
-; CHECK-NEXT: __asan_check_store1_rn[[RN1]]:
-; CHECK-NEXT:         movq    [[REG:.*]], %r10
-; CHECK-NEXT:         shrq    $3, %r10
-; CHECK-NEXT:         orq     $17592186044416, %r10
-; CHECK-NEXT:         movb    (%r10), %r10b
-; CHECK-NEXT:         testb   %r10b, %r10b
-; CHECK-NEXT:         jne     [[EXTRA:.*]]
-; CHECK-NEXT: [[RET:.*]]:
-; CHECK-NEXT:         retq
-; CHECK-NEXT: [[EXTRA]]:
-; CHECK-NEXT:         movq    [[REG]], %r11
-; CHECK-NEXT:         andl    $7, %r11d
-; CHECK-NEXT:         cmpl    %r10d, %r11d
-; CHECK-NEXT:         jl      [[RET]]
-; CHECK-NEXT:         movq    [[REG:.*]], %rdi
-; CHECK-NEXT:         jmp     __asan_report_store1@PLT
-
-; CHECK:              .type   __asan_check_store2_rn[[RN2]],@function
-; CHECK-NEXT:         .weak   __asan_check_store2_rn[[RN2]]
-; CHECK-NEXT:         .hidden __asan_check_store2_rn[[RN2]]
-; CHECK-NEXT: __asan_check_store2_rn[[RN2]]:
-; CHECK-NEXT:         movq    [[REG:.*]], %r10
-; CHECK-NEXT:         shrq    $3, %r10
-; CHECK-NEXT:         orq     $17592186044416, %r10
-; CHECK-NEXT:         movb    (%r10), %r10b
-; CHECK-NEXT:         testb   %r10b, %r10b
-; CHECK-NEXT:         jne     [[EXTRA:.*]]
-; CHECK-NEXT: [[RET:.*]]:
-; CHECK-NEXT:         retq
-; CHECK-NEXT: [[EXTRA]]:
-; CHECK-NEXT:         movq    [[REG]], %r11
-; CHECK-NEXT:         andl    $7, %r11d
-; CHECK-NEXT:         addl    $1, %r11d
-; CHECK-NEXT:         cmpl    %r10d, %r11d
-; CHECK-NEXT:         jl      [[RET]]
-; CHECK-NEXT:         movq    [[REG:.*]], %rdi
-; CHECK-NEXT:         jmp     __asan_report_store2@PLT
-
-; CHECK:              .type   __asan_check_store4_rn[[RN4]],@function
-; CHECK-NEXT:         .weak   __asan_check_store4_rn[[RN4]]
-; CHECK-NEXT:         .hidden __asan_check_store4_rn[[RN4]]
-; CHECK-NEXT: __asan_check_store4_rn[[RN4]]:
-; CHECK-NEXT:         movq    [[REG:.*]], %r10
-; CHECK-NEXT:         shrq    $3, %r10
-; CHECK-NEXT:         orq     $17592186044416, %r10
-; CHECK-NEXT:         movb    (%r10), %r10b
-; CHECK-NEXT:         testb   %r10b, %r10b
-; CHECK-NEXT:         jne     [[EXTRA:.*]]
-; CHECK-NEXT: [[RET:.*]]:
-; CHECK-NEXT:         retq
-; CHECK-NEXT: [[EXTRA]]:
-; CHECK-NEXT:         movq    [[REG]], %r11
-; CHECK-NEXT:         andl    $7, %r11d
-; CHECK-NEXT:         addl    $3, %r11d
-; CHECK-NEXT:         cmpl    %r10d, %r11d
-; CHECK-NEXT:         jl      [[RET]]
-; CHECK-NEXT:         movq    [[REG:.*]], %rdi
-; CHECK-NEXT:         jmp     __asan_report_store4@PLT
-
-; CHECK:              .type   __asan_check_store8_rn[[RN8]],@function
-; CHECK-NEXT:         .weak   __asan_check_store8_rn[[RN8]]
-; CHECK-NEXT:         .hidden __asan_check_store8_rn[[RN8]]
-; CHECK-NEXT: __asan_check_store8_rn[[RN8]]:
-; CHECK-NEXT:         movq    [[REG:.*]], %r10
-; CHECK-NEXT:         shrq    $3, %r10
-; CHECK-NEXT:         orq     $17592186044416, %r10{{.*}}
-; CHECK-NEXT:         cmpb    $0, (%r10)
-; CHECK-NEXT:         jne     [[FAIL:.*]]
-; CHECK-NEXT: [[RET:.*]]:
-; CHECK-NEXT:         retq
-; CHECK-NEXT: [[FAIL]]:
-; CHECK-NEXT:         movq    [[REG:.*]], %rdi
-; CHECK-NEXT:         jmp     __asan_report_store8@PLT
-
-; CHECK:              .type   __asan_check_store16_rn[[RN16]],@function
-; CHECK-NEXT:         .weak   __asan_check_store16_rn[[RN16]]
-; CHECK-NEXT:         .hidden __asan_check_store16_rn[[RN16]]
-; CHECK-NEXT: __asan_check_store16_rn[[RN16]]:
-; CHECK-NEXT:         movq    [[REG:.*]], %r10
-; CHECK-NEXT:         shrq    $3, %r10
-; CHECK-NEXT:         orq     $17592186044416, %r10{{.*}}
-; CHECK-NEXT:         cmpw    $0, (%r10)
-; CHECK-NEXT:         jne     [[FAIL:.*]]
-; CHECK-NEXT: [[RET:.*]]:
-; CHECK-NEXT:         retq
-; CHECK-NEXT: [[FAIL]]:
-; CHECK-NEXT:         movq    [[REG:.*]], %rdi
-; CHECK-NEXT:         jmp     __asan_report_store16@PLT
-
 declare void @llvm.asan.check.memaccess(i8*, i32 immarg)