diff --git a/sycl/include/sycl/accessor.hpp b/sycl/include/sycl/accessor.hpp index e8034f77c5e9a..b25674d074efc 100644 --- a/sycl/include/sycl/accessor.hpp +++ b/sycl/include/sycl/accessor.hpp @@ -2212,8 +2212,6 @@ class __SYCL_SPECIAL_CLASS local_accessor_base : const auto *this_const = this; (void)getSize(); (void)this_const->getSize(); - (void)getPtr(); - (void)this_const->getPtr(); #endif } diff --git a/sycl/source/accessor.cpp b/sycl/source/accessor.cpp index 418d9b6ea3dcc..ea3bebe8d90d9 100644 --- a/sycl/source/accessor.cpp +++ b/sycl/source/accessor.cpp @@ -56,10 +56,10 @@ AccessorBaseHost::AccessorBaseHost(id<3> Offset, range<3> AccessRange, bool IsSubBuffer, const property_list &PropertyList) { verifyAccessorProps(PropertyList); - impl = std::shared_ptr( - new AccessorImplHost(Offset, AccessRange, MemoryRange, AccessMode, - (detail::SYCLMemObjI *)SYCLMemObject, Dims, ElemSize, - false, OffsetInBytes, IsSubBuffer, PropertyList)); + impl = std::make_shared( + Offset, AccessRange, MemoryRange, AccessMode, + (detail::SYCLMemObjI *)SYCLMemObject, Dims, ElemSize, false, + OffsetInBytes, IsSubBuffer, PropertyList); } AccessorBaseHost::AccessorBaseHost(id<3> Offset, range<3> AccessRange, @@ -119,19 +119,14 @@ const sycl::range<3> &LocalAccessorBaseHost::getSize() const { return impl->MSize; } void *LocalAccessorBaseHost::getPtr() { - // Const cast this in order to call the const getPtr. - return const_cast(this)->getPtr(); + // Must not be/isn't called, user-facing APIs do error-checking. + std::abort(); + return nullptr; } void *LocalAccessorBaseHost::getPtr() const { - char *ptr = impl->MMem.data(); - - // Align the pointer to MElemSize. - size_t val = reinterpret_cast(ptr); - if (val % impl->MElemSize != 0) { - ptr += impl->MElemSize - val % impl->MElemSize; - } - - return ptr; + // Must not be/isn't called, user-facing APIs do error-checking. + std::abort(); + return nullptr; } const property_list &LocalAccessorBaseHost::getPropList() const { return impl->MPropertyList; diff --git a/sycl/source/detail/accessor_impl.hpp b/sycl/source/detail/accessor_impl.hpp index 377dca7cc90ee..643247549e414 100644 --- a/sycl/source/detail/accessor_impl.hpp +++ b/sycl/source/detail/accessor_impl.hpp @@ -134,13 +134,11 @@ class LocalAccessorImplHost { LocalAccessorImplHost(sycl::range<3> Size, int Dims, int ElemSize, const property_list &PropertyList) : MSize(Size), MDims(Dims), MElemSize(ElemSize), - MMem(Size[0] * Size[1] * Size[2] * ElemSize + ElemSize), MPropertyList(PropertyList) {} sycl::range<3> MSize; int MDims; int MElemSize; - std::vector MMem; property_list MPropertyList; };