[Clang][P1061] Simplify unwrapping ResolvedPacks; other style fixes

Author: ricejasonf

clang/lib/Sema/SemaTemplate.cpp

@@ -928,9 +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)
-    TemplateArgs.addArgument(
-        translateTemplateArgument(*this, TemplateArgsIn[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

@@ -797,14 +797,12 @@ bool Sema::CheckParameterPacksForExpansion(
       if (isa<VarDecl>(ND))
         IsVarDeclPack = true;
       else if (isa<BindingDecl>(ND)) {
-        // find the instantiated BindingDecl and check it for a resolved pack
+        // Find the instantiated BindingDecl and check it for a resolved pack.
         llvm::PointerUnion<Decl *, DeclArgumentPack *> *Instantiation =
             CurrentInstantiationScope->findInstantiationOf(ND);
-        if (Decl *B = Instantiation->dyn_cast<Decl *>()) {
-          Expr *BindingExpr = cast<BindingDecl>(B)->getBinding();
-          if (auto *RP = dyn_cast<ResolvedUnexpandedPackExpr>(BindingExpr))
-            ResolvedPack = RP;
-        }
+        Decl *B = cast<Decl *>(*Instantiation);
+        Expr *BindingExpr = cast<BindingDecl>(B)->getBinding();
+        ResolvedPack = dyn_cast<ResolvedUnexpandedPackExpr>(BindingExpr);
         if (!ResolvedPack) {
           ShouldExpand = false;
           continue;