VarDecl::getType always returns a type

Author: hamishknight

lib/Sema/TypeCheckDeclObjC.cpp

@@ -225,12 +225,10 @@ static void diagnoseFunctionParamNotRepresentable(
     AFD->diagnose(diag::objc_invalid_on_func_param_type,
                   ParamIndex + 1, getObjCDiagnosticAttrKind(Reason));
   }
-  if (Type ParamTy = P->getType()) {
-    SourceRange SR;
-    if (auto typeRepr = P->getTypeRepr())
-      SR = typeRepr->getSourceRange();
-    diagnoseTypeNotRepresentableInObjC(AFD, ParamTy, SR);
-  }
+  SourceRange SR;
+  if (auto typeRepr = P->getTypeRepr())
+    SR = typeRepr->getSourceRange();
+  diagnoseTypeNotRepresentableInObjC(AFD, P->getType(), SR);
   describeObjCReason(AFD, Reason);
 }
 

lib/Sema/TypeCheckDeclOverride.cpp

@@ -282,9 +282,6 @@ diagnoseMismatchedOptionals(const ValueDecl *member,
     Type paramTy = decl->getType();
     Type parentParamTy = parentDecl->getType();
 
-    if (!paramTy || !parentParamTy)
-      return;
-
     auto *repr = decl->getTypeRepr();
     if (!repr)
       return;

lib/Sema/TypeCheckPattern.cpp

@@ -1488,10 +1488,7 @@ void TypeChecker::coerceParameterListToType(ParameterList *P, ClosureExpr *CE,
     if (param->isInvalid())
       return true;
 
-    if (auto type = param->getType())
-      return !isValidType(type);
-
-    return true;
+    return !isValidType(param->getType());
   };
 
   auto handleParameter = [&](ParamDecl *param, Type ty, bool forceMutable) {

lib/Sema/TypeCheckPropertyWrapper.cpp

@@ -546,7 +546,7 @@ PropertyWrapperBackingPropertyTypeRequest::evaluate(
 
   // Compute the type of the property to plug in to the wrapper type.
   Type propertyType = var->getType();
-  if (!propertyType || propertyType->hasError())
+  if (propertyType->hasError())
     return Type();
 
   using namespace constraints;

lib/Sema/TypeCheckStmt.cpp

@@ -1166,7 +1166,7 @@ class StmtChecker : public StmtVisitor<StmtChecker, Stmt*> {
         }
         assert(isa<CaseStmt>(initialCaseVarDecl->getParentPatternStmt()));
 
-        if (initialCaseVarDecl->getType() && !initialCaseVarDecl->isInvalid() &&
+        if (!initialCaseVarDecl->isInvalid() &&
             !vd->getType()->isEqual(initialCaseVarDecl->getType())) {
           getASTContext().Diags.diagnose(vd->getLoc(), diag::type_mismatch_multiple_pattern_list,
                       vd->getType(), initialCaseVarDecl->getType());