diff options
| author | Etienne Bergeron <etienneb@google.com> | 2016-07-12 19:39:07 +0000 |
|---|---|---|
| committer | Etienne Bergeron <etienneb@google.com> | 2016-07-12 19:39:07 +0000 |
| commit | e318b8374522af8d5a8102564b21cbd01f8bde9f (patch) | |
| tree | ef7445a993563b5b455df54d852b65bf832408a5 /compiler-rt/lib/interception/interception_win.cc | |
| parent | d7bd2389ceb2c2772d0d74cb092571a84aab3584 (diff) | |
| download | bcm5719-llvm-e318b8374522af8d5a8102564b21cbd01f8bde9f.tar.gz bcm5719-llvm-e318b8374522af8d5a8102564b21cbd01f8bde9f.zip | |
[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
Diffstat (limited to 'compiler-rt/lib/interception/interception_win.cc')
| -rw-r--r-- | compiler-rt/lib/interception/interception_win.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler-rt/lib/interception/interception_win.cc b/compiler-rt/lib/interception/interception_win.cc index 994961adc88..1db8ac481dd 100644 --- a/compiler-rt/lib/interception/interception_win.cc +++ b/compiler-rt/lib/interception/interception_win.cc @@ -461,6 +461,7 @@ static size_t GetInstructionSize(uptr address) { case 0x5541: // push r13 case 0x5641: // push r14 case 0x5741: // push r15 + case 0x9066: // Two-byte NOP return 2; } |
