Skip to content

Commit 92a1615

Browse files
committed
[Frontend] Add import decl loc to messages from -Rmodule-loading
1 parent de42b1f commit 92a1615

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

include/swift/AST/DiagnosticsSema.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -909,7 +909,7 @@ REMARK(cross_import_added,none,
909909
(Identifier, Identifier, Identifier))
910910

911911
REMARK(module_loaded,none,
912-
"loaded module from %0",
912+
"loaded module at %0",
913913
(StringRef))
914914

915915
// Operator decls

lib/AST/ASTContext.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1922,7 +1922,7 @@ ASTContext::getModule(ImportPath::Module ModulePath) {
19221922
for (auto &importer : getImpl().ModuleLoaders) {
19231923
if (ModuleDecl *M = importer->loadModule(moduleID.Loc, ModulePath)) {
19241924
if (LangOpts.EnableModuleLoadingRemarks) {
1925-
Diags.diagnose(nullptr,
1925+
Diags.diagnose(ModulePath.getSourceRange().Start,
19261926
diag::module_loaded,
19271927
M->getModuleFilename());
19281928
}

test/ModuleInterface/loading-remarks.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
// RUN: %target-swift-frontend -typecheck %s -I %t -Rmodule-loading 2>&1 | %FileCheck %s
1010

1111
import TestModule
12-
// CHECK: remark: loaded module from {{.*}}SwiftShims-{{.*}}.pcm
13-
// CHECK: remark: loaded module from {{.*}}Swift.swiftmodule{{.*}}.swiftmodule
14-
// CHECK: remark: loaded module from {{.*}}TestModule.swiftinterface
12+
// CHECK: remark: loaded module at {{.*}}SwiftShims-{{.*}}.pcm
13+
// CHECK: remark: loaded module at {{.*}}Swift.swiftmodule{{.*}}.swiftmodule
14+
// CHECK: remark: loaded module at {{.*}}TestModule.swiftinterface

0 commit comments

Comments
 (0)