Merge pull request swiftlang#20490 from aschwaighofer/feedback_private_import

Author: swift-ci

lib/Serialization/Serialization.cpp

@@ -2691,8 +2691,7 @@ void Serializer::writeDecl(const Decl *D) {
           if (auto *SF = dyn_cast<SourceFile>(enclosingFile)) {
             return llvm::sys::path::filename(SF->getFilename());
           } else if (auto *LF = dyn_cast<LoadedFile>(enclosingFile)) {
-            return llvm::sys::path::filename(
-                (LF->getFilenameForPrivateDecl(decl)));
+            return LF->getFilenameForPrivateDecl(decl);
           }
           return StringRef();
         };

test/Serialization/Inputs/private_import_other.swift

@@ -1,3 +1,10 @@
 private struct Base {
   private func bar() {}
 }
+
+struct Value {
+}
+
+extension Value {
+  fileprivate func foo() {}
+}

test/Serialization/Inputs/private_import_other_2.swift

@@ -5,3 +5,7 @@ private struct Base {
 
 private struct Other {
 }
+
+extension Value {
+  fileprivate func foo() {}
+}

test/Serialization/private_import.swift

@@ -44,6 +44,8 @@
   Base().foo()
   // This should not be ambigious.
   Base().bar()
-
+  // This should not conflict with the second declaration in
+  // private_import_other_2.swift.
+  Value().foo()
   unreleated()
 #endif

test/attr/private_import.swift

@@ -4,5 +4,6 @@
 
 @_private(sourceFile: "Array.swift") import Swift // expected-error {{module 'Swift' was not compiled for private import}}
 @_private(sourceFile: "empty.swift") import empty // no-error
+@_private(sourceFile: "not_existing_file.swift") import empty // no-error
 
 @_private(sourceFile: "none") func foo() {} // expected-error {{@_private may only be used on 'import' declarations}} {{1-31=}}