s/treatAsPublic/hasEffectivelyPublicAccess.

Update tests.

Author: elsh

include/swift/AST/Decl.h

@@ -2973,13 +2973,13 @@ class ValueDecl : public Decl {
   /// \c \@usableFromInline, \c \@inlinalbe, and \c \@_alwaysEmitIntoClient
   bool isUsableFromInline() const;
 
-  /// Treat as public and allow skipping type check if the following conditions
+  /// Treat as public and allow skipping access checks if the following conditions
   /// are met:
-  /// - This decl has a package access level.
-  /// - Has a @usableFromInline (or other inlinable) attribute
+  /// - This decl has a package access level,
+  /// - Has a @usableFromInline (or other inlinable) attribute,
   /// - And is defined in a module built from a public or private
   ///   interface that does not contain package-name.
-  bool treatAsPublic() const;
+  bool hasEffectivelyPublicAccess() const;
 
   /// Returns \c true if this declaration is *not* intended to be used directly
   /// by application developers despite the visibility.

lib/AST/ASTVerifier.cpp

@@ -1016,7 +1016,7 @@ class Verifier : public ASTWalker {
         if (!D->getASTContext().isAccessControlDisabled()) {
           if (D->getFormalAccessScope().isPublic() &&
               D->getFormalAccess() < AccessLevel::Public &&
-              !D->treatAsPublic()) {
+              !D->hasEffectivelyPublicAccess()) {
             Out << "non-public decl has no formal access scope\n";
             D->dump(Out);
             abort();

lib/AST/Decl.cpp

@@ -4212,7 +4212,7 @@ bool ValueDecl::isUsableFromInline() const {
   return false;
 }
 
-bool ValueDecl::treatAsPublic() const {
+bool ValueDecl::hasEffectivelyPublicAccess() const {
   // If a package decl has a @usableFromInline (or other inlinable)
   // attribute, and is defined in a module built from interface, it
   // can be referenced by another module that imports it even though
@@ -4319,7 +4319,7 @@ static AccessLevel getAdjustedFormalAccess(const ValueDecl *VD,
   if (useDC && VD->getASTContext().isAccessControlDisabled())
     return getMaximallyOpenAccessFor(VD);
 
-  if (VD->treatAsPublic())
+  if (VD->hasEffectivelyPublicAccess())
     return AccessLevel::Public;
 
   if (treatUsableFromInlineAsPublic &&
@@ -4504,7 +4504,7 @@ getAccessScopeForFormalAccess(const ValueDecl *VD,
   case AccessLevel::Package: {
     auto pkg = resultDC->getPackageContext(/*lookupIfNotCurrent*/ true);
     if (!pkg) {
-      if (VD->treatAsPublic())
+      if (VD->hasEffectivelyPublicAccess())
         return AccessScope::getPublic();
       // Instead of reporting and failing early, return the scope of resultDC to
       // allow continuation (should still non-zero exit later if in script mode)
@@ -4641,7 +4641,7 @@ static bool checkAccess(const DeclContext *useDC, const ValueDecl *VD,
   if (VD->getASTContext().isAccessControlDisabled())
     return true;
 
-  if (VD->treatAsPublic())
+  if (VD->hasEffectivelyPublicAccess())
     return true;
 
   auto access = getAccessLevel();

lib/Sema/TypeCheckProtocol.cpp

@@ -4277,7 +4277,7 @@ ConformanceChecker::resolveWitnessViaLookup(ValueDecl *requirement) {
           requiredAccessScope.requiredAccessForDiagnostics();
         auto proto = conformance->getProtocol();
         auto protoAccessScope = proto->getFormalAccessScope(DC);
-        if (proto->treatAsPublic())
+        if (proto->hasEffectivelyPublicAccess())
           return;
 
         bool protoForcesAccess =

test/ModuleInterface/package_interface_disable_package_name.swift

@@ -28,14 +28,16 @@
 /// Verify building modules from non-package interfaces succeeds without the package-name flag.
 // RUN: %target-swift-frontend -compile-module-from-interface %t/Bar.swiftinterface -o %t/Bar.swiftmodule -module-name Bar
 // RUN: %target-swift-frontend -typecheck %t/Use.swift -I %t -verify
+// RUN: %target-swift-frontend -typecheck %t/Use.swift -I %t -package-name barpkg -verify
 
 // RUN: rm -rf %t/Bar.swiftmodule
 // RUN: %target-swift-frontend -compile-module-from-interface %t/Bar.private.swiftinterface -o %t/Bar.swiftmodule -module-name Bar
 // RUN: %target-swift-frontend -typecheck %t/Use.swift -I %t -verify
+// RUN: %target-swift-frontend -typecheck %t/Use.swift -I %t -package-name barpkg -verify
 
 // RUN: rm -rf %t/Bar.swiftmodule
 // RUN: %target-swift-frontend -compile-module-from-interface %t/Bar.package.swiftinterface -o %t/Bar.swiftmodule -module-name Bar
-// RUN: %target-swift-frontend -typecheck %t/Use.swift -I %t -verify
+// RUN: %target-swift-frontend -typecheck %t/Use.swift -I %t -package-name barpkg -experimental-package-interface-load -verify
 
 // RUN: rm -rf %t/Bar.swiftmodule
 // RUN: rm -rf %t/Bar.swiftinterface
@@ -58,15 +60,15 @@
 
 /// Building modules from non-package interfaces with package-name (default mode) should succeed.
 // RUN: %target-swift-frontend -compile-module-from-interface %t/Bar.swiftinterface -o %t/Bar.swiftmodule -module-name Bar
-// RUN: %target-swift-frontend -typecheck %t/Use.swift -I %t -verify
+// RUN: %target-swift-frontend -typecheck %t/ExpectFail.swift -I %t -package-name barpkg -verify
 
 // RUN: rm -rf %t/Bar.swiftmodule
 // RUN: %target-swift-frontend -compile-module-from-interface %t/Bar.private.swiftinterface -o %t/Bar.swiftmodule -module-name Bar
-// RUN: %target-swift-frontend -typecheck %t/Use.swift -I %t -verify
+// RUN: %target-swift-frontend -typecheck %t/ExpectFail.swift -I %t -package-name barpkg -verify
 
 // RUN: rm -rf %t/Bar.swiftmodule
 // RUN: %target-swift-frontend -compile-module-from-interface %t/Bar.package.swiftinterface -o %t/Bar.swiftmodule -module-name Bar
-// RUN: %target-swift-frontend -typecheck %t/Use.swift -I %t -verify
+// RUN: %target-swift-frontend -typecheck %t/Use.swift -I %t -package-name barpkg -experimental-package-interface-load -verify
 
 //--- Bar.swift
 public struct PubStruct {}
@@ -94,3 +96,10 @@ import Bar
 func use(_ arg: PubStruct) -> PubStruct {
   return UfiPkgStruct(arg, arg).ufiPkgVar
 }
+
+//--- ExpectFail.swift
+import Bar // expected-error {{module 'Bar' is in package 'barpkg' but was built from a non-package interface; modules of the same package can only be loaded if built from source or package interface}}
+
+func use(_ arg: PubStruct) -> PubStruct {
+  return UfiPkgStruct(arg, arg).ufiPkgVar
+}

test/Sema/accessibility_package_inline_interface.swift

@@ -70,7 +70,7 @@
 // CHECK-UTILS: }
 
 
-// BEGIN Utils.swift
+//--- Utils.swift
 package protocol PackageProto {
   var pkgVar: Double { get set }
   func pkgFunc()