WIP

Author: tshortli

lib/AST/Decl.cpp

@@ -8973,17 +8973,24 @@ bool IsFunctionBodySkippedRequest::evaluate(
   if (isa<ClangModuleUnit>(afd->getDeclContext()->getModuleScopeContext()))
     return false;
 
-  if (auto *AD = dyn_cast<AccessorDecl>(afd)) {
+  if (auto *accessor = dyn_cast<AccessorDecl>(afd)) {
     // didSet accessors needs to be checked to determine whether to keep their
     // parameters.
-    if (AD->getAccessorKind() == AccessorKind::DidSet)
+    if (accessor->getAccessorKind() == AccessorKind::DidSet)
       return false;
 
     // Synthesized accessors with forced static dispatch are emitted on-demand
     // and are serialized. Since they are serialized we must be willing to
     // typecheck them.
-    if (AD->hasForcedStaticDispatch())
+    if (accessor->hasForcedStaticDispatch())
       return false;
+
+    if (auto *varDecl = dyn_cast<VarDecl>(accessor->getStorage())) {
+      // FIXME: If we don't typecheck the synthesized accessors of lazy storage
+      // properties then SILGen crashes when emitting the initializer.
+      if (varDecl->getAttrs().hasAttribute<LazyAttr>() && accessor->isSynthesized())
+        return false;
+    }
   }
 
   // Actor initializers need to be checked to determine delegation status.

lib/SILOptimizer/UtilityPasses/SILSkippingChecker.cpp

@@ -73,6 +73,12 @@ static bool shouldHaveSkippedFunction(const SILFunction &F) {
 
     if (AD->hasForcedStaticDispatch())
       return false;
+
+    // ALLANXXX
+//    if (auto *varDecl = dyn_cast<VarDecl>(accessor->getStorage())) {
+//      if (varDecl->isLazyStorageProperty() && accessor->isSynthesized())
+//        return false;
+//    }
   }
 
   // Functions with @backDeployed may be copied into the client, so they

test/SILGen/skip-function-bodies-clang-enum-init-raw-value.swift

@@ -16,6 +16,6 @@
 
 // CHECK-SKIP-ALL-NOT: sSo7YesOrNoV8rawValueABSgs6UInt32V_tcfC
 
-// CHECK: sil shared [serialized]{{.*}} @$sSo7YesOrNoV8rawValueABSgs6UInt32V_tcfC : $@convention(method) (UInt32, @thin YesOrNo.Type) -> Optional<YesOrNo> {
+// CHECK: sil shared [serialized]{{.*}} @$sSo7YesOrNoV8rawValueABSgs6UInt32V_tcfC : $@convention(method) ({{.*}}, @thin YesOrNo.Type) -> Optional<YesOrNo> {
 // CHECK:   return {{%.*}} : $Optional<YesOrNo>
 // CHECK: } // end sil function '$sSo7YesOrNoV8rawValueABSgs6UInt32V_tcfC'

test/SILGen/skip-function-bodies-lazy-property.swift

@@ -0,0 +1,17 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -emit-silgen %s -experimental-skip-non-inlinable-function-bodies | %FileCheck %s
+// RUN: %target-swift-frontend -emit-silgen %s -experimental-skip-non-inlinable-function-bodies-without-types | %FileCheck %s
+// RUN: %target-swift-frontend -emit-silgen %s -experimental-skip-all-function-bodies | %FileCheck %s --check-prefix=CHECK-SKIP-ALL
+
+// CHECK: sil
+
+// CHECK-SKIP-ALL-NOT: ALLANXXX
+
+public struct S {
+  public var notLazy = 1
+  public lazy var x: Int = generateNumber()
+
+  func generateNumber() -> Int {
+    return 1
+  }
+}