diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 9633d6b3e25c4889201256bcf18483ecb622e737..2c036317a5d85e2cdc0358443879c211d9c7bccd 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -6573,6 +6573,7 @@ void visualstudio::Link::ConstructJob(Compilation &C, const JobAction &JA, if (getToolChain().getDriver().getOrParseSanitizerArgs(Args).needsAsanRt()) { CmdArgs.push_back(Args.MakeArgString("-debug")); + CmdArgs.push_back(Args.MakeArgString("-incremental:no")); SmallString<128> LibSanitizer(getToolChain().getDriver().ResourceDir); // FIXME: Handle 64-bit. Use asan_dll_thunk.dll when building a DLL. llvm::sys::path::append( diff --git a/clang/test/Driver/cl-link.c b/clang/test/Driver/cl-link.c index b6d14d6dff784d8bce7ca2bf520d937873790e7d..f6e18b8f1a6128062558b7378208d77d20efa733 100644 --- a/clang/test/Driver/cl-link.c +++ b/clang/test/Driver/cl-link.c @@ -14,5 +14,6 @@ // RUN: %clang_cl /Tc%s -### -fsanitize=address 2>&1 | FileCheck --check-prefix=ASAN %s // ASAN: link.exe // ASAN: "-debug" +// ASAN: "-incremental:no" // ASAN: "{{.*}}clang_rt.asan-i386.lib" // ASAN: "{{.*}}cl-link{{.*}}.obj"