[llvm-branch-commits] [compiler-rt-branch] r228007 - Merging r226809:

[Hans Wennborg]

Author: hans
Date: Tue Feb  3 12:56:42 2015
New Revision: 228007

URL: http://llvm.org/viewvc/llvm-project?rev=228007&view=rev
Log:
Merging r226809:
------------------------------------------------------------------------
r226809 | timurrrr | 2015-01-22 04:24:21 -0800 (Thu, 22 Jan 2015) | 1 line

[ASan/Win] Move the shadow to 0x30000000
------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_36/   (props changed)
    compiler-rt/branches/release_36/lib/asan/asan_mapping.h

Propchange: compiler-rt/branches/release_36/
------------------------------------------------------------------------------
    svn:mergeinfo = /compiler-rt/trunk:226809

Modified: compiler-rt/branches/release_36/lib/asan/asan_mapping.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_36/lib/asan/asan_mapping.h?rev=228007&r1=228006&r2=228007&view=diff
==============================================================================
--- compiler-rt/branches/release_36/lib/asan/asan_mapping.h (original)
+++ compiler-rt/branches/release_36/lib/asan/asan_mapping.h Tue Feb  3 12:56:42 2015
@@ -81,11 +81,13 @@
 // || `[0x00000000, 0x3fffffff]` || LowMem     ||
 //
 // Default Windows/i386 mapping:
-// || `[0x60000000, 0xffffffff]` || HighMem    ||
-// || `[0x4c000000, 0x5fffffff]` || HighShadow ||
-// || `[0x48000000, 0x4bffffff]` || ShadowGap  ||
-// || `[0x40000000, 0x47ffffff]` || LowShadow  ||
-// || `[0x00000000, 0x3fffffff]` || LowMem     ||
+// (the exact location of HighShadow/HighMem may vary depending
+//  on WoW64, /LARGEADDRESSAWARE, etc).
+// || `[0x50000000, 0xffffffff]` || HighMem    ||
+// || `[0x3a000000, 0x4fffffff]` || HighShadow ||
+// || `[0x36000000, 0x39ffffff]` || ShadowGap  ||
+// || `[0x30000000, 0x35ffffff]` || LowShadow  ||
+// || `[0x00000000, 0x2fffffff]` || LowMem     ||
 
 static const u64 kDefaultShadowScale = 3;
 static const u64 kDefaultShadowOffset32 = 1ULL << 29;  // 0x20000000
@@ -98,7 +100,7 @@ static const u64 kMIPS64_ShadowOffset64
 static const u64 kPPC64_ShadowOffset64 = 1ULL << 41;
 static const u64 kFreeBSD_ShadowOffset32 = 1ULL << 30;  // 0x40000000
 static const u64 kFreeBSD_ShadowOffset64 = 1ULL << 46;  // 0x400000000000
-static const u64 kWindowsShadowOffset32 = 1ULL << 30;  // 0x40000000
+static const u64 kWindowsShadowOffset32 = 3ULL << 28;  // 0x30000000
 
 #define SHADOW_SCALE kDefaultShadowScale
 #if SANITIZER_ANDROID