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

Merge pull request #40945 from DougGregor/explicit-generic-param-list-storage

Browse Source
This commit is contained in:
Doug Gregor
2022-01-21 17:28:08 -08:00
committed by GitHub
parent b660dfe53a e2a49f4d3b
commit baf7ef18c9
4 changed files with 44 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/AST/Decl.cpp
View File

@@ -985,7 +985,7 @@ GenericContext::GenericContext(DeclContextKind Kind, DeclContext *Parent,
: _GenericContext(), DeclContext(Kind, Parent) {
if (Params) {
Params->setDeclContext(this);
GenericParamsAndBit.setPointerAndInt(Params, false);
GenericParamsAndState.setPointerAndInt(Params, GenericParamsState::Parsed);
}
}
@@ -1006,9 +1006,14 @@ GenericParamList *GenericContext::getGenericParams() const {
}
GenericParamList *GenericContext::getParsedGenericParams() const {
if (GenericParamsAndBit.getInt())
switch (GenericParamsAndState.getInt()) {
case GenericParamsState::Parsed:
case GenericParamsState::ParsedAndTypeChecked:
return GenericParamsAndState.getPointer();
case GenericParamsState::TypeChecked:
return nullptr;
return GenericParamsAndBit.getPointer();
}
}
bool GenericContext::hasComputedGenericSignature() const {