| commit | e318b8374522af8d5a8102564b21cbd01f8bde9f | [log] [tgz] |
|---|---|---|
| author | Etienne Bergeron <[email protected]> | Tue Jul 12 19:39:07 2016 |
| committer | Etienne Bergeron <[email protected]> | Tue Jul 12 19:39:07 2016 |
| tree | ef7445a993563b5b455df54d852b65bf832408a5 | |
| parent | d7bd2389ceb2c2772d0d74cb092571a84aab3584 [diff] [blame] |
[asan] Fix interception unittest on Windows64. mov edi,edi is _not_ NOP in 64-bit, use 66,90h instead. This bug was causing interception unittest to crash on Windows64 (windows 8 and windows 10). Credits to etienneb for finding the root cause. Patch by: Wei Wang Differential Revision: http://reviews.llvm.org/D22274 llvm-svn: 275207
diff --git a/compiler-rt/lib/interception/interception_win.cc b/compiler-rt/lib/interception/interception_win.cc index 994961a..1db8ac4 100644 --- a/compiler-rt/lib/interception/interception_win.cc +++ b/compiler-rt/lib/interception/interception_win.cc
@@ -461,6 +461,7 @@ case 0x5541: // push r13 case 0x5641: // push r14 case 0x5741: // push r15 + case 0x9066: // Two-byte NOP return 2; }