SILGen: On-demand accessors in the primary file should still be emitted lazily

Otherwise we won't emit them if we synthesize them after visiting their
storage declaration.

Author: slavapestov

lib/SILGen/SILGen.cpp

@@ -613,14 +613,14 @@ static bool isEmittedOnDemand(SILModule &M, SILDeclRef constant) {
   if (isa<ClangModuleUnit>(dc))
     return true;
 
-  if (auto *sf = dyn_cast<SourceFile>(dc))
-    if (M.isWholeModule() || M.getAssociatedContext() == dc)
-      return false;
-
   if (auto *func = dyn_cast<FuncDecl>(d))
     if (func->hasForcedStaticDispatch())
       return true;
 
+  if (auto *sf = dyn_cast<SourceFile>(dc))
+    if (M.isWholeModule() || M.getAssociatedContext() == dc)
+      return false;
+
   return false;
 }
 

lib/SILGen/SILGenType.cpp

@@ -1050,7 +1050,8 @@ class SILGenType : public TypeMemberVisitor<SILGenType> {
 
   void visitAccessors(AbstractStorageDecl *asd) {
     for (auto *accessor : asd->getAllAccessors())
-      visitFuncDecl(accessor);
+      if (!accessor->hasForcedStaticDispatch())
+        visitFuncDecl(accessor);
   }
 };
 
@@ -1180,7 +1181,8 @@ class SILGenExtension : public TypeMemberVisitor<SILGenExtension> {
 
   void visitAccessors(AbstractStorageDecl *asd) {
     for (auto *accessor : asd->getAllAccessors())
-      visitFuncDecl(accessor);
+      if (!accessor->hasForcedStaticDispatch())
+        visitFuncDecl(accessor);
   }
 };
 

test/SILGen/read_accessor.swift

@@ -181,14 +181,14 @@ protocol ReadableTitle {
 class OverridableGetter : ReadableTitle {
   var title: String = ""
 }
-//   The concrete read accessor is generated on-demand and does a class dispatch to the getter.
-// CHECK-LABEL: sil shared [ossa] @$s13read_accessor17OverridableGetterC5titleSSvr
-// CHECK:       class_method %0 : $OverridableGetter, #OverridableGetter.title!getter.1
-// CHECK-LABEL: // end sil function '$s13read_accessor17OverridableGetterC5titleSSvr'
 //   The read witness thunk does a direct call to the concrete read accessor.
 // CHECK-LABEL: sil private [transparent] [thunk] [ossa] @$s13read_accessor17OverridableGetterCAA13ReadableTitleA2aDP5titleSSvrTW
 // CHECK:       function_ref @$s13read_accessor17OverridableGetterC5titleSSvr
 // CHECK-LABEL: // end sil function '$s13read_accessor17OverridableGetterCAA13ReadableTitleA2aDP5titleSSvrTW'
+//   The concrete read accessor is generated on-demand and does a class dispatch to the getter.
+// CHECK-LABEL: sil shared [ossa] @$s13read_accessor17OverridableGetterC5titleSSvr
+// CHECK:       class_method %0 : $OverridableGetter, #OverridableGetter.title!getter.1
+// CHECK-LABEL: // end sil function '$s13read_accessor17OverridableGetterC5titleSSvr'
 
 protocol GettableTitle {
   var title: String { get }
@@ -197,11 +197,11 @@ class OverridableReader : GettableTitle {
   @_borrowed
   var title: String = ""
 }
-//   The concrete getter is generated on-demand and does a class dispatch to the read accessor.
-// CHECK-LABEL: sil shared [ossa] @$s13read_accessor17OverridableReaderC5titleSSvg
-// CHECK:       class_method %0 : $OverridableReader, #OverridableReader.title!read.1
-// CHECK-LABEL: // end sil function '$s13read_accessor17OverridableReaderC5titleSSvg'
 //   The getter witness thunk does a direct call to the concrete getter.
 // CHECK-LABEL: sil private [transparent] [thunk] [ossa] @$s13read_accessor17OverridableReaderCAA13GettableTitleA2aDP5titleSSvgTW
 // CHECK:       function_ref @$s13read_accessor17OverridableReaderC5titleSSvg
 // CHECK-LABEL: // end sil function '$s13read_accessor17OverridableReaderCAA13GettableTitleA2aDP5titleSSvgTW'
+//   The concrete getter is generated on-demand and does a class dispatch to the read accessor.
+// CHECK-LABEL: sil shared [ossa] @$s13read_accessor17OverridableReaderC5titleSSvg
+// CHECK:       class_method %0 : $OverridableReader, #OverridableReader.title!read.1
+// CHECK-LABEL: // end sil function '$s13read_accessor17OverridableReaderC5titleSSvg'