[compiler-rt] r218465 - Add support for intercepting functions from msvcr110.dll

Ehsan Akhgari ehsan.akhgari at gmail.com
Thu Sep 25 13:47:10 PDT 2014


Author: ehsan
Date: Thu Sep 25 15:47:10 2014
New Revision: 218465

URL: http://llvm.org/viewvc/llvm-project?rev=218465&view=rev
Log:
Add support for intercepting functions from msvcr110.dll

Summary: This finishes support for ASAN on MSVC2012.

Test Plan: |ninja check-asan| passes locally with this on MSVC2012.

Reviewers: timurrrr

Subscribers: llvm-commits

Differential Revision: http://reviews.llvm.org/D5494

Modified:
    compiler-rt/trunk/lib/interception/interception_win.cc

Modified: compiler-rt/trunk/lib/interception/interception_win.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/interception/interception_win.cc?rev=218465&r1=218464&r2=218465&view=diff
==============================================================================
--- compiler-rt/trunk/lib/interception/interception_win.cc (original)
+++ compiler-rt/trunk/lib/interception/interception_win.cc Thu Sep 25 15:47:10 2014
@@ -182,7 +182,10 @@ bool OverrideFunction(uptr old_func, upt
 }
 
 static const void **InterestingDLLsAvailable() {
-  const char *InterestingDLLs[] = { "kernel32.dll", "msvcr120.dll", NULL };
+  const char *InterestingDLLs[] = {"kernel32.dll",
+                                   "msvcr110.dll", // VS2012
+                                   "msvcr120.dll", // VS2013
+                                   NULL};
   static void *result[ARRAY_SIZE(InterestingDLLs)] = { 0 };
   if (!result[0]) {
     for (size_t i = 0, j = 0; InterestingDLLs[i]; ++i) {





More information about the llvm-commits mailing list