commit 0ae61f65c90ccaf5419645edc773cc98e100af02
author Mark Lacey <rudkx@users.noreply.github.com> Wed Feb 21 20:54:36 2018 -0800
committer GitHub <noreply@github.com> Wed Feb 21 20:54:36 2018 -0800
tree fffb9a25050a087ff7b5a8bfb98e0c6080131ba1
parent 786cfc5ed1bf24ae14b30f2b4356e361942edc43
parent 5e4390c7b055b26e9fbc86625070aea0db0f91a5

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

Update ConstraintSystem::dump to check hasType before calling getType.

lib/Sema/TypeCheckConstraints.cpp

diff --git a/lib/Sema/TypeCheckConstraints.cpp b/lib/Sema/TypeCheckConstraints.cpp
index fc1e097..d97a6bd 100644
--- a/lib/Sema/TypeCheckConstraints.cpp
+++ b/lib/Sema/TypeCheckConstraints.cpp
@@ -3121,9 +3121,15 @@
 }
 
 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);