swift-module-digester: use getEffectiveAccess() to get accessibility when checking ABI stability.

This allows us to include internal decls with @usableFromInline attribute, whose stored property
changes can effect ABI.

Author: nkcsgexi

test/api-digester/Inputs/cake.swift

@@ -88,3 +88,6 @@ public extension P1 {
 }
 
 infix operator ..*..
+
+@usableFromInline
+class UsableFromInlineClass {}

test/api-digester/Inputs/cake1.swift

@@ -55,8 +55,9 @@ public struct fixedLayoutStruct {
   public var a = 1
 }
 
+@usableFromInline
 @_fixed_layout
-public struct fixedLayoutStruct2 {
+struct fixedLayoutStruct2 {
   public private(set) var NoLongerWithFixedBinaryOrder = 1
   public var BecomeFixedBinaryOrder: Int { return 1 }
 }

test/api-digester/Inputs/cake2.swift

@@ -59,8 +59,9 @@ public struct fixedLayoutStruct {
   private lazy var lazy_d = 4
 }
 
+@usableFromInline
 @_fixed_layout
-public struct fixedLayoutStruct2 {
+struct fixedLayoutStruct2 {
   public var NoLongerWithFixedBinaryOrder: Int { return 1 }
   public var BecomeFixedBinaryOrder = 1
 }

test/api-digester/Outputs/Cake-abi.txt

@@ -78,6 +78,3 @@ cake2: Var RequiementChanges.addedVar has been added as a protocol requirement
 cake1: Class C4 has changed its super class from OldType to NewType
 cake1: Class SubGenericClass has changed its super class from GenericClass<P1> to GenericClass<P2>
 cake1: Class SuperClassRemoval has removed its super class C3
-cake1: Func ClassWithOpenMember.bar() is no longer open for subclassing
-cake1: Func ClassWithOpenMember.foo() is no longer open for subclassing
-cake1: Var ClassWithOpenMember.property is no longer open for subclassing

test/api-digester/Outputs/Cake.txt

@@ -9,7 +9,6 @@ cake1: Protocol P3 has generic signature change from <Self : P1, Self : P2> to <
 cake1: AssociatedType RequiementChanges.removedType has been removed
 cake1: Constructor Somestruct2.init(_:) has been removed
 cake1: Constructor fixedLayoutStruct.init(b:a:) has been removed
-cake1: Constructor fixedLayoutStruct2.init(NoLongerWithFixedBinaryOrder:) has been removed
 cake1: Func C4.foo() has been removed
 cake1: Func RequiementChanges.removedFunc() has been removed
 cake1: Subscript RemoveSetters.subscript(_:) has removed its setter

test/api-digester/Outputs/cake-abi.json

@@ -231,8 +231,7 @@
           "declKind": "Func",
           "usr": "s:4cake2C1C4foo1yyFZ",
           "moduleName": "cake",
-          "static": true,
-          "isOpen": true
+          "static": true
         },
         {
           "kind": "Var",
@@ -1200,6 +1199,37 @@
         "Infix"
       ]
     },
+    {
+      "kind": "TypeDecl",
+      "name": "UsableFromInlineClass",
+      "printedName": "UsableFromInlineClass",
+      "children": [
+        {
+          "kind": "Constructor",
+          "name": "init",
+          "printedName": "init()",
+          "children": [
+            {
+              "kind": "TypeNominal",
+              "name": "UsableFromInlineClass",
+              "printedName": "UsableFromInlineClass",
+              "usr": "s:4cake21UsableFromInlineClassC"
+            }
+          ],
+          "declKind": "Constructor",
+          "usr": "s:4cake21UsableFromInlineClassCACycfc",
+          "moduleName": "cake",
+          "implicit": true,
+          "isInternal": true
+        }
+      ],
+      "declKind": "Class",
+      "usr": "s:4cake21UsableFromInlineClassC",
+      "moduleName": "cake",
+      "declAttributes": [
+        "UsableFromInline"
+      ]
+    },
     {
       "kind": "TypeDecl",
       "name": "Int",

tools/swift-api-digester/ModuleAnalyzerNodes.cpp

@@ -770,6 +770,10 @@ bool SDKContext::isEqual(const SDKNode &Left, const SDKNode &Right) {
   return EqualCache[&Left][&Right];
 }
 
+AccessLevel SDKContext::getAccessLevel(const ValueDecl *VD) const {
+  return checkingABI() ? VD->getEffectiveAccess() : VD->getFormalAccess();
+}
+
 bool SDKNode::operator==(const SDKNode &Other) const {
   return Ctx.isEqual(*this, Other);
 }
@@ -1055,8 +1059,8 @@ SDKNodeInitInfo::SDKNodeInitInfo(SDKContext &Ctx, ValueDecl *VD)
   IsStatic = VD->isStatic();
   IsOverriding = VD->getOverriddenDecl();
   IsProtocolReq = isa<ProtocolDecl>(VD->getDeclContext()) && VD->isProtocolRequirement();
-  IsOpen = VD->getFormalAccess() == AccessLevel::Open;
-  IsInternal = VD->getFormalAccess() < AccessLevel::Public;
+  IsOpen = Ctx.getAccessLevel(VD) == AccessLevel::Open;
+  IsInternal = Ctx.getAccessLevel(VD) < AccessLevel::Public;
   SelfIndex = getSelfIndex(VD);
   FixedBinaryOrder = getFixedBinaryOrder(VD);
   ReferenceOwnership = getReferenceOwnership(VD);
@@ -1222,7 +1226,7 @@ SwiftDeclCollector::shouldIgnore(Decl *D, const Decl* Parent) {
   if (auto VD = dyn_cast<ValueDecl>(D)) {
     if (VD->getBaseName().empty())
       return true;
-    switch (VD->getFormalAccess()) {
+    switch (Ctx.getAccessLevel(VD)) {
     case AccessLevel::Internal:
     case AccessLevel::Private:
     case AccessLevel::FilePrivate:

tools/swift-api-digester/ModuleAnalyzerNodes.h

@@ -188,6 +188,7 @@ class SDKContext {
   }
   bool isEqual(const SDKNode &Left, const SDKNode &Right);
   bool checkingABI() const { return Opts.ABI; }
+  AccessLevel getAccessLevel(const ValueDecl *VD) const;
   const CheckerOptions &getOpts() const { return Opts; }
   ArrayRef<ABIAttributeInfo> getABIAttributeInfo() const { return ABIAttrs; }