[llvm-branch-commits] [clang] 0024f66 - [clang-cl] Bump default -fms-compatibility-version to 19.20

[Muhammad Omair Javaid via llvm-branch-commits]

Author: Muhammad Omair Javaid
Date: 2022-02-11T09:23:05+05:00
New Revision: 0024f665446068af7dc24162f432c89f4e91b2a7

URL: https://github.com/llvm/llvm-project/commit/0024f665446068af7dc24162f432c89f4e91b2a7
DIFF: https://github.com/llvm/llvm-project/commit/0024f665446068af7dc24162f432c89f4e91b2a7.diff

LOG: [clang-cl] Bump default -fms-compatibility-version to 19.20

clang-cl MSVC required version is 19.20 now. Update the default
-fms-compatibility-version to 19.20.

Differential Revision: https://reviews.llvm.org/D114639

Added: 
    

Modified: 
    clang/lib/Driver/ToolChains/MSVC.cpp
    clang/test/Driver/cl-options.c

Removed: 
    


################################################################################
diff  --git a/clang/lib/Driver/ToolChains/MSVC.cpp b/clang/lib/Driver/ToolChains/MSVC.cpp
index 18cef288f018a..9f4751167ac12 100644
--- a/clang/lib/Driver/ToolChains/MSVC.cpp
+++ b/clang/lib/Driver/ToolChains/MSVC.cpp
@@ -1393,8 +1393,8 @@ VersionTuple MSVCToolChain::computeMSVCVersion(const Driver *D,
   if (MSVT.empty() &&
       Args.hasFlag(options::OPT_fms_extensions, options::OPT_fno_ms_extensions,
                    IsWindowsMSVC)) {
-    // -fms-compatibility-version=19.14 is default, aka 2017, 15.7
-    MSVT = VersionTuple(19, 14);
+    // -fms-compatibility-version=19.20 is default, aka 2019, 16.x
+    MSVT = VersionTuple(19, 20);
   }
   return MSVT;
 }

diff  --git a/clang/test/Driver/cl-options.c b/clang/test/Driver/cl-options.c
index 733e733de738e..8d240e6e6e5c6 100644
--- a/clang/test/Driver/cl-options.c
+++ b/clang/test/Driver/cl-options.c
@@ -757,7 +757,7 @@
 
 // Validate that the default triple is used when run an empty tools dir is specified
 // RUN: %clang_cl -vctoolsdir "" -### -- %s 2>&1 | FileCheck %s --check-prefix VCTOOLSDIR
-// VCTOOLSDIR: "-triple" "{{[a-zA-Z0-9_-]*}}-pc-windows-msvc19.14.0"
+// VCTOOLSDIR: "-triple" "{{[a-zA-Z0-9_-]*}}-pc-windows-msvc19.20.0"
 
 // Validate that built-in include paths are based on the supplied path
 // RUN: %clang_cl --target=aarch64-pc-windows-msvc -vctoolsdir "/fake" -winsdkdir "/foo" -winsdkversion 10.0.12345.0 -### -- %s 2>&1 | FileCheck %s --check-prefix FAKEDIR