mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-25 19:25:43 +00:00
3eb2b38c97
https://reviews.llvm.org/rL357725 Differential Revision: https://phabricator.services.mozilla.com/D36770 --HG-- extra : moz-landing-system : lando
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
Merge LLVM r357725 to allow ASan builds to run on machines with the VS2019 CRT.
|
|
|
|
---
|
|
|
|
[winasan] Fix strrchr interception with vs2019 CRT
|
|
|
|
strrchr in vs2019 CRT begins with unrecognized instructions.
|
|
|
|
VCRUNTIME140!strrchr:
|
|
4533c9 xor r9d, r9d
|
|
4c8bc1 mov r8, rcx
|
|
|
|
Patch by Christopher Reid!
|
|
|
|
Differential Revision: https://reviews.llvm.org/D60217
|
|
|
|
===================================================================
|
|
--- a/compiler-rt/lib/interception/interception_win.cc (revision 365039)
|
|
+++ b/compiler-rt/lib/interception/interception_win.cc (working copy)
|
|
@@ -513,10 +513,12 @@
|
|
case 0xc0854d: // 4d 85 c0 : test r8, r8
|
|
case 0xc2b60f: // 0f b6 c2 : movzx eax, dl
|
|
case 0xc03345: // 45 33 c0 : xor r8d, r8d
|
|
+ case 0xc93345: // 45 33 c9 : xor r9d, r9d
|
|
case 0xdb3345: // 45 33 DB : xor r11d, r11d
|
|
case 0xd98b4c: // 4c 8b d9 : mov r11, rcx
|
|
case 0xd28b4c: // 4c 8b d2 : mov r10, rdx
|
|
case 0xc98b4c: // 4C 8B C9 : mov r9, rcx
|
|
+ case 0xc18b4c: // 4C 8B C1 : mov r8, rcx
|
|
case 0xd2b60f: // 0f b6 d2 : movzx edx, dl
|
|
case 0xca2b48: // 48 2b ca : sub rcx, rdx
|
|
case 0x10b70f: // 0f b7 10 : movzx edx, WORD PTR [rax]
|