[Clang][P1061] Remove unrelated code changes; Address style issues

Author: ricejasonf

clang/lib/AST/DeclCXX.cpp

@@ -3425,11 +3425,10 @@ VarDecl *BindingDecl::getHoldingVar() const {
   return VD;
 }
 
-
 void DecompositionDecl::VisitHoldingVars(
     llvm::function_ref<void(VarDecl *)> F) const {
-  VisitBindings([&](BindingDecl* BD) {
-    if (VarDecl* VD = BD->getHoldingVar())
+  VisitBindings([&](BindingDecl *BD) {
+    if (VarDecl *VD = BD->getHoldingVar())
       F(VD);
   });
 }

clang/lib/Parse/ParseDecl.cpp

@@ -7369,8 +7369,8 @@ void Parser::ParseDecompositionDeclarator(Declarator &D) {
     ConsumeToken();
 
     if (Tok.is(tok::ellipsis) && !PrevEllipsisLoc.isValid()) {
-      DiagnoseMisplacedEllipsis(Tok.getLocation(), Loc,
-                                EllipsisLoc.isValid(), true);
+      DiagnoseMisplacedEllipsis(Tok.getLocation(), Loc, EllipsisLoc.isValid(),
+                                true);
       EllipsisLoc = Tok.getLocation();
       ConsumeToken();
     }

clang/lib/Sema/SemaDeclCXX.cpp

@@ -959,14 +959,15 @@ Sema::ActOnDecompositionDeclarator(Scope *S, Declarator &D,
   return New;
 }
 
-namespace {
 // CheckBindingsCount
 //  - Checks the arity of the structured bindings
 //  - Creates the resolved pack expr if there is
 //    one
-bool CheckBindingsCount(Sema &S, DecompositionDecl *DD, QualType DecompType,
-                        ArrayRef<BindingDecl *> Bindings,
-                        unsigned MemberCount) {
+
+static bool CheckBindingsCount(Sema &S, DecompositionDecl *DD,
+                               QualType DecompType,
+                               ArrayRef<BindingDecl *> Bindings,
+                               unsigned MemberCount) {
   auto BindingWithPackItr =
       std::find_if(Bindings.begin(), Bindings.end(),
                    [](BindingDecl *D) -> bool { return D->isParameterPack(); });
@@ -1058,7 +1059,6 @@ struct BindingInitWalker {
     ++BindingItr;
   }
 };
-} // namespace
 
 static bool checkSimpleDecomposition(
     Sema &S, ArrayRef<BindingDecl *> Bindings, ValueDecl *Src,
@@ -1619,35 +1619,6 @@ static bool checkMemberDecomposition(Sema &S, ArrayRef<BindingDecl*> Bindings,
   return false;
 }
 
-unsigned Sema::GetDecompositionElementCount(QualType DecompType) {
-  assert(!DecompType->isDependentType() && "expecting non-dependent type");
-  SourceLocation Loc = SourceLocation(); // FIXME
-  DecompType = DecompType.getNonReferenceType();
-  if (auto *CAT = Context.getAsConstantArrayType(DecompType))
-    return CAT->getSize().getLimitedValue(UINT_MAX);
-  if (auto *VT = DecompType->getAs<VectorType>())
-    return VT->getNumElements();
-  if (auto *CT = DecompType->getAs<ComplexType>())
-    return 2;
-  llvm::APSInt TupleSize(32);
-  if (IsTupleLike TL = isTupleLike(*this, Loc, DecompType, TupleSize);
-      TL == IsTupleLike::TupleLike)
-    return (unsigned)TupleSize.getLimitedValue(UINT_MAX);
-
-  if (CXXRecordDecl *RD = DecompType->getAsCXXRecordDecl();
-      RD && !RD->isUnion()) {
-    CXXCastPath BasePath;
-    DeclAccessPair BasePair =
-        findDecomposableBaseClass(*this, Loc, RD, BasePath);
-    RD = cast_or_null<CXXRecordDecl>(BasePair.getDecl());
-    if (RD)
-      return llvm::count_if(
-          RD->fields(), [](FieldDecl *FD) { return !FD->isUnnamedBitField(); });
-  }
-
-  llvm_unreachable("unknown type for decomposition");
-}
-
 void Sema::CheckCompleteDecompositionDeclaration(DecompositionDecl *DD) {
   QualType DecompType = DD->getType();
 

clang/lib/Sema/SemaLambda.cpp

@@ -1526,7 +1526,6 @@ void Sema::ActOnStartOfLambdaDefinition(LambdaIntroducer &Intro,
     // - a member of a templated entity,
     // - an enumerator for an enumeration that is a templated entity, or
     // - the closure type of a lambda-expression ([expr.prim.lambda.closure])
-    // - an entity defined with an implicit template region
     // appearing in the declaration of a templated entity. [Note 6: A local
     // class, a local or block variable, or a friend function defined in a
     // templated entity is a templated entity.  — end note]

clang/lib/Sema/SemaStmt.cpp

@@ -755,7 +755,7 @@ bool Sema::checkMustTailAttr(const Stmt *St, const Attr &MTA) {
     return true;
   };
 
-  const auto *CallerDecl = getCurFunctionDecl();
+  const auto *CallerDecl = dyn_cast<FunctionDecl>(CurContext);
 
   // Find caller function signature.
   if (!CallerDecl) {
@@ -1010,7 +1010,8 @@ StmtResult Sema::ActOnIfStmt(SourceLocation IfLoc,
     bool Immediate = ExprEvalContexts.back().Context ==
                      ExpressionEvaluationContext::ImmediateFunctionContext;
     if (CurContext->isFunctionOrMethod()) {
-      const auto *FD = getCurFunctionDecl();
+      const auto *FD =
+          dyn_cast<FunctionDecl>(Decl::castFromDeclContext(CurContext));
       if (FD && FD->isImmediateFunction())
         Immediate = true;
     }
@@ -3918,7 +3919,7 @@ StmtResult Sema::BuildReturnStmt(SourceLocation ReturnLoc, Expr *RetValExp,
   // deduction.
   if (getLangOpts().CPlusPlus14) {
     if (AutoType *AT = FnRetType->getContainedAutoType()) {
-      FunctionDecl *FD = getCurFunctionDecl();
+      FunctionDecl *FD = cast<FunctionDecl>(CurContext);
       // If we've already decided this function is invalid, e.g. because
       // we saw a `return` whose expression had an error, don't keep
       // trying to deduce its return type.

clang/lib/Sema/SemaTemplate.cpp

@@ -928,10 +928,9 @@ static TemplateArgumentLoc translateTemplateArgument(Sema &SemaRef,
 
 void Sema::translateTemplateArguments(const ASTTemplateArgsPtr &TemplateArgsIn,
                                       TemplateArgumentListInfo &TemplateArgs) {
-  for (unsigned I = 0, Last = TemplateArgsIn.size(); I != Last; ++I) {
+  for (unsigned I = 0, Last = TemplateArgsIn.size(); I != Last; ++I)
     TemplateArgs.addArgument(
         translateTemplateArgument(*this, TemplateArgsIn[I]));
-  }
 }
 
 static void maybeDiagnoseTemplateParameterShadow(Sema &SemaRef, Scope *S,

clang/lib/Sema/SemaTemplateVariadic.cpp

@@ -19,7 +19,6 @@
 #include "clang/Sema/Sema.h"
 #include "clang/Sema/SemaInternal.h"
 #include "clang/Sema/Template.h"
-#include "llvm/ADT/ScopeExit.h"
 #include "llvm/Support/SaveAndRestore.h"
 #include <optional>
 
@@ -70,6 +69,7 @@ class CollectUnexpandedParameterPacksVisitor
       if (T->getDepth() < DepthLimit)
         Unexpanded.push_back({T, Loc});
     }
+
     void addUnexpanded(ResolvedUnexpandedPackExpr *E) {
       Unexpanded.push_back({E, E->getBeginLoc()});
     }
@@ -807,9 +807,8 @@ bool Sema::CheckParameterPacksForExpansion(
             CurrentInstantiationScope->findInstantiationOf(ND);
         if (Decl *B = Instantiation->dyn_cast<Decl *>()) {
           Expr *BindingExpr = cast<BindingDecl>(B)->getBinding();
-          if (auto *RP = dyn_cast<ResolvedUnexpandedPackExpr>(BindingExpr)) {
+          if (auto *RP = dyn_cast<ResolvedUnexpandedPackExpr>(BindingExpr))
             ResolvedPack = RP;
-          }
         }
         if (!ResolvedPack) {
           ShouldExpand = false;
@@ -1218,9 +1217,8 @@ ExprResult Sema::ActOnSizeofParameterPackExpr(Scope *S,
   MarkAnyDeclReferenced(OpLoc, ParameterPack, true);
 
   std::optional<unsigned> Length;
-  if (auto *RP = ResolvedUnexpandedPackExpr::getFromDecl(ParameterPack)) {
+  if (auto *RP = ResolvedUnexpandedPackExpr::getFromDecl(ParameterPack))
     Length = RP->getNumExprs();
-  }
 
   return SizeOfPackExpr::Create(Context, OpLoc, ParameterPack, NameLoc,
                                 RParenLoc, Length);
@@ -1494,10 +1492,8 @@ ExprResult Sema::ActOnCXXFoldExpr(Scope *S, SourceLocation LParenLoc, Expr *LHS,
     }
   }
 
-  ExprResult Result = BuildCXXFoldExpr(ULE, LParenLoc, LHS, Opc, EllipsisLoc,
-                                       RHS, RParenLoc, std::nullopt);
-
-  return Result;
+  return BuildCXXFoldExpr(ULE, LParenLoc, LHS, Opc, EllipsisLoc, RHS, RParenLoc,
+                          std::nullopt);
 }
 
 ExprResult Sema::BuildCXXFoldExpr(UnresolvedLookupExpr *Callee,