[CSSolver] Split `getType(ValueDecl*) into three - getType{OrNull, OrInterfaceType}

Author: xedin

lib/Sema/ConstraintSystem.cpp

@@ -1017,7 +1017,7 @@ ConstraintSystem::getTypeOfReference(ValueDecl *value,
   // Determine the type of the value, opening up that type if necessary.
   bool wantInterfaceType = !varDecl->getDeclContext()->isLocalContext();
   Type valueType = TC.getUnopenedTypeOfReference(
-      varDecl, Type(), DC, getType(varDecl, false), base, wantInterfaceType);
+      varDecl, Type(), DC, getTypeOrNull(varDecl), base, wantInterfaceType);
 
   assert(!valueType->hasUnboundGenericType() &&
          !valueType->hasTypeParameter());
@@ -1338,8 +1338,8 @@ ConstraintSystem::getTypeOfMemberReference(
                                   AnyFunctionType::ExtInfo());
     } else {
       refType = TC.getUnopenedTypeOfReference(cast<VarDecl>(value), baseTy,
-                                              useDC, getType(value, false),
-                                              base, /*wantInterfaceType=*/true);
+                                              useDC, getTypeOrNull(value), base,
+                                              /*wantInterfaceType=*/true);
     }
 
     auto selfTy = outerDC->getSelfInterfaceType();

lib/Sema/ConstraintSystem.h

@@ -1649,17 +1649,23 @@ class ConstraintSystem {
     return TypeLocTypes.find(&L)->second;
   }
 
-  Type getType(const ValueDecl *P, bool queryDeclOnMiss = true) const {
-    if (auto *PD = dyn_cast<ParamDecl>(P)) {
-      assert(hasType(PD) && "Expected type to have been set!");
-      return ParamTypes.find(PD)->second;
-    }
+  Type getType(const ParamDecl *P) const {
+    assert(hasType(P) && "Expected type to have been set!");
+    return ParamTypes.find(P)->second;
+  }
+
+  Type getTypeOrNull(const ValueDecl *D) const {
+    if (auto *P = dyn_cast<ParamDecl>(D))
+      return getType(P);
+    return Type();
+  }
 
-    if (!queryDeclOnMiss)
-      return Type();
+  Type getTypeOrInterfaceType(const ValueDecl *D) const {
+    if (auto *P = dyn_cast<ParamDecl>(D))
+      return getType(P);
 
-    assert(P->hasValidSignature());
-    return P->getInterfaceType();
+    assert(D->hasValidSignature());
+    return D->getInterfaceType();
   }
 
   /// Cache the type of the expression argument and return that same