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

Split getAccessibility() into getFormalAccess() and getEffectiveAccess().

Browse Source 
Currently a no-op, but effective access for entities within the current
module will soon need to take testability into account. This declaration:

  internal func foo() {}

has a formal access of 'internal', but an effective access of 'public' if
we're in a testable mode.

Part of rdar://problem/17732115 (testability)

Swift SVN r26472
This commit is contained in:
Jordan Rose
2015-03-24 02:16:58 +00:00
parent dac0dc1dad
commit f74bc7122c
33 changed files with 162 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/SIL/DynamicCasts.cpp
View File

@@ -56,12 +56,12 @@ static bool canClassOrSuperclassesHaveExtensions(ClassDecl *CD,
bool isWholeModuleOpts) {
while (CD) {
// Public classes can always be extended
if (CD->getAccessibility() == Accessibility::Public)
if (CD->getEffectiveAccess() == Accessibility::Public)
return true;
// Internal classes can be extended, if we are not in a
// whole-module-optimizations mode.
if (CD->getAccessibility() == Accessibility::Internal &&
if (CD->getEffectiveAccess() == Accessibility::Internal &&
!isWholeModuleOpts)
return true;
@@ -136,8 +136,8 @@ classifyDynamicCastToProtocol(CanType source,
// then conformances cannot be changed at run-time, because only this
// file could have implemented them, but no conformances were found.
// Therefore it is safe to make a negative decision at compile-time.
if (SourceNominalTy->getAccessibility() == Accessibility::Private ||
TargetProtocol->getAccessibility() == Accessibility::Private) {
if (SourceNominalTy->getEffectiveAccess() == Accessibility::Private ||
TargetProtocol->getEffectiveAccess() == Accessibility::Private) {
// This cast is always false. Replace it with a branch to the
// failure block.
return DynamicCastFeasibility::WillFail;
@@ -149,8 +149,8 @@ classifyDynamicCastToProtocol(CanType source,
// module could have implemented them, but no conformances were found.
// Therefore it is safe to make a negative decision at compile-time.
if (isWholeModuleOpts &&
(SourceNominalTy->getAccessibility() == Accessibility::Internal ||
TargetProtocol->getAccessibility() == Accessibility::Internal)) {
(SourceNominalTy->getEffectiveAccess() == Accessibility::Internal ||
TargetProtocol->getEffectiveAccess() == Accessibility::Internal)) {
return DynamicCastFeasibility::WillFail;
}