llvmorg-20-init-9666-g8417f6af54c8.patch (1109B)
1 From 8417f6af54c8f6dcf5893ab1352b50bf33c5a1ba Mon Sep 17 00:00:00 2001 2 From: Hans Wennborg <hans@chromium.org> 3 Date: Mon, 21 Oct 2024 17:51:42 +0200 4 Subject: [PATCH] [win/asan] Fix instruction size for 44 0f b6 1a 5 6 movzx r11d,BYTE PTR [rdx] 7 8 is four bytes long. 9 10 Follow-up to #111638 11 --- 12 compiler-rt/lib/interception/interception_win.cpp | 1 + 13 1 file changed, 1 insertion(+) 14 15 diff --git a/compiler-rt/lib/interception/interception_win.cpp b/compiler-rt/lib/interception/interception_win.cpp 16 index 4f60d4251303..077a536dd2a3 100644 17 --- a/compiler-rt/lib/interception/interception_win.cpp 18 +++ b/compiler-rt/lib/interception/interception_win.cpp 19 @@ -769,6 +769,7 @@ static size_t GetInstructionSize(uptr address, size_t* rel_offset = nullptr) { 20 21 switch (*(u32*)(address)) { 22 case 0x1ab60f44: // 44 0f b6 1a : movzx r11d, BYTE PTR [rdx] 23 + return 4; 24 case 0x24448b48: // 48 8b 44 24 XX : mov rax, QWORD ptr [rsp + XX] 25 case 0x246c8948: // 48 89 6C 24 XX : mov QWORD ptr [rsp + XX], rbp 26 case 0x245c8948: // 48 89 5c 24 XX : mov QWORD PTR [rsp + XX], rbx 27 -- 28 2.47.0.1.g59ce1bf855