[win/asan] GetInstructionSize: Make F6 C1 XX a generic entry.

[bernhardu]

No description provided.

[llvmbot]

@llvm/pr-subscribers-compiler-rt-sanitizer

Author: None (bernhardu)

Changes

---

Full diff: https://github.com/llvm/llvm-project/pull/118144.diff

1 Files Affected:

• (modified) compiler-rt/lib/interception/interception_win.cpp (+3-1)

diff --git a/compiler-rt/lib/interception/interception_win.cpp b/compiler-rt/lib/interception/interception_win.cpp
index dc3018a675dee2..e3c3764c45417f 100644
--- a/compiler-rt/lib/interception/interception_win.cpp
+++ b/compiler-rt/lib/interception/interception_win.cpp
@@ -634,6 +634,9 @@ static size_t GetInstructionSize(uptr address, size_t* rel_offset = nullptr) {
     case 0xD284:  // 84 D2 : test dl,dl
       return 2;
 
+    case 0xC1F6:  // F6 C1 XX : test cl, XX
+      return 3;
+
     // Cannot overwrite control-instruction. Return 0 to indicate failure.
     case 0x25FF:  // FF 25 XX YY ZZ WW : jmp dword ptr ds:[WWZZYYXX]
       return 0;
@@ -724,7 +727,6 @@ static size_t GetInstructionSize(uptr address, size_t* rel_offset = nullptr) {
   }
 
   switch (0x00FFFFFF & *(u32*)address) {
-    case 0x07c1f6:    // f6 c1 07 : test cl, 0x7
     case 0x10b70f:    // 0f b7 10 : movzx edx, WORD PTR [rax]
     case 0xc00b4d:    // 4d 0b c0 : or r8, r8
     case 0xc03345:    // 45 33 c0 : xor r8d, r8d

[github-actions]

✅ With the latest revision this PR passed the C/C++ code formatter.

[bernhardu]

v2:

• adjust for format requirements.

[bernhardu]

v3:

• Add test line.

CC: @zmodem

[zmodem]

lgtm

Would you like me to hit the "merge" button?

[bernhardu]

Would you like me to hit the "merge" button?

Thanks for reviewing, if there are no more concerns about the change, yes, please.