Merge pull request #74033 from etcwilde/ewilde/all-the-configs-are-a-mess

Use the toolchain clang consistently when building with ASAN enabled.

Author: etcwilde

test/ScanDependencies/error_path.swift

@@ -3,6 +3,9 @@
 // REQUIRES: objc_interop
 // RUN: %target-swift-frontend -scan-dependencies -module-cache-path %t/clang-module-cache %s -o %t/deps.json -I %S/Inputs/CHeaders -I %S/Inputs/Swift -emit-dependencies -emit-dependencies-path %t/deps.d -import-objc-header %S/Inputs/CHeaders/Bridging.h -swift-version 4 2>&1 | %FileCheck %s
 
+// There is a use-after-free in ScanDependencies rdar://131388478
+// XFAIL: asan
+
 import P
 
 // CHECK:      {{.*}}{{/|\\}}Z.swiftinterface:3:8: error: Unable to find module dependency: 'missing_module'

test/ScanDependencies/error_source_locations.swift

@@ -6,6 +6,10 @@
 import P
 import FooBar
 
+
+// There is a use-after-free in ScanDependencies rdar://131388478
+// XFAIL: asan
+
 // CHECK:      {{.*}}{{/|\\}}error_source_locations.swift:7:8: error: Unable to find module dependency: 'FooBar'
 // CHECK-NEXT: 5 |
 // CHECK-NEXT: 6 | import P

utils/build-script-impl

@@ -1666,7 +1666,7 @@ for host in "${ALL_HOSTS[@]}"; do
         CLANG_BIN="$(build_directory_bin ${LOCAL_HOST} llvm)"
     fi
 
-    if [[ -f "${CLANG_BIN}/clang" ]]; then
+    if [[ -f "${CLANG_BIN}/clang" ]] && [[ -z ${ENABLE_ASAN+x} ]]; then
       export SWIFT_DRIVER_CLANG_EXEC="${CLANG_BIN}/clang"
       export SWIFT_DRIVER_CLANGXX_EXEC="${CLANG_BIN}/clang++"
     fi
@@ -2744,7 +2744,7 @@ for host in "${ALL_HOSTS[@]}"; do
         CLANG_BIN="$(build_directory_bin ${LOCAL_HOST} llvm)"
     fi
 
-    if [[ -f "${CLANG_BIN}/clang" ]]; then
+    if [[ -f "${CLANG_BIN}/clang" ]] && [[ -z ${ENABLE_ASAN+x} ]]; then
       export SWIFT_DRIVER_CLANG_EXEC="${CLANG_BIN}/clang"
       export SWIFT_DRIVER_CLANGXX_EXEC="${CLANG_BIN}/clang++"
     fi
@@ -3039,7 +3039,7 @@ for host in "${ALL_HOSTS[@]}"; do
         CLANG_BIN="$(build_directory_bin ${LOCAL_HOST} llvm)"
     fi
 
-    if [[ -f "${CLANG_BIN}/clang" ]]; then
+    if [[ -f "${CLANG_BIN}/clang" ]] && [[ -z ${ENABLE_ASAN+x} ]]; then
       export SWIFT_DRIVER_CLANG_EXEC="${CLANG_BIN}/clang"
       export SWIFT_DRIVER_CLANGXX_EXEC="${CLANG_BIN}/clang++"
     fi