[SYCL] Fix template argument propagation in AccessorSubscript (#6669)

steffenlarsen · web-flow · commit 22e3fc56c8c2 · 2022-09-02T18:27:20.000+01:00
Fixes an issue where partial subscripts would fail to compile due to template errors.

Signed-off-by: Larsen, Steffen &lt;steffen.larsen@intel.com&gt;
diff --git a/sycl/include/sycl/accessor.hpp b/sycl/include/sycl/accessor.hpp
@@ -326,11 +326,11 @@ class accessor_common {
       MIDs[0] = Index;
     }
 
-    template <int CurDims = SubDims>
-    typename detail::enable_if_t<(CurDims > 1), AccessorSubscript<CurDims - 1>>
-    operator[](size_t Index) {
+    template <int CurDims = SubDims,
+              typename = detail::enable_if_t<(CurDims > 1)>>
+    auto operator[](size_t Index) {
       MIDs[Dims - CurDims] = Index;
-      return AccessorSubscript<CurDims - 1>(MAccessor, MIDs);
+      return AccessorSubscript<CurDims - 1, AccType>(MAccessor, MIDs);
     }
 
     template <int CurDims = SubDims,

Original file line number	Diff line number	Diff line change
`@@ -326,11 +326,11 @@ class accessor_common {`
`326`	`326`	`MIDs[0] = Index;`
`327`	`327`	`}`
`328`	`328`
`329`		`- template <int CurDims = SubDims>`
`330`		`- typename detail::enable_if_t<(CurDims > 1), AccessorSubscript<CurDims - 1>>`
`331`		`- operator[](size_t Index) {`
	`329`	`+ template <int CurDims = SubDims,`
	`330`	`+ typename = detail::enable_if_t<(CurDims > 1)>>`
	`331`	`+ auto operator[](size_t Index) {`
`332`	`332`	`MIDs[Dims - CurDims] = Index;`
`333`		`- return AccessorSubscript<CurDims - 1>(MAccessor, MIDs);`
	`333`	`+ return AccessorSubscript<CurDims - 1, AccType>(MAccessor, MIDs);`
`334`	`334`	`}`
`335`	`335`
`336`	`336`	`template <int CurDims = SubDims,`