averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

AST: Remove DeclContext::mapTypeOutOfContext()

Browse Source
This commit is contained in:
Slava Pestov
2017-11-15 20:54:21 -08:00
parent cce30cc9bb
commit 2920b4fd1c
19 changed files with 27 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/AST/Decl.cpp
View File

@@ -2503,7 +2503,7 @@ void TypeAliasDecl::setUnderlyingType(Type underlying) {
// lldb creates global typealiases containing archetypes
// sometimes...
if (underlying->hasArchetype() && isGenericContext())
underlying = mapTypeOutOfContext(underlying);
underlying = underlying->mapTypeOutOfContext();
UnderlyingTy.setType(underlying);
// FIXME -- if we already have an interface type, we're changing the
@@ -5185,7 +5185,7 @@ bool EnumElementDecl::computeType() {
// The type of the enum element is either (T) -> T or (T) -> ArgType -> T.
if (auto inputTy = getArgumentTypeLoc().getType()) {
resultTy = FunctionType::get(ED->mapTypeOutOfContext(inputTy), resultTy);
resultTy = FunctionType::get(inputTy->mapTypeOutOfContext(), resultTy);
}
if (auto *genericSig = ED->getGenericSignatureOfContext())