Skip to content

'open' classes within 'public' structs should be considered open. #11925

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.

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 1 commit into from
Sep 19, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 17 additions & 4 deletions lib/AST/Decl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1953,17 +1953,30 @@ AccessLevel ValueDecl::getEffectiveAccess() const {
break;
}

auto restrictToEnclosing = [this](AccessLevel effectiveAccess,
AccessLevel enclosingAccess) -> AccessLevel{
if (effectiveAccess == AccessLevel::Open &&
enclosingAccess == AccessLevel::Public &&
isa<NominalTypeDecl>(this)) {
// Special case: an open class may be contained in a public
// class/struct/enum. Leave effectiveAccess as is.
return effectiveAccess;
}
return std::min(effectiveAccess, enclosingAccess);
};

if (auto enclosingNominal = dyn_cast<NominalTypeDecl>(getDeclContext())) {
effectiveAccess = std::min(effectiveAccess,
enclosingNominal->getEffectiveAccess());
effectiveAccess =
restrictToEnclosing(effectiveAccess,
enclosingNominal->getEffectiveAccess());

} else if (auto enclosingExt = dyn_cast<ExtensionDecl>(getDeclContext())) {
// Just check the base type. If it's a constrained extension, Sema should
// have already enforced access more strictly.
if (auto extendedTy = enclosingExt->getExtendedType()) {
if (auto nominal = extendedTy->getAnyNominal()) {
effectiveAccess = std::min(effectiveAccess,
nominal->getEffectiveAccess());
effectiveAccess =
restrictToEnclosing(effectiveAccess, nominal->getEffectiveAccess());
}
}

Expand Down
15 changes: 15 additions & 0 deletions test/IRGen/Inputs/vtable_symbol_linkage_base.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,18 @@ open class Base {
private var privateVar: Int = 29
internal var internalVar: Int = 30
}


public struct Namespace {
open class Nested {
public init() {}
var storedProp: Int?
}
}

extension Namespace {
open class ExtNested {
public init() {}
var storedProp: Int?
}
}
3 changes: 2 additions & 1 deletion test/IRGen/vtable_symbol_linkage.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ import BaseModule
public class Derived : Base {
}


public class DerivedNested : Namespace.Nested {}
public class DerivedExtNested : Namespace.ExtNested {}