Merge pull request #15086 from slavapestov/small-scale-gardening

Clean up warnings

Author: slavapestov

lib/AST/GenericSignatureBuilder.cpp

@@ -3288,7 +3288,7 @@ void RewriteTreeNode::mergeIntoRec(
   for (auto child : children)
     child->mergeIntoRec(other, matchPath);
 
-  if (auto assocType = getMatch())
+  if (getMatch())
     matchPath.pop_back();
 }
 
@@ -3646,8 +3646,6 @@ static Type substituteConcreteType(GenericSignatureBuilder &builder,
         proto, parentType, ProtocolConformanceRef(proto));
 
     type = type.subst(subMap, SubstFlags::UseErrorType);
-    if (!type)
-      return ErrorType::get(proto->getASTContext());
   } else {
     // Substitute in the superclass type.
     auto superclass = basePA->getEquivalenceClassIfPresent()->superclass;

lib/IDE/CodeCompletion.cpp

@@ -4024,7 +4024,7 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
       }
 
       return getPositionInTupleExpr(DC, CCExpr, tuple, Position, HasName);
-    } else if (auto *paren = dyn_cast<ParenExpr>(CallE->getArg())) {
+    } else if (isa<ParenExpr>(CallE->getArg())) {
       HasName = false;
       Position = 0;
       return true;

lib/IRGen/LoadableByAddress.cpp

@@ -123,7 +123,7 @@ static bool containsFunctionSignature(GenericEnvironment *genEnv,
       if (auto optionalObject = objectType.getOptionalObjectType()) {
         objectType = optionalObject;
       }
-      if (auto fnType = objectType.getAs<SILFunctionType>()) {
+      if (objectType.is<SILFunctionType>()) {
         return true;
       }
     }

lib/SIL/InstructionUtils.cpp

@@ -537,7 +537,7 @@ FindClosureResult swift::findClosureForAppliedArg(SILValue V) {
   if (auto *bbi = dyn_cast<BeginBorrowInst>(V))
     V = bbi->getOperand();
 
-  if (auto optionalObjTy = V->getType().getOptionalObjectType())
+  if (V->getType().getOptionalObjectType())
     V = cast<EnumInst>(V)->getOperand();
 
   auto fnType = V->getType().getAs<SILFunctionType>();

lib/SILOptimizer/Mandatory/DiagnoseStaticExclusivity.cpp

@@ -1041,7 +1041,7 @@ static void checkNoEscapePartialApply(PartialApplyInst *PAI) {
       uses.append(EI->getUses().begin(), EI->getUses().end());
       continue;
     }
-    if (auto apply = isa<ApplySite>(user)) {
+    if (isa<ApplySite>(user)) {
       SILValue arg = oper->get();
       auto ArgumentFnType = getSILFunctionTypeForValue(arg);
       if (ArgumentFnType && ArgumentFnType->isNoEscape()) {