Merge pull request #70042 from kubamracek/unavailable-accessors

[embedded] Consider 'skipped' decls when SILGen-ing accessors, fix compiler crash on unavailable accessors

Author: kubamracek

lib/SILGen/SILGen.cpp

@@ -1802,7 +1802,7 @@ void SILGenModule::visitVarDecl(VarDecl *vd) {
   if (vd->hasStorage())
     addGlobalVariable(vd);
 
-  vd->visitEmittedAccessors([&](AccessorDecl *accessor) {
+  visitEmittedAccessors(vd, [&](AccessorDecl *accessor) {
     emitFunction(accessor);
   });
 
@@ -1825,6 +1825,16 @@ void SILGenModule::visitMacroExpansionDecl(MacroExpansionDecl *d) {
   // Expansion already visited as auxiliary decls.
 }
 
+void SILGenModule::visitEmittedAccessors(
+    AbstractStorageDecl *D, llvm::function_ref<void(AccessorDecl *)> callback) {
+  D->visitEmittedAccessors([&](AccessorDecl *accessor) {
+    if (shouldSkipDecl(accessor))
+      return;
+
+    callback(accessor);
+  });
+}
+
 bool
 SILGenModule::canStorageUseStoredKeyPathComponent(AbstractStorageDecl *decl,
                                                   ResilienceExpansion expansion) {

lib/SILGen/SILGen.h

@@ -301,6 +301,11 @@ class LLVM_LIBRARY_VISIBILITY SILGenModule : public ASTVisitor<SILGenModule> {
   void visitMacroDecl(MacroDecl *d);
   void visitMacroExpansionDecl(MacroExpansionDecl *d);
 
+  // Same as AbstractStorageDecl::visitEmittedAccessors, but skips over skipped
+  // (unavailable) decls.
+  void visitEmittedAccessors(AbstractStorageDecl *D,
+                             llvm::function_ref<void(AccessorDecl *)>);
+
   void emitEntryPoint(SourceFile *SF);
   void emitEntryPoint(SourceFile *SF, SILFunction *TopLevel);
 

lib/SILGen/SILGenDecl.cpp

@@ -1628,7 +1628,7 @@ void SILGenFunction::visitVarDecl(VarDecl *D) {
   });
 
   // Emit the variable's accessors.
-  D->visitEmittedAccessors([&](AccessorDecl *accessor) {
+  SGM.visitEmittedAccessors(D, [&](AccessorDecl *accessor) {
     SGM.emitFunction(accessor);
   });
 }

lib/SILGen/SILGenTopLevel.cpp

@@ -257,7 +257,7 @@ void SILGenTopLevel::visitAbstractFunctionDecl(AbstractFunctionDecl *AFD) {
 }
 
 void SILGenTopLevel::visitAbstractStorageDecl(AbstractStorageDecl *ASD) {
-  ASD->visitEmittedAccessors(
+  SGF.SGM.visitEmittedAccessors(ASD,
       [this](AccessorDecl *Accessor) { visitAbstractFunctionDecl(Accessor); });
 }
 
@@ -338,7 +338,7 @@ void SILGenTopLevel::TypeVisitor::visitAbstractFunctionDecl(
 
 void SILGenTopLevel::TypeVisitor::visitAbstractStorageDecl(
     AbstractStorageDecl *ASD) {
-  ASD->visitEmittedAccessors(
+  SGF.SGM.visitEmittedAccessors(ASD,
       [this](AccessorDecl *Accessor) { visitAbstractFunctionDecl(Accessor); });
 }
 

lib/SILGen/SILGenType.cpp

@@ -1242,7 +1242,7 @@ class SILGenType : public TypeMemberVisitor<SILGenType> {
   }
 
   void visitAccessors(AbstractStorageDecl *asd) {
-    asd->visitEmittedAccessors([&](AccessorDecl *accessor) {
+    SGM.visitEmittedAccessors(asd, [&](AccessorDecl *accessor) {
       visitFuncDecl(accessor);
     });
   }
@@ -1422,7 +1422,7 @@ class SILGenExtension : public TypeMemberVisitor<SILGenExtension> {
   }
 
   void visitAccessors(AbstractStorageDecl *asd) {
-    asd->visitEmittedAccessors([&](AccessorDecl *accessor) {
+    SGM.visitEmittedAccessors(asd, [&](AccessorDecl *accessor) {
       visitFuncDecl(accessor);
     });
   }

test/IRGen/unavailable_decl_optimization_complete_struct.swift

@@ -21,6 +21,15 @@ public struct AvailableStruct<T> {
     _modify { fatalError() }
   }
 
+  // CHECK-NO-STRIP: s4Test15AvailableStructV45availablePropertyWithSomeUnavailableAccessorsxvg
+  // CHECK-NO-STRIP: s4Test15AvailableStructV45availablePropertyWithSomeUnavailableAccessorsxvs
+  // CHECK-STRIP-NOT: s4Test15AvailableStructV45availablePropertyWithSomeUnavailableAccessorsxvs
+  public var availablePropertyWithSomeUnavailableAccessors: T {
+    get { fatalError() }
+    @available(*, unavailable)
+    set { fatalError() }
+  }
+
   // CHECK-NO-STRIP: s4Test15AvailableStructVyACyxGxcfC
   // CHECK-STRIP-NOT: s4Test15AvailableStructVyACyxGxcfC
   @available(*, unavailable)

test/embedded/accessor-unavailable.swift

@@ -0,0 +1,19 @@
+// RUN: %target-swift-frontend -emit-ir %s -enable-experimental-feature Embedded | %FileCheck %s
+
+// REQUIRES: swift_in_compiler
+// REQUIRES: VENDOR=apple
+// REQUIRES: OS=macosx
+
+struct Foo {
+  public subscript(x: Int) -> Int {
+    get {
+      return 0
+    }
+
+    @available(*, unavailable)
+    set { }
+  }
+}
+
+// CHECK: $s4main3FooVyS2icig
+// CHECK-NOT: $s4main3FooVyS2icis