1 files changed, 0 insertions, 15 deletions
diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
index 2e76dc1a584..25d0db80398 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -552,18 +552,6 @@ void Sema::InstantiateAttrs(const MultiLevelTemplateArgumentList &TemplateArgs,
       continue;
     }
 
-    if (auto *A = dyn_cast<PointerAttr>(TmplAttr)) {
-      if (!New->hasAttr<PointerAttr>())
-        New->addAttr(A->clone(Context));
-      continue;
-    }
-
-    if (auto *A = dyn_cast<OwnerAttr>(TmplAttr)) {
-      if (!New->hasAttr<OwnerAttr>())
-        New->addAttr(A->clone(Context));
-      continue;
-    }
-
     assert(!TmplAttr->isPackExpansion());
     if (TmplAttr->isLateParsed() && LateAttrs) {
       // Late parsed attributes must be instantiated and attached after the
@@ -723,9 +711,6 @@ Decl *TemplateDeclInstantiator::InstantiateTypedefNameDecl(TypedefNameDecl *D,
 
   SemaRef.InstantiateAttrs(TemplateArgs, D, Typedef);
 
-  if (D->getUnderlyingType()->getAs<DependentNameType>())
-    SemaRef.inferGslPointerAttribute(Typedef);
-
   Typedef->setAccess(D->getAccess());
 
   return Typedef;