---

yaml
---
r: 275263
b: refs/heads/master-next
c: f049269
h: refs/heads/master
i:
  275261: 59e1c6d
  275259: 4855d68
  275255: f12751c
  275247: fdd25c0
  275231: c5bf628
  275199: 8aa8ecf

Author: aschwaighofer

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 65b3164726f2e62dff31e90a5cb5e3fb67cc82bf
-refs/heads/master-next: 5d160b68a5b41a467dd1a32ec066a044f4364117
+refs/heads/master-next: f0492690d19310ea0cd9bd0ce6a2c5e17fdd294b
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/lib/Serialization/Serialization.cpp

@@ -2703,14 +2703,14 @@ void Serializer::writeDecl(const Decl *D) {
         access <= swift::AccessLevel::FilePrivate &&
         !value->getDeclContext()->isLocalContext();
 
-    // Emit the the filename for private mapping for private decls or internal
+    // Emit the the filename for private mapping for private decls and
     // decls with private accessors if compiled with -enable-private-imports.
     bool shouldEmitFilenameForPrivate =
         M->arePrivateImportsEnabled() &&
         !value->getDeclContext()->isLocalContext() &&
         (access <= swift::AccessLevel::FilePrivate ||
          (storage &&
-          storage->getFormalAccess() == swift::AccessLevel::Internal &&
+          storage->getFormalAccess() >= swift::AccessLevel::Internal &&
           storage->hasPrivateAccessor()));
 
     if (shouldEmitFilenameForPrivate || shouldEmitPrivateDescriminator) {

branches/master-next/test/Serialization/Inputs/private_import_other.swift

@@ -12,4 +12,6 @@ extension Value {
 struct Internal {
     private(set) var internalVarWithPrivateSetter : Int = 0
     fileprivate(set) var internalVarWithFilePrivateSetter : Int = 0
+    public private(set) var publicVarWithPrivateSetter : Int = 0
+    public fileprivate(set) var publicVarWithFilePrivateSetter : Int = 0
 }

branches/master-next/test/Serialization/private_import.swift

@@ -45,6 +45,8 @@
     mutating func set() {
       self.internalVarWithPrivateSetter = 1
       self.internalVarWithFilePrivateSetter = 1
+      self.publicVarWithPrivateSetter = 1
+      self.publicVarWithFilePrivateSetter = 1
     }
   }