[SYCL] Windows MS-Compatibility changes

Signed-off-by: Premanand M Rao <[email protected]>

Author: premanandrao

clang/lib/Driver/ToolChains/Clang.cpp

@@ -3562,6 +3562,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
       CmdArgs.push_back(IsMSVC ? "-std=c++14" : "-std=c++11");
     if (IsMSVC) {
       CmdArgs.push_back("-fms-extensions");
+      CmdArgs.push_back("-fms-compatibility");
+      CmdArgs.push_back("-fdelayed-template-parsing");
       VersionTuple MSVT = TC.computeMSVCVersion(&D, Args);
       if (!MSVT.empty())
         CmdArgs.push_back(Args.MakeArgString("-fms-compatibility-version=" +

clang/test/Preprocessor/sycl-macro.cpp

@@ -1,8 +1,11 @@
 // RUN: %clang_cc1 %s -E -dM | FileCheck %s
 // RUN: %clang_cc1 %s -fsycl-is-device -E -dM | FileCheck --check-prefix=CHECK-SYCL %s
 // RUN: %clang_cc1 %s -fsycl -E -dM | FileCheck --check-prefix=CHECK-ANY-SYCL %s
+// RUN: %clang_cc1 %s -fsycl-is-device -E -dM -fms-compatibility | FileCheck --check-prefix=CHECK-MSVC %s
 // CHECK-NOT:#define __SYCL_DEVICE_ONLY__ 1
 // CHECK-NOT:#define CL_SYCL_LANGUAGE_VERSION 121
 // CHECK-ANY-SYCL-NOT:#define __SYCL_DEVICE_ONLY__ 1
 // CHECK-ANY-SYCL:#define CL_SYCL_LANGUAGE_VERSION 121
 // CHECK-SYCL:#define CL_SYCL_LANGUAGE_VERSION 121
+// CHECK-MSVC-NOT: __GNUC__
+// CHECK-MSVC-NOT: __STDC__

clang/test/Preprocessor/sycl-macro2.cpp

@@ -0,0 +1,4 @@
+// RUN: %clang -c %s -fsycl -E -dM -o - | FileCheck --check-prefix=CHECK-MSVC %s
+// REQUIRES: system-windows
+// CHECK-MSVC-NOT: __GNUC__
+// CHECK-MSVC-NOT: __STDC__

clang/test/SemaSYCL/delayed-parsing.cpp

@@ -0,0 +1,21 @@
+// RUN: %clang_cc1 -std=c++1y -verify -fsyntax-only %s
+// RUN: %clang_cc1 -std=c++1y -verify -fsyntax-only %s -DDELAYED_TEMPLATE_PARSING -fdelayed-template-parsing
+// RUN: %clang %s -DDELAYED_TEMPLATE_PARSING -fsycl -c
+// REQUIRES: system-windows
+
+template<typename T> struct U {
+#ifndef DELAYED_TEMPLATE_PARSING
+  auto f(); // expected-note {{here}}
+  int g() { return f(); } // expected-error {{cannot be used before it is defined}}
+#else
+// expected-no-diagnostics
+  auto f();
+  int g() { return f(); }
+#endif
+};
+#ifndef DELAYED_TEMPLATE_PARSING
+  template int U<int>::g(); // expected-note {{in instantiation of}}
+#else
+  template int U<int>::g();
+#endif
+template<typename T> auto U<T>::f() { return T(); }

clang/test/SemaSYCL/delayed-parsing2.cpp

@@ -0,0 +1,4 @@
+// RUN: %clang %s -fsycl -c
+// REQUIRES: system-windows
+
+#include <windows.h>