carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-09-24 19:50:14 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Avoid mismatched InterfaceId comparison between two files (#6241)

Browse Source 
Co-authored-by: Dana Jansens <danakj@orodu.net>
This commit is contained in:
David Blaikie
2025-10-20 18:44:05 +00:00
committed by GitHub
co-authored by Dana Jansens
parent b1f734e1cd
commit 0ed5d41a1b
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/impl_validation.cpp
+13 -3
View File
@@ -366,12 +366,22 @@ static auto ImportFinalImplsWithImplInFile(Context& context) -> void {
auto interface_id = impl.interface.interface_id;
const auto& interface = context.interfaces().Get(interface_id);
auto import_ir_id = GetIRId(context, interface.first_owning_decl_id);
if (!import_ir_id.has_value()) {
if (!interface.first_owning_decl_id.has_value()) {
continue;
}
const auto& import_ir_inst =
GetCanonicalImportIRInst(context, interface.first_owning_decl_id);
if (!import_ir_inst.ir_id().has_value()) {
continue;
}
interfaces_to_import.push_back(
{.ir_id = import_ir_id, .interface_id = interface_id});
{.ir_id = import_ir_inst.ir_id(),
.interface_id =
context.import_irs()
.Get(import_ir_inst.ir_id())
.sem_ir->insts()
.GetAs<SemIR::InterfaceDecl>(import_ir_inst.inst_id())
.interface_id});
}
llvm::sort(interfaces_to_import);
toolchain/check/testdata/impl/lookup/impl_overlap.carbon
Vendored
+7 -3
View File
@@ -22,6 +22,10 @@ interface Z(T:! type) {}
// --- interface_z_with_impl.carbon
library "[[@TEST_NAME]]";
// Add an extra unused interface to bump `Z`'s id up so that it doesn't
// accidentally match the id assigned to the imported copy of `Z`.
interface Other(T:! type) {}
interface Z(T:! type) {}
final impl forall [T:! type] T as Z(T) {}
@@ -176,7 +180,7 @@ class C;
// CHECK:STDERR: final impl C as Z(()) {}
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~~~~
// CHECK:STDERR: fail_final_impl_with_both_interface_and_self_but_different_files.carbon:[[@LINE-10]]:1: in import [InImport]
// CHECK:STDERR: interface_z_with_impl.carbon:5:1: note: imported `final impl` here [FinalImplOverlapsDifferentFileNote]
// CHECK:STDERR: interface_z_with_impl.carbon:9:1: note: imported `final impl` here [FinalImplOverlapsDifferentFileNote]
// CHECK:STDERR: final impl forall [T:! type] T as Z(T) {}
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// CHECK:STDERR:
@@ -196,7 +200,7 @@ class C;
// CHECK:STDERR: final impl C as Z(C) {}
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~~~
// CHECK:STDERR: fail_final_overlaps_final_from_other_file.carbon:[[@LINE-10]]:1: in import [InImport]
// CHECK:STDERR: interface_z_with_impl.carbon:5:1: note: imported `final impl` here [FinalImplOverlapsDifferentFileNote]
// CHECK:STDERR: interface_z_with_impl.carbon:9:1: note: imported `final impl` here [FinalImplOverlapsDifferentFileNote]
// CHECK:STDERR: final impl forall [T:! type] T as Z(T) {}
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// CHECK:STDERR:
@@ -215,7 +219,7 @@ class C;
// CHECK:STDERR: impl C as Z(C) {}
// CHECK:STDERR: ^~~~~~~~~~~~~~~~
// CHECK:STDERR: fail_final_overlaps_non_final_from_other_file.carbon:[[@LINE-9]]:1: in import [InImport]
// CHECK:STDERR: interface_z_with_impl.carbon:5:1: note: `final impl` declared here would always be used instead [ImplFinalOverlapsNonFinalNote]
// CHECK:STDERR: interface_z_with_impl.carbon:9:1: note: `final impl` declared here would always be used instead [ImplFinalOverlapsNonFinalNote]
// CHECK:STDERR: final impl forall [T:! type] T as Z(T) {}
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// CHECK:STDERR: