Simplify host_pipe attribute checking

Author: rho180

clang/lib/CodeGen/CodeGenModule.cpp

@@ -110,23 +110,6 @@ static bool SYCLCUDAIsSYCLDevice(const clang::LangOptions &LangOpts) {
   return LangOpts.SYCLIsDevice && LangOpts.CUDA && !LangOpts.CUDAIsDevice;
 }
 
-static bool isSyclType(QualType Ty, SYCLTypeAttr::SYCLType TypeName) {
-  const auto *RD = Ty->getAsCXXRecordDecl();
-  if (!RD)
-    return false;
-
-  if (const auto *Attr = RD->getAttr<SYCLTypeAttr>())
-    return Attr->getType() == TypeName;
-
-  if (const auto *CTSD = dyn_cast<ClassTemplateSpecializationDecl>(RD))
-    if (CXXRecordDecl *TemplateDecl =
-            CTSD->getSpecializedTemplate()->getTemplatedDecl())
-      if (const auto *Attr = TemplateDecl->getAttr<SYCLTypeAttr>())
-        return Attr->getType() == TypeName;
-
-  return false;
-}
-
 CodeGenModule::CodeGenModule(ASTContext &C,
                              IntrusiveRefCntPtr<llvm::vfs::FileSystem> FS,
                              const HeaderSearchOptions &HSO,
@@ -5525,20 +5508,22 @@ void CodeGenModule::EmitGlobalVarDefinition(const VarDecl *D,
 
   if (getLangOpts().SYCLIsDevice) {
     const RecordDecl *RD = D->getType()->getAsRecordDecl();
-    // Add IR attributes if add_ir_attribute_global_variable is attached to
-    // type.
-    if (RD && RD->hasAttr<SYCLAddIRAttributesGlobalVariableAttr>())
-      AddGlobalSYCLIRAttributes(GV, RD);
-    // If VarDecl has a type decorated with SYCL device_global attribute 
-    // emit IR attribute 'sycl-unique-id'.
-    if (RD && (RD->hasAttr<SYCLDeviceGlobalAttr>()))
-      addSYCLUniqueID(GV, D, Context);
-
-    // If VarDecl type is SYCLTypeAttr::host_pipe, emit the IR attribute 
-    // 'sycl-unique-id'.
-    auto Ty = D->getType();
-    if (isSyclType(Ty, SYCLTypeAttr::host_pipe))
-      addSYCLUniqueID(GV, D, Context);
+
+    if (RD) {
+      // Add IR attributes if add_ir_attribute_global_variable is attached to
+      // type.
+      if (RD->hasAttr<SYCLAddIRAttributesGlobalVariableAttr>())
+        AddGlobalSYCLIRAttributes(GV, RD);
+      // If VarDecl has a type decorated with SYCL device_global attribute 
+      // emit IR attribute 'sycl-unique-id'.
+      if (RD->hasAttr<SYCLDeviceGlobalAttr>())
+        addSYCLUniqueID(GV, D, Context);
+      // If VarDecl type is SYCLTypeAttr::host_pipe, emit the IR attribute 
+      // 'sycl-unique-id'.
+      if (const auto *Attr = RD->getAttr<SYCLTypeAttr>())
+        if (Attr->getType() == SYCLTypeAttr::SYCLType::host_pipe)
+          addSYCLUniqueID(GV, D, Context);
+    }
   }
 
   if (D->getType().isRestrictQualified()) {