[FOLD] address some review feedback

Author: sdkrystian

clang/lib/Sema/SemaConcept.cpp

@@ -1068,11 +1068,7 @@ bool Sema::FriendConstraintsDependOnEnclosingTemplate(const FunctionDecl *FD) {
   SmallVector<const Expr *, 3> ACs;
   FTD->getAssociatedConstraints(ACs);
 
-#if 0
-  unsigned OldTemplateDepth = CalculateTemplateDepthForConstraints(*this, FD);
-#else
   unsigned OldTemplateDepth = FTD->getTemplateParameters()->getDepth();
-#endif
   for (const Expr *Constraint : ACs)
     if (ConstraintExpressionDependsOnEnclosingTemplate(FD, OldTemplateDepth,
                                                        Constraint))

clang/lib/Sema/SemaTemplateDeductionGuide.cpp

@@ -317,8 +317,7 @@ struct ConvertConstructorToDeductionGuideTransform {
     }
 
     if (NestedPattern)
-      OuterInstantiationArgs = SemaRef.getTemplateInstantiationArgs(
-          /*D=*/nullptr, Template->getDeclContext());
+      OuterInstantiationArgs = SemaRef.getTemplateInstantiationArgs(Template);
   }
 
   Sema &SemaRef;
@@ -833,7 +832,6 @@ buildAssociatedConstraints(Sema &SemaRef, FunctionTemplateDecl *F,
                                            /*Innermost=*/InnerArgsForBuildingRC,
                                            /*RelativeToPrimary=*/true,
                                            /*ForConstraintInstantiation=*/true);
-  ;
   ArgsForBuildingRC.setKind(clang::TemplateSubstitutionKind::Rewrite);
 
   ExprResult E = SemaRef.SubstExpr(RC, ArgsForBuildingRC);

clang/lib/Sema/SemaTemplateInstantiate.cpp

@@ -1652,43 +1652,25 @@ namespace {
 
     ExprResult RebuildLambdaExpr(SourceLocation StartLoc, SourceLocation EndLoc,
                                  LambdaScopeInfo *LSI) {
-#if 1
       CXXMethodDecl *MD = LSI->CallOperator;
-      // if (MD->getParentFunctionOrMethod()) {
-      if (true) {
-#if 0
-        NamedDecl *Pattern = MD;
-          std::optional<ArrayRef<TemplateArgument>> Innermost;
-        if (FunctionTemplateDecl *FTD = MD->getDescribedFunctionTemplate()) {
-          Pattern = FTD;
-          Innermost = FTD->getInjectedTemplateArgs();
-        }
-        MultiLevelTemplateArgumentList MLTAL =
-            SemaRef.getTemplateInstantiationArgs(Pattern, Pattern->getLexicalDeclContext(),
-                                                 /*Final=*/false, Innermost,
-                                                 /*RelativeToPrimary=*/true);
-#endif
-        ;
-        for (ParmVarDecl *PVD : MD->parameters()) {
-          assert(PVD && "null in a parameter list");
-          if (!PVD->hasDefaultArg())
-            continue;
-          Expr *UninstExpr = PVD->getUninstantiatedDefaultArg();
-          // FIXME: Obtain the source location for the '=' token.
-          SourceLocation EqualLoc = UninstExpr->getBeginLoc();
-          if (SemaRef.SubstDefaultArgument(EqualLoc, PVD, TemplateArgs)) {
-            // If substitution fails, the default argument is set to a
-            // RecoveryExpr that wraps the uninstantiated default argument so
-            // that downstream diagnostics are omitted.
-            ExprResult ErrorResult = SemaRef.CreateRecoveryExpr(
-                UninstExpr->getBeginLoc(), UninstExpr->getEndLoc(),
-                {UninstExpr}, UninstExpr->getType());
-            if (ErrorResult.isUsable())
-              PVD->setDefaultArg(ErrorResult.get());
-          }
+      for (ParmVarDecl *PVD : MD->parameters()) {
+        assert(PVD && "null in a parameter list");
+        if (!PVD->hasDefaultArg())
+          continue;
+        Expr *UninstExpr = PVD->getUninstantiatedDefaultArg();
+        // FIXME: Obtain the source location for the '=' token.
+        SourceLocation EqualLoc = UninstExpr->getBeginLoc();
+        if (SemaRef.SubstDefaultArgument(EqualLoc, PVD, TemplateArgs)) {
+          // If substitution fails, the default argument is set to a
+          // RecoveryExpr that wraps the uninstantiated default argument so
+          // that downstream diagnostics are omitted.
+          ExprResult ErrorResult = SemaRef.CreateRecoveryExpr(
+              UninstExpr->getBeginLoc(), UninstExpr->getEndLoc(), {UninstExpr},
+              UninstExpr->getType());
+          if (ErrorResult.isUsable())
+            PVD->setDefaultArg(ErrorResult.get());
         }
       }
-#endif
       return inherited::RebuildLambdaExpr(StartLoc, EndLoc, LSI);
     }