[TBDGen] Look for @_hasInitialValue on variables rather than an initializer expression.

The initializer expression is lost in the public interface (in Swift modules and
the textual interface), but the attribute is preserved.

Author: huonw

lib/TBDGen/TBDGen.cpp

@@ -41,21 +41,6 @@ static bool isGlobalOrStaticVar(VarDecl *VD) {
   return VD->isStatic() || VD->getDeclContext()->isModuleScopeContext();
 }
 
-void TBDGenVisitor::visitPatternBindingDecl(PatternBindingDecl *PBD) {
-  for (auto &entry : PBD->getPatternList()) {
-    auto *var = entry.getAnchoringVarDecl();
-
-    // Non-global variables might have an explicit initializer symbol.
-    if (entry.getNonLazyInit() && !isGlobalOrStaticVar(var)) {
-      auto declRef =
-          SILDeclRef(var, SILDeclRef::Kind::StoredPropertyInitializer);
-      // Stored property initializers for public properties are currently
-      // public.
-      addSymbol(declRef);
-    }
-  }
-}
-
 void TBDGenVisitor::addSymbol(SILDeclRef declRef) {
   auto linkage = effectiveLinkageForClassMember(
     declRef.getLinkage(ForDefinition),
@@ -169,6 +154,17 @@ void TBDGenVisitor::visitAbstractStorageDecl(AbstractStorageDecl *ASD) {
 }
 
 void TBDGenVisitor::visitVarDecl(VarDecl *VD) {
+  // Non-global variables might have an explicit initializer symbol, in
+  // non-resilient modules.
+  if (VD->getAttrs().hasAttribute<HasInitialValueAttr>() &&
+      SwiftModule->getResilienceStrategy() == ResilienceStrategy::Default &&
+      !isGlobalOrStaticVar(VD)) {
+    auto declRef = SILDeclRef(VD, SILDeclRef::Kind::StoredPropertyInitializer);
+    // Stored property initializers for public properties are currently
+    // public.
+    addSymbol(declRef);
+  }
+
   // statically/globally stored variables have some special handling.
   if (VD->hasStorage() && isGlobalOrStaticVar(VD)) {
     if (getDeclLinkage(VD) == FormalLinkage::PublicUnique) {

lib/TBDGen/TBDGenVisitor.h

@@ -90,8 +90,6 @@ class TBDGenVisitor : public ASTVisitor<TBDGenVisitor> {
   /// \brief Adds the global symbols associated with the first file.
   void addFirstFileSymbols();
 
-  void visitPatternBindingDecl(PatternBindingDecl *PBD);
-
   void visitAbstractFunctionDecl(AbstractFunctionDecl *AFD);
 
   void visitAccessorDecl(AccessorDecl *AD);

test/TBD/multi-file.swift

@@ -43,6 +43,8 @@ public func function() {}
 public class Class {
     public var property: Int
 
+    public var propertyWithInit: Int = 0
+
     public init() {
         property = 0
     }

test/TBD/struct.swift

@@ -1,11 +1,11 @@
-// RUN: %target-swift-frontend -emit-ir -o/dev/null -parse-as-library -module-name test -validate-tbd-against-ir=missing %s
-// RUN: %target-swift-frontend -emit-ir -o/dev/null -parse-as-library -module-name test -validate-tbd-against-ir=missing %s -enable-resilience
-// RUN: %target-swift-frontend -emit-ir -o/dev/null -parse-as-library -module-name test -validate-tbd-against-ir=missing %s -enable-testing
-// RUN: %target-swift-frontend -emit-ir -o/dev/null -parse-as-library -module-name test -validate-tbd-against-ir=missing %s -enable-resilience -enable-testing
-// RUN: %target-swift-frontend -emit-ir -o/dev/null -parse-as-library -module-name test -validate-tbd-against-ir=missing %s -O
-// RUN: %target-swift-frontend -emit-ir -o/dev/null -parse-as-library -module-name test -validate-tbd-against-ir=missing %s -enable-resilience -O
-// RUN: %target-swift-frontend -emit-ir -o/dev/null -parse-as-library -module-name test -validate-tbd-against-ir=missing %s -enable-testing -O
-// RUN: %target-swift-frontend -emit-ir -o/dev/null -parse-as-library -module-name test -validate-tbd-against-ir=missing %s -enable-resilience -enable-testing -O
+// RUN: %target-swift-frontend -emit-ir -o/dev/null -parse-as-library -module-name test -validate-tbd-against-ir=all %s
+// RUN: %target-swift-frontend -emit-ir -o/dev/null -parse-as-library -module-name test -validate-tbd-against-ir=all %s -enable-resilience
+// RUN: %target-swift-frontend -emit-ir -o/dev/null -parse-as-library -module-name test -validate-tbd-against-ir=all %s -enable-testing
+// RUN: %target-swift-frontend -emit-ir -o/dev/null -parse-as-library -module-name test -validate-tbd-against-ir=all %s -enable-resilience -enable-testing
+// RUN: %target-swift-frontend -emit-ir -o/dev/null -parse-as-library -module-name test -validate-tbd-against-ir=all %s -O
+// RUN: %target-swift-frontend -emit-ir -o/dev/null -parse-as-library -module-name test -validate-tbd-against-ir=all %s -enable-resilience -O
+// RUN: %target-swift-frontend -emit-ir -o/dev/null -parse-as-library -module-name test -validate-tbd-against-ir=all %s -enable-testing -O
+// RUN: %target-swift-frontend -emit-ir -o/dev/null -parse-as-library -module-name test -validate-tbd-against-ir=all %s -enable-resilience -enable-testing -O
 
 public struct PublicNothing {}