Remove EnableSwift3Private staging option.

Author: DougGregor

include/swift/Basic/LangOptions.h

@@ -141,10 +141,6 @@ namespace swift {
     /// new enough?
     bool EnableTargetOSChecking = true;
 
-    /// Should 'private' use Swift 3's lexical scoping, or the Swift 2 behavior
-    /// of 'fileprivate'?
-    bool EnableSwift3Private = true;
-
     /// Whether to use the import as member inference system
     ///
     /// When importing a global, try to infer whether we can import it as a

lib/AST/Decl.cpp

@@ -1896,16 +1896,13 @@ const DeclContext *
 ValueDecl::getFormalAccessScope(const DeclContext *useDC) const {
   const DeclContext *result = getDeclContext();
   Accessibility access = getFormalAccess(useDC);
-  bool swift3PrivateChecked = false;
 
   while (!result->isModuleScopeContext()) {
     if (result->isLocalContext())
       return result;
 
-    if (access == Accessibility::Private && !swift3PrivateChecked) {
-      if (result->getASTContext().LangOpts.EnableSwift3Private)
-        return result;
-      swift3PrivateChecked = true;
+    if (access == Accessibility::Private) {
+      return result;
     }
 
     if (auto enclosingNominal = dyn_cast<NominalTypeDecl>(result)) {

lib/AST/NameLookup.cpp

@@ -1039,9 +1039,7 @@ static bool checkAccessibility(const DeclContext *useDC,
   assert(sourceDC && "ValueDecl being accessed must have a valid DeclContext");
   switch (access) {
   case Accessibility::Private:
-    if (sourceDC->getASTContext().LangOpts.EnableSwift3Private)
-      return useDC == sourceDC || useDC->isChildContextOf(sourceDC);
-    SWIFT_FALLTHROUGH;
+    return useDC == sourceDC || useDC->isChildContextOf(sourceDC);
   case Accessibility::FilePrivate:
     return useDC->getModuleScopeContext() == sourceDC->getModuleScopeContext();
   case Accessibility::Internal: {

lib/Parse/ParseDecl.cpp

@@ -507,11 +507,6 @@ bool Parser::parseNewDeclAttribute(DeclAttributes &Attributes, SourceLoc AtLoc,
       .Case("public", Accessibility::Public)
       .Case("open", Accessibility::Open);
 
-    if (access == Accessibility::FilePrivate &&
-        !Context.LangOpts.EnableSwift3Private) {
-      access = Accessibility::Private;
-    }
-
     if (!consumeIf(tok::l_paren)) {
       // Normal accessibility attribute.
       AttrRange = Loc;

lib/Sema/MiscDiagnostics.cpp

@@ -3630,8 +3630,7 @@ swift::accessibilityFromScopeForDiagnostics(const DeclContext *accessScope) {
     return Accessibility::Public;
   if (isa<ModuleDecl>(accessScope))
     return Accessibility::Internal;
-  if (accessScope->isModuleScopeContext() &&
-      accessScope->getASTContext().LangOpts.EnableSwift3Private) {
+  if (accessScope->isModuleScopeContext()) {
     return Accessibility::FilePrivate;
   }
   return Accessibility::Private;

lib/Sema/TypeCheckAttr.cpp

@@ -1366,11 +1366,6 @@ void AttributeChecker::visitAccessibilityAttr(AccessibilityAttr *attr) {
     TC.computeDefaultAccessibility(extension);
     Accessibility maxAccess = extension->getMaxAccessibility();
     if (std::min(attr->getAccess(), Accessibility::Public) > maxAccess) {
-      if (maxAccess == Accessibility::FilePrivate &&
-          !TC.Context.LangOpts.EnableSwift3Private) {
-        maxAccess = Accessibility::Private;
-      }
-
       // FIXME: It would be nice to say what part of the requirements actually
       // end up being problematic.
       auto diag =

lib/Sema/TypeCheckDecl.cpp

@@ -1397,10 +1397,6 @@ void TypeChecker::computeAccessibility(ValueDecl *D) {
       auto extension = cast<ExtensionDecl>(DC);
       computeDefaultAccessibility(extension);
       auto access = extension->getDefaultAccessibility();
-      if (access == Accessibility::FilePrivate &&
-          !Context.LangOpts.EnableSwift3Private) {
-        access = Accessibility::Private;
-      }
       D->setAccessibility(access);
     }
     }