Merge from 'sycl' to 'sycl-web'

Author: iclsrc

clang/include/clang/Sema/Sema.h

@@ -13655,7 +13655,7 @@ class Sema final {
                  bool IsMemberFunction, SourceLocation Loc, SourceRange Range,
                  VariadicCallType CallType);
 
-  void CheckSYCLKernelCall(FunctionDecl *CallerFunc, SourceRange CallLoc,
+  void CheckSYCLKernelCall(FunctionDecl *CallerFunc,
                            ArrayRef<const Expr *> Args);
 
   bool CheckObjCString(Expr *Arg);

clang/lib/Sema/SemaChecking.cpp

@@ -5971,7 +5971,7 @@ void Sema::checkCall(NamedDecl *FDecl, const FunctionProtoType *Proto,
     diagnoseArgDependentDiagnoseIfAttrs(FD, ThisArg, Args, Loc);
 
   if (FD && FD->hasAttr<SYCLKernelAttr>())
-    CheckSYCLKernelCall(FD, Range, Args);
+    CheckSYCLKernelCall(FD, Args);
 
   // Diagnose variadic calls in SYCL.
   if (FD && FD->isVariadic() && getLangOpts().SYCLIsDevice &&

clang/lib/Sema/SemaSYCL.cpp

@@ -3943,7 +3943,7 @@ class SYCLKernelNameTypeVisitor
   }
 };
 
-void Sema::CheckSYCLKernelCall(FunctionDecl *KernelFunc, SourceRange CallLoc,
+void Sema::CheckSYCLKernelCall(FunctionDecl *KernelFunc,
                                ArrayRef<const Expr *> Args) {
   QualType KernelNameType =
       calculateKernelNameType(getASTContext(), KernelFunc);

clang/test/Driver/sycl-link-add-targets.cpp

@@ -40,4 +40,13 @@
 #define DEVICE_EXTERN_C_INLINE DEVICE_EXTERN_C __attribute__((always_inline))
 #endif // __LIBDEVICE_HOST_IMPL__
 
+// Rounding mode are used internally by type convert functions in imf libdevice
+//  and we don't want to include system's fenv.h, so we define ourselves'.
+typedef enum {
+  __IML_RTE, // round to nearest-even
+  __IML_RTZ, // round to zero
+  __IML_RTP, // round to +inf
+  __IML_RTN, // round to -inf
+} __iml_rounding_mode;
+
 #endif // __LIBDEVICE_DEVICE_H__

clang/test/Driver/sycl-offload-aot.cpp

@@ -90,6 +90,7 @@ static inline TyFP __integral2FP_host(TyINT x, int rdMode) {
   fesetround(roundingOriginal);
   return res;
 }
+#pragma STDC FENV_ACCESS OFF
 #endif // __LIBDEVICE_HOST_IMPL__
 
 template <typename Ty> static inline Ty __imax(Ty x, Ty y) {