Fix cp constructor after merge

Add AttrDocs for DeviceConstant

Signed-off-by: JackAKirk <[email protected]>

Author: JackAKirk

clang/include/clang/Basic/Attr.td

@@ -1830,7 +1830,7 @@ def SYCLDeviceConstant: InheritableAttr {
   let Subjects = SubjectList<[CXXRecord], ErrorDiag>;
   let LangOpts = [SYCLIsDevice, SilentlyIgnoreSYCLIsHost];
   // Only used internally by SYCL implementation
-  let Documentation = [Undocumented];
+  let Documentation = [SYCLDeviceConstantAttrDocs];
   let SimpleHandler = 1;
 }
 

clang/include/clang/Basic/AttrDocs.td

@@ -3579,6 +3579,26 @@ so we have this attribute in sycl_detail namespace.
   }];
 }
 
+def SYCLDeviceConstantAttrDocs : Documentation {
+  let Category = DocCatType;
+  let Heading = "__sycl_detail__::device_constant";
+  let Content = [{
+This attribute is part of support for SYCL device_global feature.
+[[__sycl_detail__::device_constant]] attribute is used for marking that a
+device_global should use the device constant address space (if available).
+We do not intend to support this as a general attribute that user code can use,
+so we have this attribute in sycl_detail namespace.
+
+.. code-block:: c++
+
+  template<typename T>
+  struct [[__sycl_detail__::device_global,
+         __sycl_detail__::device_constant]] device_global {}
+
+  device_global<int> Foo;
+  }];
+}
+
 def SYCLGlobalVariableAllowedAttrDocs : Documentation {
   let Category = DocCatType;
   let Heading = "__sycl_detail__::global_variable_allowed";

sycl/include/sycl/ext/oneapi/device_global/device_global.hpp

@@ -205,11 +205,12 @@ class
                 "Property list is invalid.");
 };
 
+// Inherit the base class' constructors
 #define DEVICE_GLOBAL_COMMON_METHODS()                                         \
-  using detail::device_global_base<                                            \
-      T, detail::properties_t<Props...>>::device_global_base;                  \
+  using detail::device_global_base<T, property_list_t>::device_global_base;    \
                                                                                \
-  device_global(const device_global &) = delete;                               \
+  constexpr device_global(const device_global &DG)                             \
+      : base_t(static_cast<const base_t &>(DG)) {}                             \
   device_global(const device_global &&) = delete;                              \
   device_global &operator=(const device_global &) = delete;                    \
   device_global &operator=(const device_global &&) = delete;                   \