Disable accessor generation for nameless vars

Author: Harlan Haskins

lib/Sema/CodeSynthesis.cpp

@@ -994,6 +994,11 @@ static void addOpaqueAccessorToStorage(TypeChecker &TC,
 
 static void addExpectedOpaqueAccessorsToStorage(TypeChecker &TC,
                                                 AbstractStorageDecl *storage) {
+  // Nameless vars from interface files should not have any accessors.
+  // TODO: Replace this check with a broader check that all storage decls
+  //       from interface files have all their accessors up front.
+  if (storage->getBaseName().empty())
+    return;
   storage->visitExpectedOpaqueAccessors([&](AccessorKind kind) {
     // If the accessor is already present, there's nothing to do.
     if (storage->getAccessor(kind))

lib/Sema/TypeCheckDecl.cpp

@@ -945,6 +945,8 @@ static void checkRedeclaration(TypeChecker &tc, ValueDecl *current) {
 
 /// Does the context allow pattern bindings that don't bind any variables?
 static bool contextAllowsPatternBindingWithoutVariables(DeclContext *dc) {
+  
+  // Property decls in type context must bind variables.
   if (dc->isTypeContext())
     return false;
 

test/ModuleInterface/private-stored-members.swift

@@ -1,69 +1,96 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-frontend -emit-module -o %t/Test~partial.swiftmodule -module-name Test -primary-file %s
-// RUN: %target-swift-frontend -merge-modules -emit-module -o %t/Test.swiftmodule %t/Test~partial.swiftmodule
-// RUN: %target-swift-ide-test -print-module -module-to-print=Test -source-filename=x -I %t | %FileCheck %s
 
-// RUN: %target-swift-frontend -emit-interface-path %t.swiftinterface -enable-resilience -emit-module -o /dev/null %s
+// RUN: %target-swift-frontend -emit-interface-path %t.swiftinterface -emit-module -o /dev/null %s
 // RUN: %FileCheck %s < %t.swiftinterface
 
+// RUN: %target-swift-frontend -emit-interface-path %t-resilient.swiftinterface -enable-resilience -emit-module -o /dev/null %s
+// RUN: %FileCheck %s --check-prefix RESILIENT < %t-resilient.swiftinterface
+
+// RUN: %target-swift-frontend -emit-module -o %t/Test.swiftmodule %t.swiftinterface -disable-objc-attr-requires-foundation-module
+// FIXME(rdar44144435): %target-swift-frontend -emit-module -o /dev/null -merge-modules %t/Test.swiftmodule -emit-interface-path - | %FileCheck %s
+
+// RUN: %target-swift-frontend -emit-module -o %t/TestResilient.swiftmodule -enable-resilience %t.swiftinterface -disable-objc-attr-requires-foundation-module
+// FIXME(rdar44144435): %target-swift-frontend -emit-module -o /dev/null -merge-modules %t/Test.swiftmodule -enable-resilience -emit-interface-path - | %FileCheck %s
+
+
 // CHECK: struct MyStruct {{{$}}
+// RESILIENT: struct MyStruct {{{$}}
 public struct MyStruct {
 // CHECK-NEXT: var publicVar: Int{{$}}
+// RESILIENT-NEXT: var publicVar: Int{{$}}
   public var publicVar: Int
 
 // CHECK-NEXT: let publicLet: Bool{{$}}
+// RESILIENT-NEXT: let publicLet: Bool{{$}}
   public let publicLet: Bool
 
 // CHECK-NEXT: internal var _: String{{$}}
+// RESILIENT-NOT: internal var _: String{{$}}
   var internalVar: String
 
 // CHECK-NEXT: internal let _: Bool{{$}}
+// RESILIENT-NOT: internal let _: Bool{{$}}
   let internalLet: Bool
 
 // CHECK-NEXT: private var _: String{{$}}
+// RESILIENT-NOT: private var _: String{{$}}
   private var privateVar: String
 
 // CHECK-NEXT: private let _: Bool{{$}}
+// RESILIENT-NOT: private let _: Bool{{$}}
   private let privateLet: Bool
 
 // CHECK-NOT: private var
+// RESILIENT-NOT: private var
   private var computedPrivateVar: String {
     return "computedPrivateVar"
   }
 
 // CHECK-NOT: private static var
+// RESILIENT-NOT: private static var
   private static var staticPrivateVar: String = ""
 
 // CHECK: }{{$}}
+// RESILIENT: }{{$}}
 }
 
 // CHECK: class MyClass {{{$}}
+// RESILIENT: class MyClass {{{$}}
 public class MyClass {
-// CHECK-NEXT: public var publicVar: Int{{$}}
+// CHECK-NEXT: var publicVar: Int{{$}}
+// RESILIENT-NEXT: var publicVar: Int{{$}}
   public var publicVar: Int = 0
 
-// CHECK-NEXT: public let publicLet: Bool{{$}}
+// CHECK-NEXT: let publicLet: Bool{{$}}
+// RESILIENT-NEXT: let publicLet: Bool{{$}}
   public let publicLet: Bool = true
 
 // CHECK-NEXT: internal var _: String{{$}}
+// RESILIENT-NOT: internal var _: String{{$}}
   var internalVar: String = ""
 
 // CHECK-NEXT: internal let _: Bool{{$}}
+// RESILIENT-NOT: internal let _: Bool{{$}}
   let internalLet: Bool = true
 
 // CHECK-NEXT: private var _: String{{$}}
+// RESILIENT-NOT: private var _: String{{$}}
   private var privateVar: String = ""
 
 // CHECK-NEXT: private let _: Bool{{$}}
+// RESILIENT-NOT: private let _: Bool{{$}}
   private let privateLet: Bool = true
 
 // CHECK-NOT: private var
+// RESILIENT-NOT: private var
   private var computedPrivateVar: String {
     return "computedPrivateVar"
   }
 
 // CHECK-NOT: private static var
+// RESILIENT-NOT: private static var
   private static var staticPrivateVar: String = ""
 
 // CHECK: }{{$}}
+// RESILIENT: }{{$}}
 }