Skip to content

Serialization: Minor improvements to the error on conformance mismatch #85990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xymus merged 1 commit into from
Dec 12, 2025
Merged

Serialization: Minor improvements to the error on conformance mismatch #85990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/swift/AST/DiagnosticsSema.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1092,8 +1092,8 @@ NOTE(modularization_issue_conformance_xref_note,none,
"Breaks conformances of '%0' to %1",
(StringRef, DeclName))
ERROR(modularization_issue_conformance_error,none,
"Conformances of '%0' "
"do not match requirement signature of %1; "
"Listed conformances of '%0' "
"do not match current requirement signature of %1; "
"%2 conformances for %3 requirements",
(StringRef, DeclName, unsigned int, unsigned int))

Expand Down
4 changes: 2 additions & 2 deletions lib/Serialization/Deserialization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9119,13 +9119,13 @@ void ModuleFile::finishNormalConformance(NormalProtocolConformance *conformance,

// Print context to stderr.
PrintOptions Opts;
llvm::errs() << "Requirements:\n";
llvm::errs() << "Requirements seen by this invocation:\n";
for (auto req: requirements) {
req.print(llvm::errs(), Opts);
llvm::errs() << "\n";
}

llvm::errs() << "Conformances:\n";
llvm::errs() << "\nConformances written in the swiftmodule:\n";
for (auto req: reqConformances) {
req.print(llvm::errs());
llvm::errs() << "\n";
Expand Down
6 changes: 3 additions & 3 deletions test/Serialization/Recovery/conformance-xref.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ extension Counter: SimpleProto {}
public protocol ProtoUser {
associatedtype Element
#if DROP_REQUIREMENT
// CHECK-REMARK-REQUIREMENT: MiddleLib.swiftmodule:1:1: error: Conformances of 'OneToAThousand' do not match requirement signature of 'ProtoUser'; 5 conformances for 6 requirements
// CHECK-REMARK-REQUIREMENT: Requirements:
// CHECK-REMARK-REQUIREMENT: MiddleLib.swiftmodule:1:1: error: Listed conformances of 'OneToAThousand' do not match current requirement signature of 'ProtoUser'; 5 conformances for 6 requirements
// CHECK-REMARK-REQUIREMENT: Requirements seen by this invocation:
// Skipping implicits.
// CHECK-REMARK-REQUIREMENT: Conformances:
// CHECK-REMARK-REQUIREMENT: Conformances written in the swiftmodule:
// Skipping implicits.
// CHECK-REMARK-REQUIREMENT: (specialized_conformance type="OneToAThousand.Impl" protocol="SimpleProto"
// CHECK-REMARK-REQUIREMENT: (normal_conformance type="Counter<T>" protocol="SimpleProto"{{.*}} lazy))
Expand Down