[CodeCompletion] Adjust DotExprLookup::sawSolution to use new `Solu…

…tion` APIs
beccadax · Aug 29, 2020 · a49404d · a49404d
1 parent fe9df72
commit a49404d
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/lib/Sema/TypeCheckCodeCompletion.cpp b/lib/Sema/TypeCheckCodeCompletion.cpp
@@ -708,9 +708,7 @@ void DotExprLookup::sawSolution(const constraints::Solution &S) {
   GotCallback = true;
   auto &CS = S.getConstraintSystem();
 
-  auto GetType = [&](Expr *E) {
-    return S.simplifyType(S.getType(E));
-  };
+  auto GetType = [&](Expr *E) { return S.getResolvedType(E); };
 
   auto *ParsedExpr = CompletionExpr->getBase();
   auto *SemanticExpr = ParsedExpr->getSemanticsProvidingExpr();
@@ -726,7 +724,7 @@ void DotExprLookup::sawSolution(const constraints::Solution &S) {
     if (auto SelectedOverload = S.getOverloadChoiceIfAvailable(CalleeLocator))
       ReferencedDecl = SelectedOverload->choice.getDeclOrNull();
 
-    bool ISDMT = CS.isStaticallyDerivedMetatype(ParsedExpr);
+    bool ISDMT = S.isStaticallyDerivedMetatype(ParsedExpr);
     auto Key = std::make_pair(BaseTy, ReferencedDecl);
     auto Ret = ResultToIndex.insert({Key, Solutions.size()});
     if (!Ret.second && ExpectedTy)