More feedback

Author: aschwaighofer

lib/Serialization/Serialization.cpp

@@ -2695,17 +2695,18 @@ void Serializer::writeDecl(const Decl *D) {
         auto getFilename = [](FileUnit *enclosingFile,
                               const ValueDecl *decl) -> StringRef {
           if (auto *SF = dyn_cast<SourceFile>(enclosingFile)) {
-            return SF->getFilename();
+            return llvm::sys::path::filename(SF->getFilename());
           } else if (auto *LF = dyn_cast<LoadedFile>(enclosingFile)) {
-            return LF->getFilenameForPrivateDecl(decl);
+            return llvm::sys::path::filename(
+                (LF->getFilenameForPrivateDecl(decl)));
           }
           return StringRef();
         };
         // Only if compiled with -enable-private-imports.
         if (M->arePrivateImportsEnabled()) {
           auto filename = getFilename(enclosingFile, value);
           if (!filename.empty()) {
-            auto filenameID = addFilename(llvm::sys::path::filename(filename));
+            auto filenameID = addFilename(filename);
             FilenameForPrivateLayout::emitRecord(
                 Out, ScratchRecord,
                 DeclTypeAbbrCodes[FilenameForPrivateLayout::Code], filenameID);

test/Serialization/Inputs/private_import_other.swift

@@ -1,3 +1,3 @@
 private struct Base {
-  private func shouldNotBeVisible() {}
+  private func bar() {}
 }

test/Serialization/Inputs/private_import_other_2.swift

@@ -1,5 +1,6 @@
 private struct Base {
   private func member() {}
+  private func bar() {}
 }
 
 private struct Other {

test/Serialization/private_import.swift

@@ -32,11 +32,6 @@
     private func foo() {}
   }
 
-  extension Base {
-    // This should not cause a failure.
-    private func shouldNotBeVisible() {}
-  }
-
   public func unreleated() {}
 
 	// This should not conflict with Other from private_import_other_2.swift.
@@ -47,6 +42,8 @@
   @_private(sourceFile: "private_import.swift") import client
 
   Base().foo()
+  // This should not be ambigious.
+  Base().bar()
 
   unreleated()
 #endif