Skip to content

Kill off some usages of the DeclChecker::IsFirstPass bit #15420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Mar 23, 2018
Merged

Kill off some usages of the DeclChecker::IsFirstPass bit #15420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a9b276c
Sema: Use -verify for Codable tests instead of FileCheck
slavapestov Mar 22, 2018
4be9a60
Sema: Don't introduce ErrorType when an associated type is witnessed …
slavapestov Mar 22, 2018
025555f
Sema: Remove duplicate enum case check
slavapestov Mar 23, 2018
3355a72
Sema: DeclChecker::visitSubscriptDecl() does everything in the 'first…
slavapestov Mar 22, 2018
3131a16
Sema: DeclChecker::visitTypeAliasDecl() does everything in the 'first…
slavapestov Mar 22, 2018
63db382
Sema: DeclChecker::visitEnumElementDecl() does everything in the 'fir…
slavapestov Mar 22, 2018
b7c1386
Sema: DeclChecker::visitProtocolDecl() does everything in the 'first …
slavapestov Mar 22, 2018
6382572
Sema: DeclChecker::visitExtensionDecl() does everything in the 'first…
slavapestov Mar 22, 2018
24ac4f5
Sema: DeclChecker::visitStructDecl() does everything in the 'first pass'
slavapestov Mar 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions include/swift/AST/DiagnosticsSema.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2163,10 +2163,6 @@ ERROR(self_in_nominal,none,
"'Self' is only available in a protocol or as the result of a "
"method in a class; did you mean '%0'?", (StringRef))

// Duplicate declarations
ERROR(duplicate_enum_element,none,
"duplicate definition of enum element",())

// Property behaviors
ERROR(property_behavior_not_protocol,none,
"property behavior name must refer to a protocol", ())
Expand Down
252 changes: 117 additions & 135 deletions lib/Sema/TypeCheckDecl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4260,47 +4260,51 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
});
}

if (!IsFirstPass)
checkAccessControl(TC, PBD);

TC.checkDeclAttributes(PBD);

if (IsFirstPass)
checkAccessControl(TC, PBD);
}

void visitSubscriptDecl(SubscriptDecl *SD) {
if (!IsFirstPass) {
checkAccessControl(TC, SD);
return;
}

TC.validateDecl(SD);

TC.checkDeclAttributes(SD);
checkAccessControl(TC, SD);
}

void visitTypeAliasDecl(TypeAliasDecl *TAD) {
if (!IsFirstPass) {
return;
}

TC.checkDeclAttributesEarly(TAD);
TC.computeAccessLevel(TAD);

if (IsFirstPass)
TC.validateDecl(TAD);

if (!IsFirstPass)
checkAccessControl(TC, TAD);

TC.validateDecl(TAD);
TC.checkDeclAttributes(TAD);
checkAccessControl(TC, TAD);
}

void visitAssociatedTypeDecl(AssociatedTypeDecl *assocType) {
if (!assocType->hasValidationStarted())
TC.validateDecl(assocType);
void visitAssociatedTypeDecl(AssociatedTypeDecl *AT) {
if (!IsFirstPass) {
return;
}

auto *proto = assocType->getProtocol();
TC.validateDecl(AT);

auto *proto = AT->getProtocol();
if (proto->isObjC()) {
TC.diagnose(assocType->getLoc(),
TC.diagnose(AT->getLoc(),
diag::associated_type_objc,
assocType->getName(),
AT->getName(),
proto->getName());
}

checkAccessControl(TC, AT);
}

void checkUnsupportedNestedType(NominalTypeDecl *NTD) {
Expand Down Expand Up @@ -4366,28 +4370,6 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
checkCircularity(TC, ED, diag::circular_enum_inheritance,
diag::enum_here, path);
}
{
// Check for duplicate enum members.
llvm::DenseMap<Identifier, EnumElementDecl *> Elements;
bool hasErrors = false;
for (auto *EED : ED->getAllElements()) {
auto Res = Elements.insert({ EED->getName(), EED });
if (!Res.second) {
EED->setInvalid();

auto PreviousEED = Res.first->second;
TC.diagnose(EED->getLoc(), diag::duplicate_enum_element);
TC.diagnose(PreviousEED->getLoc(),
diag::previous_decldef, true, EED->getName());
hasErrors = true;
}
}

// If one of the cases is invalid, let's mark
// whole enum as invalid as well.
if (hasErrors)
ED->setInvalid();
}
}

if (!IsFirstPass) {
Expand All @@ -4401,7 +4383,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {

TC.checkConformancesInContext(ED, ED);
}

for (Decl *member : ED->getMembers())
visit(member);

Expand All @@ -4410,29 +4392,31 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
}

void visitStructDecl(StructDecl *SD) {
if (!IsFirstPass) {
for (Decl *Member : SD->getMembers())
visit(Member);

return;
}

TC.checkDeclAttributesEarly(SD);
TC.computeAccessLevel(SD);

if (IsFirstPass) {
checkUnsupportedNestedType(SD);

TC.validateDecl(SD);
TC.DeclsToFinalize.remove(SD);
TC.addImplicitConstructors(SD);
}
checkUnsupportedNestedType(SD);

if (!IsFirstPass) {
checkAccessControl(TC, SD);
TC.validateDecl(SD);
TC.DeclsToFinalize.remove(SD);

if (!SD->isInvalid())
TC.checkConformancesInContext(SD, SD);
}
TC.addImplicitConstructors(SD);

// Visit each of the members.
for (Decl *Member : SD->getMembers())
visit(Member);

TC.checkDeclAttributes(SD);
checkAccessControl(TC, SD);

if (!SD->isInvalid())
TC.checkConformancesInContext(SD, SD);
}

/// Check whether the given properties can be @NSManaged in this class.
Expand Down Expand Up @@ -4674,26 +4658,15 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
}

void visitProtocolDecl(ProtocolDecl *PD) {
TC.checkDeclAttributesEarly(PD);
TC.computeAccessLevel(PD);

if (IsFirstPass) {
checkUnsupportedNestedType(PD);
}

if (!IsFirstPass) {
checkAccessControl(TC, PD);
for (auto member : PD->getMembers()) {
TC.checkUnsupportedProtocolType(member);
checkAccessControl(TC, member);
}
TC.checkInheritanceClause(PD);

GenericTypeToArchetypeResolver resolver(PD);
TC.validateWhereClauses(PD, &resolver);
return;
}

TC.checkDeclAttributesEarly(PD);
TC.computeAccessLevel(PD);

checkUnsupportedNestedType(PD);

TC.validateDecl(PD);
if (!PD->hasValidSignature())
return;
Expand Down Expand Up @@ -4729,6 +4702,15 @@ class DeclChecker : public DeclVisitor<DeclChecker> {

TC.checkDeclAttributes(PD);

checkAccessControl(TC, PD);
for (auto member : PD->getMembers()) {
TC.checkUnsupportedProtocolType(member);
}
TC.checkInheritanceClause(PD);

GenericTypeToArchetypeResolver resolver(PD);
TC.validateWhereClauses(PD, &resolver);

if (TC.Context.LangOpts.DebugGenericSignatures) {
auto requirementsSig =
GenericSignature::get({PD->getProtocolSelfType()},
Expand Down Expand Up @@ -4795,14 +4777,12 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
// Complain if we should have a body.
TC.diagnose(FD->getLoc(), diag::func_decl_without_brace);
}
}

if (!IsFirstPass) {
checkAccessControl(TC, FD);
return;
}

TC.validateDecl(FD);
checkAccessControl(TC, FD);
}


Expand Down Expand Up @@ -6206,90 +6186,92 @@ class DeclChecker : public DeclVisitor<DeclChecker> {

void visitEnumElementDecl(EnumElementDecl *EED) {
if (!IsFirstPass) {
checkAccessControl(TC, EED);
return;
}

TC.validateDecl(EED);
TC.checkDeclAttributes(EED);
checkAccessControl(TC, EED);
}

void visitExtensionDecl(ExtensionDecl *ED) {
if (!IsFirstPass) {
for (Decl *Member : ED->getMembers())
visit(Member);
return;
}

TC.validateExtension(ED);

TC.checkDeclAttributesEarly(ED);

if (IsFirstPass) {
if (auto extendedTy = ED->getExtendedType()) {
if (!extendedTy->is<NominalType>() &&
!extendedTy->is<BoundGenericType>() &&
!extendedTy->hasError()) {
// FIXME: Redundant diagnostic test here?
TC.diagnose(ED->getStartLoc(), diag::non_nominal_extension,
extendedTy);
// FIXME: It would be nice to point out where we found the named type
// declaration, if any.
ED->setInvalid();
if (auto extendedTy = ED->getExtendedType()) {
if (!extendedTy->is<NominalType>() &&
!extendedTy->is<BoundGenericType>() &&
!extendedTy->hasError()) {
// FIXME: Redundant diagnostic test here?
TC.diagnose(ED->getStartLoc(), diag::non_nominal_extension,
extendedTy);
// FIXME: It would be nice to point out where we found the named type
// declaration, if any.
ED->setInvalid();
}
}

TC.checkInheritanceClause(ED);
if (auto extendedTy = ED->getExtendedType()) {
if (auto nominal = extendedTy->getAnyNominal()) {
TC.validateDecl(nominal);
if (auto *classDecl = dyn_cast<ClassDecl>(nominal))
TC.requestNominalLayout(classDecl);

// Check the raw values of an enum, since we might synthesize
// RawRepresentable while checking conformances on this extension.
if (auto enumDecl = dyn_cast<EnumDecl>(nominal)) {
if (enumDecl->hasRawType())
checkEnumRawValues(TC, enumDecl);
}
}

TC.checkInheritanceClause(ED);
if (auto extendedTy = ED->getExtendedType()) {
if (auto nominal = extendedTy->getAnyNominal()) {
TC.validateDecl(nominal);
if (auto *classDecl = dyn_cast<ClassDecl>(nominal))
TC.requestNominalLayout(classDecl);

// Check the raw values of an enum, since we might synthesize
// RawRepresentable while checking conformances on this extension.
if (auto enumDecl = dyn_cast<EnumDecl>(nominal)) {
if (enumDecl->hasRawType())
checkEnumRawValues(TC, enumDecl);
}
}
}

validateAttributes(TC, ED);
}

// Check conformances before visiting members, since we might
// synthesize bodies for derived conformances
if (!IsFirstPass) {
TC.computeDefaultAccessLevel(ED);
if (auto *AA = ED->getAttrs().getAttribute<AccessControlAttr>()) {
const auto access = AA->getAccess();
AccessScope desiredAccessScope = AccessScope::getPublic();
switch (access) {
case AccessLevel::Private:
assert((ED->isInvalid() ||
ED->getDeclContext()->isModuleScopeContext()) &&
"non-top-level extensions make 'private' != 'fileprivate'");
LLVM_FALLTHROUGH;
case AccessLevel::FilePrivate: {
const DeclContext *DC = ED->getModuleScopeContext();
bool isPrivate = access == AccessLevel::Private;
desiredAccessScope = AccessScope(DC, isPrivate);
break;
}
case AccessLevel::Internal:
desiredAccessScope = AccessScope(ED->getModuleContext());
break;
case AccessLevel::Public:
case AccessLevel::Open:
break;
}
checkGenericParamAccess(TC, ED->getGenericParams(), ED,
desiredAccessScope, access);
}
TC.checkConformancesInContext(ED, ED);
}
validateAttributes(TC, ED);

TC.computeDefaultAccessLevel(ED);

for (Decl *Member : ED->getMembers())
visit(Member);

TC.checkConformancesInContext(ED, ED);

if (!ED->isInvalid())
TC.checkDeclAttributes(ED);
}

if (auto *AA = ED->getAttrs().getAttribute<AccessControlAttr>()) {
const auto access = AA->getAccess();
AccessScope desiredAccessScope = AccessScope::getPublic();
switch (access) {
case AccessLevel::Private:
assert((ED->isInvalid() ||
ED->getDeclContext()->isModuleScopeContext()) &&
"non-top-level extensions make 'private' != 'fileprivate'");
LLVM_FALLTHROUGH;
case AccessLevel::FilePrivate: {
const DeclContext *DC = ED->getModuleScopeContext();
bool isPrivate = access == AccessLevel::Private;
desiredAccessScope = AccessScope(DC, isPrivate);
break;
}
case AccessLevel::Internal:
desiredAccessScope = AccessScope(ED->getModuleContext());
break;
case AccessLevel::Public:
case AccessLevel::Open:
break;
}
checkGenericParamAccess(TC, ED->getGenericParams(), ED,
desiredAccessScope, access);
}
}

void visitTopLevelCodeDecl(TopLevelCodeDecl *TLCD) {
// See swift::performTypeChecking for TopLevelCodeDecl handling.
Expand Down Expand Up @@ -6323,7 +6305,6 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
}

if (!IsFirstPass) {
checkAccessControl(TC, CD);
return;
}

Expand Down Expand Up @@ -6370,6 +6351,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
}

TC.checkDeclAttributes(CD);
checkAccessControl(TC, CD);
}

void visitDestructorDecl(DestructorDecl *DD) {
Expand Down
Loading