IDE: Tidy up some GenericEnvironment usages

Author: slavapestov

lib/IDE/ConformingMethodList.cpp

@@ -124,14 +124,16 @@ void ConformingMethodListCallbacks::doneParsing(SourceFile *SrcFile) {
     return;
 
   T = T->getRValueType();
-  if (T->hasArchetype())
-    T = T->mapTypeOutOfContext();
 
   // If there are no (instance) members for this type, bail.
   if (!T->mayHaveMembers() || T->is<ModuleType>()) {
     return;
   }
 
+  auto interfaceTy = T;
+  if (T->hasArchetype())
+    interfaceTy = interfaceTy->mapTypeOutOfContext();
+
   llvm::SmallPtrSet<ProtocolDecl*, 8> expectedProtocols;
   for (auto Name: ExpectedTypeNames) {
     if (auto *PD = resolveProtocolName(CurDeclContext, Name)) {
@@ -140,7 +142,7 @@ void ConformingMethodListCallbacks::doneParsing(SourceFile *SrcFile) {
   }
 
   // Collect the matching methods.
-  ConformingMethodListResult result(CurDeclContext, T);
+  ConformingMethodListResult result(CurDeclContext, interfaceTy);
   getMatchingMethods(T, expectedProtocols, result.Members);
 
   Consumer.handleResult(result);

lib/IDE/TypeContextInfo.cpp

@@ -133,21 +133,19 @@ void ContextInfoCallbacks::doneParsing(SourceFile *SrcFile) {
       continue;
 
     T = T->getRValueType();
-    if (T->hasArchetype())
-      T = T->mapTypeOutOfContext();
 
-    // TODO: Do we need '.none' for Optionals?
-    auto objT = T->lookThroughAllOptionalTypes();
-
-    if (auto env = CurDeclContext->getGenericEnvironmentOfContext())
-      objT = env->mapTypeIntoContext(T);
+    auto interfaceTy = T;
+    if (interfaceTy->hasArchetype())
+      interfaceTy = interfaceTy->mapTypeOutOfContext();
 
-    if (!seenTypes.insert(objT->getCanonicalType()).second)
+    // TODO: Do we need '.none' for Optionals?
+    auto objTy = T->lookThroughAllOptionalTypes();
+    if (!seenTypes.insert(objTy->getCanonicalType()).second)
       continue;
 
-    results.emplace_back(T);
+    results.emplace_back(interfaceTy);
     auto &item = results.back();
-    getImplicitMembers(objT, item.ImplicitMembers);
+    getImplicitMembers(objTy, item.ImplicitMembers);
   }
 
   Consumer.handleResults(results);