Fixed missing stuff

Signed-off-by: Dmitry Sidorov <dmitry.sidorov@intel.com>

Author: MrSidims

clang/include/clang/AST/Type.h

@@ -482,8 +482,8 @@ class Qualifiers {
            (A == LangAS::opencl_generic && B != LangAS::opencl_constant) ||
            // For USM extension we define usm_device and usm_host addres spaces,
            // which are a subset of __global.
-           (A == LangAS::opencl_global && (B == LangAS::opencl_usm_device ||
-                                           B == LangAS::opencl_usm_host)) ||
+           (A == LangAS::opencl_global &&
+            (B == LangAS::opencl_usm_device || B == LangAS::opencl_usm_host)) ||
            // Consider pointer size address spaces to be equivalent to default.
            ((isPtrSizeAddressSpace(A) || A == LangAS::Default) &&
             (isPtrSizeAddressSpace(B) || B == LangAS::Default));

clang/include/clang/Basic/AttrDocs.td

@@ -3556,18 +3556,6 @@ those that access host memory.
   }];
 }
 
-def OpenCLAddressSpaceGlobalHostDocs : Documentation {
-  let Category = DocOpenCLAddressSpaces;
-  let Heading = "[[clang::opencl_usm_host]]";
-  let Content = [{
-The usm_host address space attribute specifies that an object is allocated in
-global memory on host. It is supposed to be used only in SYCL headers and not in
-the actual OpenCL/SYCL user code. It helps distinguishing USM pointers that
-access host memory from those that access device memory and from accessors that
-access global memory.
-  }];
-}
-
 def OpenCLAddressSpaceLocalDocs : Documentation {
   let Category = DocOpenCLAddressSpaces;
   let Heading = "__local, local, [[clang::opencl_local]]";

clang/lib/Basic/Targets/NVPTX.h

@@ -29,15 +29,15 @@ static const unsigned NVPTXAddrSpaceMap[] = {
     4, // opencl_constant
     0, // opencl_private
     // FIXME: generic has to be added to the target
-    0,  // opencl_generic
-    1,  // opencl_usm_device
-    1,  // opencl_usm_host
-    1,  // cuda_device
-    4,  // cuda_constant
-    3,  // cuda_shared
-    0,  // ptr32_sptr
-    0,  // ptr32_uptr
-    0   // ptr64
+    0, // opencl_generic
+    1, // opencl_usm_device
+    1, // opencl_usm_host
+    1, // cuda_device
+    4, // cuda_constant
+    3, // cuda_shared
+    0, // ptr32_sptr
+    0, // ptr32_uptr
+    0  // ptr64
 };
 
 /// The DWARF address class. Taken from

clang/test/SemaSYCL/address-space-parameter-conversions.cpp

@@ -3,11 +3,11 @@
 void bar(int & Data) {}
 void bar2(int & Data) {}
 void bar(__attribute__((opencl_private)) int  & Data) {}
-void bar3(__attribute__((opencl_global)) int  & Data) {}
+void bar3(__attribute__((opencl_global)) int &Data) {}
 void foo(int * Data) {}
 void foo2(int * Data) {}
 void foo(__attribute__((opencl_private)) int * Data) {}
-void foo3(__attribute__((opencl_global)) int * Data) {}
+void foo3(__attribute__((opencl_global)) int *Data) {}
 
 template<typename T>
 void tmpl(T *t){}