Formatting and remove warnings

Author: lbushi25

clang/lib/Sema/SemaSYCL.cpp

@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 // This implements Semantic Analysis for SYCL constructs.
 //===----------------------------------------------------------------------===//
-#include <iostream>
+
 #include "clang/Sema/SemaSYCL.h"
 #include "TreeTransform.h"
 #include "clang/AST/AST.h"
@@ -6739,15 +6739,13 @@ void SYCLIntegrationHeader::emit(raw_ostream &O) {
       else
         ParmList += ", ";
       ParmList += Param->getType().getCanonicalType().getAsString(Policy);
-      Param->getType()->dump(); 
     }
     FunctionTemplateDecl *FTD = K.SyclKernel->getPrimaryTemplate();
     Policy.PrintCanonicalTypes = true;
     Policy.SuppressDefinition = true;
     Policy.PolishForDeclaration = true;
     Policy.FullyQualifiedName = true;
-    Policy.EnforceScopeForElaboratedTypes = true;
-    
+    Policy.EnforceScopeForElaboratedTypes = true; 
     // Now we need to print the declaration of the kernel itself.
     // Example:
     // template <typename T, typename = int> struct Arg {

clang/test/CodeGenSYCL/Inputs/sycl.hpp

@@ -34,8 +34,9 @@ struct sampler_impl {
 class __attribute__((sycl_special_class)) __SYCL_TYPE(sampler) sampler {
   struct sampler_impl impl;
 #ifdef __SYCL_DEVICE_ONLY__
-  sampler() = default;
   void __init(__ocl_sampler_t Sampler) { impl.m_Sampler = Sampler; }
+public:
+  sampler() = default;
 #endif
 
 public:
@@ -329,7 +330,7 @@ class __attribute__((sycl_special_class)) __SYCL_TYPE(accessor) accessor {
 
 public:
 #ifdef __SYCL_DEVICE_ONLY__               
-accessor() = default;
+  accessor() = default;
 #endif
   void use(void) const {}
   template <typename... T>
@@ -494,19 +495,21 @@ int printf(const __SYCL_CONSTANT_AS char *__format, Args... args) {
 template <typename T, typename... Props>
 class __attribute__((sycl_special_class)) __SYCL_TYPE(annotated_arg) annotated_arg {
   T obj;
-  #ifdef __SYCL_DEVICE_ONLY__
-    annotated_arg() = default;
+#ifdef __SYCL_DEVICE_ONLY__
     void __init(T _obj) {}
-  #endif
+public:
+    annotated_arg() = default;
+#endif
 };
 
 template <typename T, typename... Props>
 class __attribute__((sycl_special_class)) __SYCL_TYPE(annotated_ptr) annotated_ptr {
   T* obj;
-  #ifdef __SYCL_DEVICE_ONLY__
-    annotated_ptr() = default;
+#ifdef __SYCL_DEVICE_ONLY__
     void __init(T* _obj) {}
-  #endif
+public:
+    annotated_ptr() = default;
+#endif
 };
 
 } // namespace experimental

sycl/include/sycl/handler.hpp

@@ -520,7 +520,7 @@ class __SYCL_EXPORT handler {
 
   /// Saves the location of user's code passed in \p CodeLoc for future usage in
   /// finalize() method.
-  /// TODO: remove the first version of this func (the one without the IsTopCodeLoc arg)  
+  /// TODO: remove the first version of this func (the one without the IsTopCodeLoc arg)
   ///   at the next ABI breaking window since removing it breaks ABI on windows.
   void saveCodeLoc(detail::code_location CodeLoc);
   void saveCodeLoc(detail::code_location CodeLoc, bool IsTopCodeLoc);