[Clang][P1061] Remove vestigial changes

Author: ricejasonf

clang/lib/Sema/SemaDecl.cpp

@@ -9780,7 +9780,6 @@ Sema::ActOnFunctionDeclarator(Scope *S, Declarator &D, DeclContext *DC,
   QualType R = TInfo->getType();
 
   assert(R->isFunctionType());
-
   if (R.getCanonicalType()->castAs<FunctionType>()->getCmseNSCallAttr())
     Diag(D.getIdentifierLoc(), diag::err_function_decl_cmse_ns_call);
 

clang/lib/Sema/SemaTemplateInstantiate.cpp

@@ -805,6 +805,7 @@ Sema::InstantiatingTemplate::InstantiatingTemplate(
           SemaRef, CodeSynthesisContext::BuildingDeductionGuides,
           PointOfInstantiation, InstantiationRange, Entity) {}
 
+
 void Sema::pushCodeSynthesisContext(CodeSynthesisContext Ctx) {
   Ctx.SavedInNonInstantiationSFINAEContext = InNonInstantiationSFINAEContext;
   InNonInstantiationSFINAEContext = false;

clang/lib/Sema/SemaTemplateVariadic.cpp

@@ -50,15 +50,14 @@ class CollectUnexpandedParameterPacksVisitor
         auto *FTD = FD ? FD->getDescribedFunctionTemplate() : nullptr;
         if (FTD && FTD->getTemplateParameters()->getDepth() >= DepthLimit)
           return;
-      } else if (ND->isTemplateParameterPack() &&
-                 getDepthAndIndex(ND).first >= DepthLimit) {
-        return;
       } else if (auto *BD = dyn_cast<BindingDecl>(ND)) {
         Expr *E = BD->getBinding();
         if (auto *RP = dyn_cast_if_present<ResolvedUnexpandedPackExpr>(E)) {
           addUnexpanded(RP);
           return;
         }
+      } else if (getDepthAndIndex(ND).first >= DepthLimit) {
+        return;
       }
 
       Unexpanded.push_back({ND, Loc});
@@ -229,10 +228,6 @@ class CollectUnexpandedParameterPacksVisitor
     bool TraversePackIndexingTypeLoc(PackIndexingTypeLoc TL) override {
       return DynamicRecursiveASTVisitor::TraverseStmt(TL.getIndexExpr());
     }
-    bool
-    TraverseResolvedUnexpandedPackExpr(ResolvedUnexpandedPackExpr *E) override {
-      return true;
-    }
 
     ///@}