Apply suggestions

Author: lbushi25

sycl/include/sycl/ext/oneapi/experimental/work_group_memory.hpp

@@ -26,14 +26,13 @@ class work_group_memory_impl {
   work_group_memory_impl(const work_group_memory_impl &rhs) = default;
   work_group_memory_impl &
   operator=(const work_group_memory_impl &rhs) = default;
-  work_group_memory_impl(size_t buffer_size)
-      : buffer_size{buffer_size} {}
-  private:
+  work_group_memory_impl(size_t buffer_size) : buffer_size{buffer_size} {}
+
+private:
   size_t buffer_size;
   friend class sycl::handler;
 };
 
-
 } // namespace detail
 namespace ext::oneapi::experimental {
 #ifdef __SYCL_DEVICE_ONLY__
@@ -57,8 +56,7 @@ class __SYCL_SPECIAL_CLASS __SYCL_TYPE(work_group_memory) work_group_memory
   template <typename T = DataT,
             typename = std::enable_if_t<!sycl::detail::is_unbounded_array_v<T>>>
   work_group_memory(handler &)
-      : sycl::detail::work_group_memory_impl(
-                                             sizeof(DataT)) {}
+      : sycl::detail::work_group_memory_impl(sizeof(DataT)) {}
   template <typename T = DataT,
             typename = std::enable_if_t<sycl::detail::is_unbounded_array_v<T>>>
   work_group_memory(size_t num, handler &)
@@ -71,7 +69,7 @@ class __SYCL_SPECIAL_CLASS __SYCL_TYPE(work_group_memory) work_group_memory
                                     IsDecorated, value_type>(ptr);
   }
   DataT *operator&() const { return reinterpret_cast<DataT *>(ptr); }
-  operator DataT &() const { return *(this->operator&()); }
+  operator DataT &() const { return *reinterpret_cast<DataT *>(ptr); }
   template <typename T = DataT,
             typename = std::enable_if_t<!std::is_array_v<T>>>
   const work_group_memory &operator=(const DataT &value) const {
@@ -83,15 +81,7 @@ class __SYCL_SPECIAL_CLASS __SYCL_TYPE(work_group_memory) work_group_memory
 #endif
 private:
   decoratedPtr ptr;
-  size_t bufferSize;
-  template <typename DataType>
-  friend size_t getWorkGroupMemorySize();
 };
-
-template <typename DataType>
-size_t getWorkGroupMemorySize() {
-    return work_group_memory<DataType, empty_properties_t>::bufferSize;
-}
 } // namespace ext::oneapi::experimental
 } // namespace _V1
 } // namespace sycl

sycl/include/sycl/handler.hpp

@@ -561,8 +561,7 @@ class __SYCL_EXPORT handler {
             make_error_code(errc::kernel_argument),
             "A work group memory object must not be used in a SYCL kernel "
             "function that is invoked via single_task or via the simple form "
-            "of "
-            "parallel_for that takes a range parameter.");
+            "of parallel_for that takes a range parameter.");
     }
   }
 
@@ -1950,8 +1949,9 @@ class __SYCL_EXPORT handler {
   void set_arg(
       int ArgIndex,
       ext::oneapi::experimental::work_group_memory<DataT, PropertyListT> &Arg) {
-    addArg(detail::kernel_param_kind_t::kind_work_group_memory, std::make_shared<std::remove_reference_t<decltype(Arg)>>(Arg).get(), 0,
-           ArgIndex);
+    addArg(detail::kernel_param_kind_t::kind_work_group_memory,
+           std::make_shared<std::remove_reference_t<decltype(Arg)>>(Arg).get(),
+           0, ArgIndex);
   }
 
   // set_arg for graph dynamic_parameters