Bug 1465245 - Update clang-cl toolchain to r333414. r=froydnj
authorDavid Major <dmajor@mozilla.com>
Wed, 30 May 2018 13:27:13 -0400
changeset 474828 5e336efffea84e94dafabdc0321e64add15df847
parent 474755 ad5c73d02164b695c1e2036bf90fad730042a251
child 474829 51748a8a2967a48721906dc0ba9cf3515146a22a
push id9374
push userjlund@mozilla.com
push dateMon, 18 Jun 2018 21:43:20 +0000
treeherdermozilla-beta@160e085dfb0b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1465245
milestone62.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1465245 - Update clang-cl toolchain to r333414. r=froydnj
build/build-clang/clang-win64.json
build/build-clang/r332092.patch
build/build-clang/r332095.patch
--- a/build/build-clang/clang-win64.json
+++ b/build/build-clang/clang-win64.json
@@ -1,21 +1,19 @@
 {
-    "llvm_revision": "328769",
+    "llvm_revision": "333414",
     "stages": "3",
     "build_libcxx": false,
     "build_type": "Release",
     "assertions": false,
     "llvm_repo": "https://llvm.org/svn/llvm-project/llvm/trunk",
     "clang_repo": "https://llvm.org/svn/llvm-project/cfe/trunk",
     "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",
-      "r332095.patch",
       "loosen-msvc-detection.patch"
     ]
 }
deleted file mode 100644
--- a/build/build-clang/r332092.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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) {
deleted file mode 100644
--- a/build/build-clang/r332095.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-r332095 | dmajor | 2018-05-11 10:31:14 -0400 (Fri, 11 May 2018) | 9 lines
-
-[winasan] Update GetInstructionSize for Win10 1803
-
-In Windows version 1803, the first instruction of ntdll!strchr is:
-8a01 mov al,byte ptr [rcx]
-
-This is the only needed change for this version as far as I can tell.
-
-Differential Revision: https://reviews.llvm.org/D46458
-
---- a/compiler-rt/lib/interception/interception_win.cc
-+++ b/compiler-rt/lib/interception/interception_win.cc
-@@ -453,6 +453,7 @@
-   }
-
-   switch (*(u16*)(address)) {
-+    case 0x018A:  // 8A 01 : mov al, byte ptr [ecx]
-     case 0xFF8B:  // 8B FF : mov edi, edi
-     case 0xEC8B:  // 8B EC : mov ebp, esp
-     case 0xc889:  // 89 C8 : mov eax, ecx