Merge pull request #14774 from rudkx/cs-check-type-before-getting

Update ConstraintSystem::dump to check hasType before calling getType.
apple · Feb 22, 2018 · 0ae61f6 · 0ae61f6
2 parents 786cfc5 + 5e4390c
commit 0ae61f6
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/lib/Sema/TypeCheckConstraints.cpp b/lib/Sema/TypeCheckConstraints.cpp
@@ -3121,9 +3121,15 @@ void ConstraintSystem::dump() {
 }
 
 void ConstraintSystem::dump(Expr *E) {
-  auto getTypeOfExpr = [&](const Expr *E) -> Type { return getType(E); };
+  auto getTypeOfExpr = [&](const Expr *E) -> Type {
+    if (hasType(E))
+      return getType(E);
+    return Type();
+  };
   auto getTypeOfTypeLoc = [&](const TypeLoc &TL) -> Type {
-    return getType(TL);
+    if (hasType(TL))
+      return getType(TL);
+    return Type();
   };
 
   E->dump(getTypeOfExpr, getTypeOfTypeLoc);