Adapt to LLVM 20 ASan library changes on Windows (CMake + linking)

Author: kinke

CMakeLists.txt

@@ -894,8 +894,15 @@ if (LDC_INSTALL_LLVM_RUNTIME_LIBS)
         if(CMAKE_SIZEOF_VOID_P EQUAL 4)
             set(compilerrt_arch_suffix "i386")
         endif()
-        copy_compilerrt_lib("clang_rt.asan-${compilerrt_arch_suffix}.lib"     "ldc_rt.asan.lib"     FALSE)
-        copy_compilerrt_lib("clang_rt.lsan-${compilerrt_arch_suffix}.lib"     "ldc_rt.lsan.lib"     FALSE)
+        if(LDC_LLVM_VER LESS 2000)
+            copy_compilerrt_lib("clang_rt.asan-${compilerrt_arch_suffix}.lib" "ldc_rt.asan.lib" FALSE)
+            copy_compilerrt_lib("clang_rt.lsan-${compilerrt_arch_suffix}.lib" "ldc_rt.lsan.lib" FALSE)
+        else()
+            copy_compilerrt_lib("clang_rt.asan_static_runtime_thunk-${compilerrt_arch_suffix}.lib"  "ldc_rt.asan_static_runtime_thunk.lib"                FALSE)
+            copy_compilerrt_lib("clang_rt.asan_dynamic_runtime_thunk-${compilerrt_arch_suffix}.lib" "ldc_rt.asan_dynamic_runtime_thunk.lib"               FALSE)
+            copy_compilerrt_lib("clang_rt.asan_dynamic-${compilerrt_arch_suffix}.lib"               "ldc_rt.asan.lib"                                     FALSE)
+            copy_compilerrt_lib("clang_rt.asan_dynamic-${compilerrt_arch_suffix}.dll"               "clang_rt.asan_dynamic-${compilerrt_arch_suffix}.dll" FALSE)
+        endif()
         copy_compilerrt_lib("clang_rt.builtins-${compilerrt_arch_suffix}.lib" "ldc_rt.builtins.lib" FALSE)
         copy_compilerrt_lib("clang_rt.profile-${compilerrt_arch_suffix}.lib"  "ldc_rt.profile.lib"  FALSE)
         copy_compilerrt_lib("clang_rt.fuzzer-${compilerrt_arch_suffix}.lib"   "ldc_rt.fuzzer.lib"   FALSE)

driver/linker-msvc.cpp

@@ -73,9 +73,18 @@ void addLibIfFound(std::vector<std::string> &args, const llvm::Twine &name) {
   }
 }
 
-void addSanitizerLibs(std::vector<std::string> &args) {
+void addSanitizerLibs(bool useInternalToolchain,
+                      std::vector<std::string> &args) {
   if (opts::isSanitizerEnabled(opts::AddressSanitizer)) {
     args.push_back("ldc_rt.asan.lib");
+#if LDC_LLVM_VER >= 2000 // extra library since LLVM 20
+    const bool linkStaticCRT =
+        getMscrtLibName(&useInternalToolchain).contains_lower("libcmt");
+    args.push_back((llvm::Twine("ldc_rt.asan_") +
+                    (linkStaticCRT ? "static" : "dynamic") +
+                    "_runtime_thunk.lib")
+                       .str());
+#endif
   } else if (opts::isSanitizerEnabled(opts::LeakSanitizer)) {
     // If ASan is enabled, it includes LSan. So only add LSan link flags if ASan is _not_ enabled already.
     args.push_back("ldc_rt.lsan.lib");
@@ -187,7 +196,7 @@ int linkObjToBinaryMSVC(llvm::StringRef outputPath,
 
   // LLVM compiler-rt libs
   addLibIfFound(args, "ldc_rt.builtins.lib");
-  addSanitizerLibs(args);
+  addSanitizerLibs(useInternalToolchain, args);
   if (opts::isInstrumentingForPGO()) {
     args.push_back("ldc_rt.profile.lib");
     // it depends on ws2_32 for symbol `gethostname`