# HG changeset patch
# User David Major <dmajor@mozilla.com>
# Date 1526049832 14400
#      Fri May 11 10:43:52 2018 -0400
# Node ID afab7328e4dbcb92530adbce1e32a2e916547afb
# Parent  c1072dfa6fe0dc36a54e2f81103003e8bdd6a4dc
Bug 1458325: Merge ASan runtime patch to fix Win64 jit-tests. r=froydnj

diff --git a/build/build-clang/clang-win64.json b/build/build-clang/clang-win64.json
--- a/build/build-clang/clang-win64.json
+++ b/build/build-clang/clang-win64.json
@@ -9,11 +9,12 @@
     "lld_repo": "https://llvm.org/svn/llvm-project/lld/trunk",
     "compiler_repo": "https://llvm.org/svn/llvm-project/compiler-rt/trunk",
     "libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/trunk",
     "python_path": "c:/mozilla-build/python/python.exe",
     "cc": "cl.exe",
     "cxx": "cl.exe",
     "ml": "ml64.exe",
     "patches": [
+      "r332092.patch"
       "loosen-msvc-detection.patch"
     ]
 }
diff --git a/build/build-clang/r332092.patch b/build/build-clang/r332092.patch
new file mode 100644
--- /dev/null
+++ b/build/build-clang/r332092.patch
@@ -0,0 +1,22 @@
+Bug 1458325: Fix copy/paste error in AddrIsInHighShadow that breaks Win64 jit-tests
+
+https://reviews.llvm.org/D46291
+https://github.com/llvm-mirror/compiler-rt/commit/d55f7bdbe7079a3d331d8ac7d0e82352eaf26af1
+
+--- a/compiler-rt/lib/asan/asan_mapping.h
++++ b/compiler-rt/lib/asan/asan_mapping.h
+@@ -319,12 +319,12 @@
+ 
+ static inline bool AddrIsInHighShadow(uptr a) {
+   PROFILE_ASAN_MAPPING();
+-  return a >= kHighShadowBeg && a <= kHighMemEnd;
++  return a >= kHighShadowBeg && a <= kHighShadowEnd;
+ }
+ 
+ static inline bool AddrIsInMidShadow(uptr a) {
+   PROFILE_ASAN_MAPPING();
+-  return kMidMemBeg && a >= kMidShadowBeg && a <= kMidMemEnd;
++  return kMidMemBeg && a >= kMidShadowBeg && a <= kMidShadowEnd;
+ }
+ 
+ static inline bool AddrIsInShadow(uptr a) {