Merge pull request #78750 from AnthonyLatsis/oryza-sativa

[Gardening] Fix some set but not used variables

Author: AnthonyLatsis

lib/AST/ASTDemangler.cpp

@@ -155,7 +155,7 @@ Type ASTBuilder::createNominalType(GenericTypeDecl *decl, Type parent) {
     return Type();
 
   // If the declaration is generic, fail.
-  if (auto list = nominalDecl->getGenericParams())
+  if (nominalDecl->isGeneric())
     return Type();
 
   // Imported types can be renamed to be members of other (non-generic)

lib/AST/ASTDumper.cpp

@@ -5692,7 +5692,7 @@ namespace {
       } else if (auto *VD = originator.dyn_cast<VarDecl *>()) {
         printFieldQuotedRaw([&](raw_ostream &OS) { VD->dumpRef(OS); },
                             Label::optional("originating_var"), DeclColor);
-      } else if (auto *EE = originator.dyn_cast<ErrorExpr *>()) {
+      } else if (originator.is<ErrorExpr *>()) {
         printFlag("error_expr");
       } else if (auto *DMT = originator.dyn_cast<DependentMemberType *>()) {
         printRec(DMT, Label::always("dependent_member_type"));

lib/AST/ASTMangler.cpp

@@ -3056,7 +3056,7 @@ void ASTMangler::appendAnyGenericType(const GenericTypeDecl *decl,
       appendIdentifier(interface->getObjCRuntimeNameAsString());
     } else if (UseObjCRuntimeNames && protocol) {
       appendIdentifier(protocol->getObjCRuntimeNameAsString());
-    } else if (auto ctsd = dyn_cast<clang::ClassTemplateSpecializationDecl>(namedDecl)) {
+    } else if (isa<clang::ClassTemplateSpecializationDecl>(namedDecl)) {
       // If this is a `ClassTemplateSpecializationDecl`, it was
       // imported as a Swift decl with `__CxxTemplateInst...` name.
       // `ClassTemplateSpecializationDecl`'s name does not include information about
@@ -3253,7 +3253,7 @@ void ASTMangler::appendFunctionSignature(AnyFunctionType *fn,
       appendOperator("YK");
     }
   }
-  switch (auto diffKind = fn->getDifferentiabilityKind()) {
+  switch (fn->getDifferentiabilityKind()) {
   case DifferentiabilityKind::NonDifferentiable:
     break;
   case DifferentiabilityKind::Forward:
@@ -4164,11 +4164,11 @@ void ASTMangler::appendAccessorEntity(StringRef accessorKindCode,
 
   BaseEntitySignature base(decl);
   appendContextOf(decl, base);
-  if (auto *varDecl = dyn_cast<VarDecl>(decl)) {
+  if (isa<VarDecl>(decl)) {
     appendDeclName(decl);
     appendDeclType(decl, base);
     appendOperator("v", accessorKindCode);
-  } else if (auto *subscriptDecl = dyn_cast<SubscriptDecl>(decl)) {
+  } else if (isa<SubscriptDecl>(decl)) {
     appendDeclType(decl, base);
 
     StringRef privateDiscriminator = getPrivateDiscriminatorIfNecessary(decl);
@@ -4963,7 +4963,7 @@ getPrecheckedLocalContextDiscriminator(const Decl *decl, Identifier name) {
 std::string ASTMangler::mangleAttachedMacroExpansion(
     const Decl *decl, CustomAttr *attr, MacroRole role) {
   if (auto abiDecl = getABIDecl(decl)) {
-    return mangleAttachedMacroExpansion(decl, attr, role);
+    return mangleAttachedMacroExpansion(abiDecl, attr, role);
   }
 
   // FIXME(kavon): using the decl causes a cycle. Is a null base fine?

lib/AST/ASTNode.cpp

@@ -79,11 +79,11 @@ bool ASTNode::isImplicit() const {
     return D->isImplicit();
   if (const auto *P = this->dyn_cast<Pattern*>())
     return P->isImplicit();
-  if (const auto *T = this->dyn_cast<TypeRepr*>())
+  if (this->is<TypeRepr *>())
     return false;
-  if (const auto *C = this->dyn_cast<StmtConditionElement *>())
+  if (this->is<StmtConditionElement *>())
     return false;
-  if (const auto *I = this->dyn_cast<CaseLabelItem *>())
+  if (this->is<CaseLabelItem *>())
     return false;
   llvm_unreachable("unsupported AST node");
 }
@@ -124,9 +124,9 @@ void ASTNode::dump(raw_ostream &OS, unsigned Indent) const {
     P->dump(OS, Indent);
   else if (auto T = dyn_cast<TypeRepr*>())
     T->print(OS);
-  else if (auto *C = dyn_cast<StmtConditionElement *>())
+  else if (is<StmtConditionElement *>())
     OS.indent(Indent) << "(statement condition)";
-  else if (auto *I = dyn_cast<CaseLabelItem *>()) {
+  else if (is<CaseLabelItem *>()) {
     OS.indent(Indent) << "(case label item)";
   } else
     llvm_unreachable("unsupported AST node");

lib/AST/ASTPrinter.cpp

@@ -151,7 +151,7 @@ static bool isPrespecilizationDeclWithTarget(const ValueDecl *vd) {
   for (auto *attr : vd->getAttrs().getAttributes<SpecializeAttr>()) {
     if (!attr->isExported())
       continue;
-    if (auto *targetFun = attr->getTargetFunctionDecl(vd))
+    if (attr->getTargetFunctionDecl(vd))
       return true;
   }
   return false;
@@ -4136,7 +4136,7 @@ void PrintAST::visitAccessorDecl(AccessorDecl *decl) {
   // Explicitly print 'mutating' and 'nonmutating' if needed.
   printSelfAccessKindModifiersIfNeeded(decl);
 
-  switch (auto kind = decl->getAccessorKind()) {
+  switch (decl->getAccessorKind()) {
   case AccessorKind::Get:
   case AccessorKind::DistributedGet:
   case AccessorKind::Address:
@@ -4773,13 +4773,13 @@ void PrintAST::visitErrorExpr(ErrorExpr *expr) {
 
 void PrintAST::visitTernaryExpr(TernaryExpr *expr) {
   if (auto condExpr = expr->getCondExpr()) {
-    visit(expr->getCondExpr());
+    visit(condExpr);
   }
   Printer << " ? ";
   visit(expr->getThenExpr());
   Printer << " : ";
   if (auto elseExpr = expr->getElseExpr()) {
-    visit(expr->getElseExpr());
+    visit(elseExpr);
   }
 }
 
@@ -6060,7 +6060,7 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
       } else if (auto *VD = originator.dyn_cast<VarDecl *>()) {
         Printer << "decl = ";
         Printer << VD->getName();
-      } else if (auto *EE = originator.dyn_cast<ErrorExpr *>()) {
+      } else if (originator.is<ErrorExpr *>()) {
         Printer << "error_expr";
       } else if (auto *DMT = originator.dyn_cast<DependentMemberType *>()) {
         visit(DMT);

lib/AST/ASTVerifier.cpp

@@ -1102,7 +1102,7 @@ class Verifier : public ASTWalker {
         resultType = FD->mapTypeIntoContext(resultType);
       } else if (auto closure = dyn_cast<AbstractClosureExpr>(func)) {
         resultType = closure->getResultType();
-      } else if (auto *CD = dyn_cast<ConstructorDecl>(func)) {
+      } else if (isa<ConstructorDecl>(func)) {
         resultType = TupleType::getEmpty(Ctx);
       } else {
         resultType = TupleType::getEmpty(Ctx);

lib/AST/ASTWalker.cpp

@@ -1281,7 +1281,7 @@ class Traversal : public ASTVisitor<Traversal, Expr*, Stmt*,
 
     for (auto &origComponent : components) {
       auto component = origComponent;
-      switch (auto kind = component.getKind()) {
+      switch (component.getKind()) {
       case KeyPathExpr::Component::Kind::Subscript:
       case KeyPathExpr::Component::Kind::UnresolvedSubscript: {
         if (auto *newArgs = doIt(component.getSubscriptArgs())) {

lib/AST/Attr.cpp

@@ -267,7 +267,7 @@ void OpenedTypeAttr::printImpl(ASTPrinter &printer,
   printer << "(\"" << getUUID() << "\"";
   if (auto constraintType = getConstraintType()) {
     printer << ", ";
-    getConstraintType()->print(printer, options);
+    constraintType->print(printer, options);
   }
   printer << ")";
   printer.printStructurePost(PrintStructureKind::BuiltinAttribute);

lib/AST/Decl.cpp

@@ -1701,7 +1701,7 @@ AccessLevel ImportDecl::getAccessLevel() const {
 }
 
 bool ImportDecl::isAccessLevelImplicit() const {
-  if (auto attr = getAttrs().getAttribute<AccessControlAttr>()) {
+  if (getAttrs().hasAttribute<AccessControlAttr>()) {
     return false;
   }
   return true;
@@ -4688,7 +4688,7 @@ static AccessLevel getAdjustedFormalAccess(const ValueDecl *VD,
   if (useDC) {
     // If the use site decl context is PackageUnit, just return
     // the access level that's passed in
-    if (auto usePkg = useDC->getPackageContext())
+    if (useDC->getPackageContext())
       return access;
     // Check whether we need to modify the access level based on
     // @testable/@_private import attributes.
@@ -8024,7 +8024,7 @@ bool VarDecl::isMemberwiseInitialized(bool preferDeclaredProperties) const {
   // memberwise initializable when it could be used to initialize
   // other stored properties.
   if (hasInitAccessor()) {
-    if (auto *init = getAccessor(AccessorKind::Init))
+    if (getAccessor(AccessorKind::Init))
       return true;
   }
 
@@ -11528,7 +11528,7 @@ ActorIsolation swift::getActorIsolationOfContext(
     return getClosureActorIsolation(closure);
   }
 
-  if (auto *tld = dyn_cast<TopLevelCodeDecl>(dcToUse)) {
+  if (isa<TopLevelCodeDecl>(dcToUse)) {
     if (dcToUse->isAsyncContext() ||
         dcToUse->getASTContext().LangOpts.StrictConcurrencyLevel >=
             StrictConcurrency::Complete) {

lib/AST/DistributedDecl.cpp

@@ -169,7 +169,7 @@ Type swift::getConcreteReplacementForProtocolActorSystemType(
   }
 
   /// === Maybe the value is declared in a protocol?
-  if (auto protocol = DC->getSelfProtocolDecl()) {
+  if (DC->getSelfProtocolDecl()) {
     GenericSignature signature;
     if (auto *genericContext = anyValue->getAsGenericContext()) {
       signature = genericContext->getGenericSignature();