diff --git a/llvm/utils/gn/build/BUILD.gn b/llvm/utils/gn/build/BUILD.gn
index 5e7131cd0ded..23200402905b 100644
--- a/llvm/utils/gn/build/BUILD.gn
+++ b/llvm/utils/gn/build/BUILD.gn
@@ -117,7 +117,7 @@ config("compiler_defaults") {
       ldflags += [ "-Wl,--color-diagnostics" ]
     }
     cflags_cc += [
-      "-std=c++14",
+      "-std=c++17",
       "-fvisibility-inlines-hidden",
     ]
   } else {
@@ -160,7 +160,10 @@ config("compiler_defaults") {
       "_UNICODE",
       "UNICODE",
     ]
-    cflags += [ "/EHs-c-" ]
+    cflags += [
+      "/std:c++17",
+      "/EHs-c-",
+    ]
 
     # The MSVC default value (1 MB) is not enough for parsing recursive C++
     # templates in Clang.