Initial patch for early feedback

Author: weliveindetail

cmake/caches/Windows-x86_64.cmake

@@ -40,7 +40,7 @@ endif()
 # The builtin targets are used to build the compiler-rt builtins.
 set(LLVM_BUILTIN_TARGETS ${DEFAULT_BUILTIN_TARGETS} CACHE STRING "")
 
-# The runtime targets are used to build the compiler-rt profile library.
+# The runtime targets are used to build the profile and sanitizer libs from compiler-rt.
 set(LLVM_RUNTIME_TARGETS
       x86_64-unknown-windows-msvc
       aarch64-unknown-windows-msvc
@@ -58,8 +58,10 @@ foreach(target ${LLVM_RUNTIME_TARGETS})
   set(RUNTIMES_${target}_COMPILER_RT_BUILD_LIBFUZZER NO CACHE BOOL "")
   set(RUNTIMES_${target}_COMPILER_RT_BUILD_ORC NO CACHE BOOL "")
   set(RUNTIMES_${target}_COMPILER_RT_BUILD_PROFILE YES CACHE BOOL "")
-  set(RUNTIMES_${target}_COMPILER_RT_BUILD_SANITIZERS NO CACHE BOOL "")
   set(RUNTIMES_${target}_COMPILER_RT_BUILD_XRAY NO CACHE BOOL "")
+  # Sanitizers will be configured, but not built. We have separate build
+  # steps for that, because we need a different shell for each target.
+  set(RUNTIMES_${target}_COMPILER_RT_BUILD_SANITIZERS NO CACHE BOOL "")
 endforeach()
 
 foreach(target ${LLVM_BUILTIN_TARGETS})

utils/build.ps1

@@ -66,6 +66,9 @@ If no such Windows SDK is installed, it will be downloaded from nuget.
 Include the ds2 remote debug server in the SDK.
 This component is currently only supported in Android builds.
 
+.PARAMETER IncludeSanitizers
+If set, include ASAN and UBSAN artifacts in the toolchain.
+
 .PARAMETER SkipBuild
 If set, does not run the build phase.
 
@@ -1764,6 +1767,21 @@ function Build-CURL([Platform]$Platform, $Arch) {
     })
 }
 
+function Build-Sanitizers([Platform]$Platform, $Arch, $InstallTo) {
+  Isolate-EnvVars {
+    # Use configured compilers
+    Build-CMakeProject `
+      -Src $SourceCache\llvm-project\runtimes `
+      -Bin "$(Get-HostProjectBinaryCache Compilers)\runtimes\runtimes-$($Arch.LLVMTarget)-bins" `
+      -InstallTo $InstallTo `
+      -Arch $Arch `
+      -Platform $Platform `
+      -Defines (@{
+        COMPILER_RT_BUILD_SANITIZERS = "YES"
+      })
+  }
+}
+
 function Build-Runtime([Platform]$Platform, $Arch) {
   $PlatformDefines = @{}
   if ($Platform -eq "Android") {
@@ -2756,6 +2774,11 @@ if (-not $SkipBuild) {
 
   Invoke-BuildStep Build-CMark $HostArch
   Invoke-BuildStep Build-Compilers $HostArch
+  if ($IncludeSanitizers) {
+    $InstallTo = "$($HostArch.ToolchainInstallRoot)\usr"
+    Invoke-BuildStep Build-Sanitizers Windows $ArchX64 $InstallTo
+    Invoke-BuildStep Build-Sanitizers Windows $ArchARM64 $InstallTo
+  }
 }
 
 if ($Clean) {