Diagnostics: Use public module name in diagnostics

Author: xymus

lib/AST/DiagnosticEngine.cpp

@@ -799,7 +799,9 @@ static void formatDiagnosticArgument(StringRef Modifier,
     // Figure out the name we want to print.
     DeclName name;
     if (includeName) {
-      if (auto VD = dyn_cast<ValueDecl>(D))
+      if (auto MD = dyn_cast<ModuleDecl>(D))
+        name = MD->getPublicModuleName(/*mustBeVisible=*/true);
+      else if (auto VD = dyn_cast<ValueDecl>(D))
         name = VD->getName();
       else if (auto PGD = dyn_cast<PrecedenceGroupDecl>(D))
         name = PGD->getName();
@@ -1371,7 +1373,9 @@ DiagnosticEngine::diagnosticInfoForDiagnostic(const Diagnostic &diagnostic) {
           // build the name of the buffer.
           SmallVector<StringRef, 4> nameComponents;
           while (dc) {
-            nameComponents.push_back(cast<ModuleDecl>(dc)->getName().str());
+            auto publicName = cast<ModuleDecl>(dc)->
+                                getPublicModuleName(/*mustBeVisible*/true);
+            nameComponents.push_back(publicName.str());
             dc = dc->getParent();
           }
 

test/Sema/public-module-name.swift

@@ -0,0 +1,117 @@
+// RUN: %empty-directory(%t)
+// RUN: split-file --leading-lines %s %t
+
+/// Build the libraries.
+// RUN: %target-swift-frontend %t/LibCore.swift \
+// RUN:   -emit-module-path %t/LibCore.swiftmodule \
+// RUN:   -emit-module-interface-path %t/LibCore.swiftinterface \
+// RUN:   -enable-library-evolution -swift-version 6 \
+// RUN:   -public-module-name Lib
+// RUN: %target-swift-typecheck-module-from-interface(%t/LibCore.swiftinterface)
+
+// RUN: %target-swift-frontend %t/LibMiddle.swift -I %t \
+// RUN:   -emit-module-path %t/LibMiddle.swiftmodule \
+// RUN:   -emit-module-interface-path %t/LibMiddle.swiftinterface \
+// RUN:   -enable-library-evolution -swift-version 6 \
+// RUN:   -public-module-name Lib
+// RUN: %target-swift-typecheck-module-from-interface(%t/LibMiddle.swiftinterface) -I %t
+
+// RUN: %target-swift-frontend %t/Lib.swift -I %t \
+// RUN:   -emit-module-path %t/Lib.swiftmodule \
+// RUN:   -emit-module-interface-path %t/Lib.swiftinterface \
+// RUN:   -enable-library-evolution -swift-version 6
+// RUN: %target-swift-typecheck-module-from-interface(%t/Lib.swiftinterface) -I %t
+
+// RUN: %target-swift-frontend %t/LibUnrelated.swift -I %t \
+// RUN:   -emit-module-path %t/LibUnrelated.swiftmodule \
+// RUN:   -enable-library-evolution -swift-version 6
+
+/// Check flag in swiftinterface
+// RUN: cat %t/LibCore.swiftinterface | %FileCheck --check-prefix=CHECK-FLAG %s
+// RUN: cat %t/LibMiddle.swiftinterface | %FileCheck --check-prefix=CHECK-FLAG %s
+// CHECK-FLAG: -public-module-name Lib
+
+/// Build clients against binary swiftmodules.
+/// First errors in files, then diagnostics in other files.
+// RUN: %target-swift-frontend -typecheck %t/ClientPublic.swift -o %t -I %t \
+// RUN:   -enable-library-evolution -swift-version 6 \
+// RUN:   -verify
+// RUN: not %target-swift-frontend -typecheck %t/ClientPublic.swift -o %t -I %t \
+// RUN:   -enable-library-evolution -swift-version 6 \
+// RUN:   -diagnostic-style llvm \
+// RUN:   2>&1 | %FileCheck %t/ClientPublic.swift
+
+// RUN: %target-swift-frontend -typecheck %t/ClientMiddle.swift -o %t -I %t \
+// RUN:   -enable-library-evolution -swift-version 6 \
+// RUN:   -verify
+// RUN: not %target-swift-frontend -typecheck %t/ClientMiddle.swift -o %t -I %t \
+// RUN:   -enable-library-evolution -swift-version 6 \
+// RUN:   2>&1 | %FileCheck %t/ClientMiddle.swift
+
+/// Test more diagnostics referencing modules.
+// RUN: %target-swift-frontend -typecheck %t/ClientAccessLevelOnImports.swift -o %t -I %t \
+// RUN:   -enable-library-evolution -swift-version 6 \
+// RUN:   -verify
+
+/// Build client against textual swiftinterfaces.
+// RUN: rm %t/LibCore.swiftmodule %t/LibMiddle.swiftmodule %t/Lib.swiftmodule
+// RUN: %target-swift-frontend -typecheck %t/ClientPublic.swift -I %t \
+// RUN:   -enable-library-evolution -swift-version 6 \
+// RUN:   -verify
+// RUN: not %target-swift-frontend -typecheck %t/ClientPublic.swift -o %t -I %t \
+// RUN:   -enable-library-evolution -swift-version 6 \
+// RUN:   -diagnostic-style llvm \
+// RUN:   2>&1 | %FileCheck %t/ClientPublic.swift
+
+// RUN: %target-swift-frontend -typecheck %t/ClientMiddle.swift -o %t -I %t \
+// RUN:   -enable-library-evolution -swift-version 6 \
+// RUN:   -verify
+// RUN: not %target-swift-frontend -typecheck %t/ClientMiddle.swift -o %t -I %t \
+// RUN:   -enable-library-evolution -swift-version 6 \
+// RUN:   2>&1 | %FileCheck %t/ClientMiddle.swift
+
+// RUN: %target-swift-frontend -typecheck %t/ClientAccessLevelOnImports.swift -o %t -I %t \
+// RUN:   -enable-library-evolution -swift-version 6 \
+// RUN:   -verify
+
+//--- LibCore.swift
+public func ambiguous() {}
+public func coreFunc() {}
+
+//--- LibMiddle.swift
+import LibCore
+public func ambiguous() {}
+
+//--- Lib.swift
+@_exported import LibCore
+@_exported import LibMiddle
+
+//--- LibUnrelated.swift
+public func ambiguous() {}
+
+//--- ClientPublic.swift
+import Lib
+import LibUnrelated
+
+ambiguous() // expected-error {{ambiguous use of 'ambiguous()'}}
+// CHECK-NOT: LibCore
+// CHECK-NOT: LibMiddle
+// CHECK: LibUnrelated.ambiguous:1:13: note: found this candidate in module 'LibUnrelated'
+// CHECK: Lib.ambiguous:1:13: note: found this candidate in module 'Lib'
+// CHECK: Lib.ambiguous:1:13: note: found this candidate in module 'Lib'
+
+//--- ClientMiddle.swift
+import LibCore
+import LibMiddle
+
+ambiguous() // expected-error {{ambiguous use of 'ambiguous()'}}
+// CHECK: LibCore.ambiguous:1:13: note: found this candidate in module 'LibCore'
+// CHECK: LibMiddle.ambiguous:1:13: note: found this candidate in module 'LibMiddle'
+
+//--- ClientAccessLevelOnImports.swift
+internal import Lib // expected-note {{global function 'coreFunc()' imported as 'internal' from 'Lib' here}}
+
+@inlinable
+public func foo() {
+    coreFunc() // expected-error {{global function 'coreFunc()' is internal and cannot be referenced from an '@inlinable' function}}
+}