Merge pull request #77207 from tshortli/inaccessable-accessor-unavailable-storage

Sema: Diagnose accessor exportability even if storage is unavailable

Author: tshortli

lib/Sema/TypeCheckAvailability.cpp

@@ -4037,6 +4037,14 @@ bool swift::diagnoseDeclAvailability(const ValueDecl *D, SourceRange R,
   if (isa<GenericTypeParamDecl>(D))
     return false;
 
+  if (R.isValid()) {
+    if (TypeChecker::diagnoseInlinableDeclRefAccess(R.Start, D, Where))
+      return true;
+
+    if (TypeChecker::diagnoseDeclRefExportability(R.Start, D, Where))
+      return true;
+  }
+
   // Keep track if this is an accessor.
   auto accessor = dyn_cast<AccessorDecl>(D);
 
@@ -4047,14 +4055,6 @@ bool swift::diagnoseDeclAvailability(const ValueDecl *D, SourceRange R,
       return false;
   }
 
-  if (R.isValid()) {
-    if (TypeChecker::diagnoseInlinableDeclRefAccess(R.Start, D, Where))
-      return true;
-
-    if (TypeChecker::diagnoseDeclRefExportability(R.Start, D, Where))
-      return true;
-  }
-
   if (diagnoseExplicitUnavailability(D, R, Where, call, Flags))
     return true;
 

test/attr/attr_inlinable_accessor_with_unavailable_storage.swift

@@ -0,0 +1,16 @@
+// RUN: %target-typecheck-verify-swift -swift-version 5
+
+// REQUIRES: OS=macosx
+
+public struct HasVarWithInternalAccessor {
+  @available(macOS, unavailable)
+  public internal(set) var internalSetterVar: Int {
+    get { return 1 }
+    set { } // expected-note {{setter for property 'internalSetterVar' is not '@usableFromInline' or public}}
+  }
+
+  @available(macOS, unavailable)
+  @inlinable mutating public func inlinable() {
+    internalSetterVar = 2 // expected-error {{setter for property 'internalSetterVar' is internal and cannot be referenced from an '@inlinable' function}}
+  }
+}