Address feedback

Author: Alexander Batashev

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -11033,8 +11033,8 @@ def err_sycl_compiletime_property_duplication : Error<
 def err_sycl_invalid_property_list_param_number : Error<
   "%0 must have exactly one template parameter">;
 def err_sycl_invalid_accessor_property_template_param : Error<
-  "Sixth template parameter of the accessor must be of accessor_property_list "
-  "or property_list type">;
+  "sixth template parameter of the accessor must be of accessor_property_list "
+  "type">;
 def err_sycl_invalid_accessor_property_list_template_param : Error<
   "%select{accessor_property_list|accessor_property_list pack argument|buffer_location}0 "
   "template parameter must be a "

clang/lib/Sema/SemaSYCL.cpp

@@ -1256,16 +1256,18 @@ class SyclKernelFieldChecker : public SyclKernelFieldHandler {
            "Should only be called on SYCL accessor types.");
 
     RecordDecl *RecD = Ty->getAsRecordDecl();
-    if (auto *CTSD = dyn_cast<ClassTemplateSpecializationDecl>(RecD)) {
+    if (const ClassTemplateSpecializationDecl *CTSD =
+            dyn_cast<ClassTemplateSpecializationDecl>(RecD)) {
       const TemplateArgumentList &TAL = CTSD->getTemplateArgs();
 
       TemplateArgument TA = TAL.get(0);
       const QualType TemplateArgTy = TA.getAsType();
-      llvm::DenseSet<QualType> Visited;
-      checkSYCLType(SemaRef, TemplateArgTy, Loc, Visited);
 
       if (TAL.size() > 5)
         checkPropertyListType(TAL.get(5), Loc.getBegin());
+
+      llvm::DenseSet<QualType> Visited;
+      checkSYCLType(SemaRef, TemplateArgTy, Loc, Visited);
     }
   }
 

clang/test/SemaSYCL/buffer_location.cpp

@@ -84,7 +84,7 @@ int main() {
 #else
         //expected-error@+1{{buffer_location template parameter must be a non-negative integer}}
         accessorD.use();
-        //expected-error@+1{{Sixth template parameter of the accessor must be of accessor_property_list or property_list type}}
+        //expected-error@+1{{sixth template parameter of the accessor must be of accessor_property_list type}}
         accessorE.use();
         //expected-error@+1{{Can't apply buffer_location property twice to the same accessor}}
         accessorF.use();