IDE: Replace a couple of getTypeOfMember() calls

Author: slavapestov

tools/SourceKit/lib/SwiftLang/SwiftConformingMethodList.cpp

@@ -77,10 +77,9 @@ deliverResults(SourceKit::ConformingMethodListConsumer &SKConsumer,
       Members.emplace_back();
       auto &memberElem = Members.back();
 
-      auto funcTy = cast<FuncDecl>(member)->getMethodInterfaceType();
-      funcTy = Result->Result->ExprType->getTypeOfMember(
-          member, funcTy);
-      auto resultTy = funcTy->castTo<FunctionType>()->getResult();
+      auto resultTy = cast<FuncDecl>(member)->getResultInterfaceType();
+      resultTy = resultTy.subst(
+        Result->Result->ExprType->getMemberSubstitutionMap(member));
 
       // Name.
       memberElem.DeclNameBegin = SS.size();

tools/swift-ide-test/swift-ide-test.cpp

@@ -1229,9 +1229,9 @@ static int printConformingMethodList(
           llvm::outs() << " []";
         llvm::outs() << "\n";
         for (auto VD : Result->Members) {
-          auto funcTy = cast<FuncDecl>(VD)->getMethodInterfaceType();
-          funcTy = Result->ExprType->getTypeOfMember(VD, funcTy);
-          auto resultTy = funcTy->castTo<FunctionType>()->getResult();
+          auto resultTy = cast<FuncDecl>(VD)->getResultInterfaceType();
+          resultTy = resultTy.subst(
+                Result->ExprType->getMemberSubstitutionMap(VD));
 
           llvm::outs() << "   - Name: ";
           VD->getName().print(llvm::outs());