Round three of addressing code review feedback from Erich Keane.

Changes include:
- Use `isTemplated()` instead of `isDependentContext()` since the latter doesn't
  necessarily handle templated friend functions.

Author: tahonermann

clang/lib/AST/ASTContext.cpp

@@ -14303,7 +14303,7 @@ static SYCLKernelInfo BuildSYCLKernelInfo(CanQualType KernelNameType,
 
 void ASTContext::registerSYCLEntryPointFunction(FunctionDecl *FD) {
   assert(!FD->isInvalidDecl());
-  assert(!FD->isDependentContext());
+  assert(!FD->isTemplated());
 
   const auto *SKEPAttr = FD->getAttr<SYCLKernelEntryPointAttr>();
   assert(SKEPAttr && "Missing sycl_kernel_entry_point attribute");

clang/lib/Sema/SemaDecl.cpp

@@ -12054,7 +12054,7 @@ bool Sema::CheckFunctionDeclaration(Scope *S, FunctionDecl *NewFD,
     OpenMP().ActOnFinishedFunctionDefinitionInOpenMPAssumeScope(NewFD);
 
   if (LangOpts.isSYCL() && NewFD->hasAttr<SYCLKernelEntryPointAttr>() &&
-      !NewFD->isInvalidDecl() && !NewFD->isDependentContext())
+      !NewFD->isInvalidDecl() && !NewFD->isTemplated())
     getASTContext().registerSYCLEntryPointFunction(NewFD);
 
   // Semantic checking for this function declaration (in isolation).

clang/lib/Serialization/ASTReaderDecl.cpp

@@ -1159,7 +1159,7 @@ void ASTDeclReader::VisitFunctionDecl(FunctionDecl *FD) {
   // If the declaration is a SYCL kernel entry point function as indicated by
   // the presence of a sycl_kernel_entry_point attribute, register it so that
   // associated metadata is recreated.
-  if (!FD->isInvalidDecl() && !FD->isDependentContext() &&
+  if (!FD->isInvalidDecl() && !FD->isTemplated() &&
       FD->hasAttr<SYCLKernelEntryPointAttr>()) {
     ASTContext &C = Reader.getContext();
     C.registerSYCLEntryPointFunction(FD);