From: Etienne Bergeron <etienneb@google.com>
Date: Fri, 30 Sep 2016 19:37:11 +0000 (+0000)
Subject: [compiler-rt] Fix interception of crt atoll on win10 CRT.
X-Git-Tag: llvmorg-4.0.0-rc1~8455
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9f987d3f89763182af35e11a757d81917bcaa31d;p=platform%2Fupstream%2Fllvm.git

[compiler-rt] Fix interception of crt atoll on win10 CRT.

Summary:
The check-asan-dynamic tests were broken on win10 because the interception
library was not able to hook on some functions.

credits: thanks sebastian marchand to help debugging this on win10.

Reviewers: rnk

Subscribers: chrisha, llvm-commits, dberris

Differential Revision: https://reviews.llvm.org/D25120

llvm-svn: 282904
---

diff --git a/compiler-rt/lib/interception/interception_win.cc b/compiler-rt/lib/interception/interception_win.cc
index a967706..8ffc5ae 100644
--- a/compiler-rt/lib/interception/interception_win.cc
+++ b/compiler-rt/lib/interception/interception_win.cc
@@ -498,6 +498,7 @@ static size_t GetInstructionSize(uptr address, size_t* rel_offset = nullptr) {
     case 0xd9f748:    // 48 f7 d9 : neg rcx
     case 0xd12b48:    // 48 2b d1 : sub rdx, rcx
     case 0x07c1f6:    // f6 c1 07 : test cl, 0x7
+    case 0xc98548:    // 48 85 C9 : test rcx, rcx
     case 0xc0854d:    // 4d 85 c0 : test r8, r8
     case 0xc2b60f:    // 0f b6 c2 : movzx eax, dl
     case 0xc03345:    // 45 33 c0 : xor r8d, r8d