carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 22:02:55 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Fix cross-package signature mismatches. (#7232)

Browse Source 
Fixes link failures when referencing a symbol involving a fingerprint
from a different package.

Previously we included the `Namespace`'s `import_id` as part of its
fingerprint, which caused local and imported namespaces to get different
fingerprints. We now store the `import_id` on the `NameScope` instead of
on the `Namespace` inst to avoid this problem.

Also, when we reach a package-level `NameScopeId`, consistently
fingerprint it as a (package name, library name) pair. Previously the
fingerprinting depended on whether it was imported or not, as an
imported `NameScopeId` had a parent scope (the current package). We need
to include the library name here so that private entities with the same
name in different libraries have different fingerprints.
This commit is contained in:
Richard Smith
2026-05-21 00:02:29 +00:00
committed by GitHub
parent 1231098c14
commit 05cc09daca
662 changed files with 51181 additions and 50920 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/testdata/pointer/nested_const.carbon
Vendored
+51 -51
View File
@@ -25,31 +25,31 @@ fn F(p: const (const (const i32*)*)) -> const i32 {
// CHECK:STDOUT: %Int.generic: %Int.type = struct_value () [concrete]
// CHECK:STDOUT: %N: Core.IntLiteral = symbolic_binding N, 0 [symbolic]
// CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [concrete]
// CHECK:STDOUT: %const.20a: type = const_type %i32 [concrete]
// CHECK:STDOUT: %ptr.36b: type = ptr_type %const.20a [concrete]
// CHECK:STDOUT: %const.58f: type = const_type %ptr.36b [concrete]
// CHECK:STDOUT: %ptr.6e8: type = ptr_type %const.58f [concrete]
// CHECK:STDOUT: %const.fa2: type = const_type %ptr.6e8 [concrete]
// CHECK:STDOUT: %pattern_type.800: type = pattern_type %const.fa2 [concrete]
// CHECK:STDOUT: %.121: Core.Form = init_form %const.20a [concrete]
// CHECK:STDOUT: %pattern_type.a65: type = pattern_type %const.20a [concrete]
// CHECK:STDOUT: %const.da1: type = const_type %i32 [concrete]
// CHECK:STDOUT: %ptr.768: type = ptr_type %const.da1 [concrete]
// CHECK:STDOUT: %const.46b: type = const_type %ptr.768 [concrete]
// CHECK:STDOUT: %ptr.c64: type = ptr_type %const.46b [concrete]
// CHECK:STDOUT: %const.5d8: type = const_type %ptr.c64 [concrete]
// CHECK:STDOUT: %pattern_type.d89: type = pattern_type %const.5d8 [concrete]
// CHECK:STDOUT: %.001: Core.Form = init_form %const.da1 [concrete]
// CHECK:STDOUT: %pattern_type.807: type = pattern_type %const.da1 [concrete]
// CHECK:STDOUT: %F.type: type = fn_type @F [concrete]
// CHECK:STDOUT: %F: %F.type = struct_value () [concrete]
// CHECK:STDOUT: %Copy.type: type = facet_type <@Copy> [concrete]
// CHECK:STDOUT: %Int.as.Copy.impl.Op.type.161: type = fn_type @Int.as.Copy.impl.Op, @Int.as.Copy.impl(%N) [symbolic]
// CHECK:STDOUT: %Int.as.Copy.impl.Op.012: %Int.as.Copy.impl.Op.type.161 = struct_value () [symbolic]
// CHECK:STDOUT: %T.035: %Copy.type = symbolic_binding T, 0 [symbolic]
// CHECK:STDOUT: %const.as.Copy.impl.Op.type.7ab: type = fn_type @const.as.Copy.impl.Op, @const.as.Copy.impl(%T.035) [symbolic]
// CHECK:STDOUT: %const.as.Copy.impl.Op.e11: %const.as.Copy.impl.Op.type.7ab = struct_value () [symbolic]
// CHECK:STDOUT: %Copy.impl_witness.30d: <witness> = impl_witness imports.%Copy.impl_witness_table.1ee, @Int.as.Copy.impl(%int_32) [concrete]
// CHECK:STDOUT: %Copy.facet.d1a: %Copy.type = facet_value %i32, (%Copy.impl_witness.30d) [concrete]
// CHECK:STDOUT: %Copy.impl_witness.38b: <witness> = impl_witness imports.%Copy.impl_witness_table.f86, @const.as.Copy.impl(%Copy.facet.d1a) [concrete]
// CHECK:STDOUT: %const.as.Copy.impl.Op.type.b50: type = fn_type @const.as.Copy.impl.Op, @const.as.Copy.impl(%Copy.facet.d1a) [concrete]
// CHECK:STDOUT: %const.as.Copy.impl.Op.129: %const.as.Copy.impl.Op.type.b50 = struct_value () [concrete]
// CHECK:STDOUT: %Copy.facet.e9d: %Copy.type = facet_value %const.20a, (%Copy.impl_witness.38b) [concrete]
// CHECK:STDOUT: %Copy.WithSelf.Op.type.7a0: type = fn_type @Copy.WithSelf.Op, @Copy.WithSelf(%Copy.facet.e9d) [concrete]
// CHECK:STDOUT: %.5b5: type = fn_type_with_self_type %Copy.WithSelf.Op.type.7a0, %Copy.facet.e9d [concrete]
// CHECK:STDOUT: %const.as.Copy.impl.Op.specific_fn: <specific function> = specific_function %const.as.Copy.impl.Op.129, @const.as.Copy.impl.Op(%Copy.facet.d1a) [concrete]
// CHECK:STDOUT: %Int.as.Copy.impl.Op.type.b5d: type = fn_type @Int.as.Copy.impl.Op, @Int.as.Copy.impl(%N) [symbolic]
// CHECK:STDOUT: %Int.as.Copy.impl.Op.c85: %Int.as.Copy.impl.Op.type.b5d = struct_value () [symbolic]
// CHECK:STDOUT: %T.228: %Copy.type = symbolic_binding T, 0 [symbolic]
// CHECK:STDOUT: %const.as.Copy.impl.Op.type.545: type = fn_type @const.as.Copy.impl.Op, @const.as.Copy.impl(%T.228) [symbolic]
// CHECK:STDOUT: %const.as.Copy.impl.Op.376: %const.as.Copy.impl.Op.type.545 = struct_value () [symbolic]
// CHECK:STDOUT: %Copy.impl_witness.32d: <witness> = impl_witness imports.%Copy.impl_witness_table.07a, @Int.as.Copy.impl(%int_32) [concrete]
// CHECK:STDOUT: %Copy.facet.66a: %Copy.type = facet_value %i32, (%Copy.impl_witness.32d) [concrete]
// CHECK:STDOUT: %Copy.impl_witness.0d9: <witness> = impl_witness imports.%Copy.impl_witness_table.032, @const.as.Copy.impl(%Copy.facet.66a) [concrete]
// CHECK:STDOUT: %const.as.Copy.impl.Op.type.3e3: type = fn_type @const.as.Copy.impl.Op, @const.as.Copy.impl(%Copy.facet.66a) [concrete]
// CHECK:STDOUT: %const.as.Copy.impl.Op.453: %const.as.Copy.impl.Op.type.3e3 = struct_value () [concrete]
// CHECK:STDOUT: %Copy.facet.c9f: %Copy.type = facet_value %const.da1, (%Copy.impl_witness.0d9) [concrete]
// CHECK:STDOUT: %Copy.WithSelf.Op.type.9a6: type = fn_type @Copy.WithSelf.Op, @Copy.WithSelf(%Copy.facet.c9f) [concrete]
// CHECK:STDOUT: %.b36: type = fn_type_with_self_type %Copy.WithSelf.Op.type.9a6, %Copy.facet.c9f [concrete]
// CHECK:STDOUT: %const.as.Copy.impl.Op.specific_fn: <specific function> = specific_function %const.as.Copy.impl.Op.453, @const.as.Copy.impl.Op(%Copy.facet.66a) [concrete]
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: imports {
@@ -61,10 +61,10 @@ fn F(p: const (const (const i32*)*)) -> const i32 {
// CHECK:STDOUT: }
// CHECK:STDOUT: %Core.Int: %Int.type = import_ref Core//prelude/parts/int, Int, loaded [concrete = constants.%Int.generic]
// CHECK:STDOUT: %Core.Copy: type = import_ref Core//prelude/parts/copy, Copy, loaded [concrete = constants.%Copy.type]
// CHECK:STDOUT: %Core.import_ref.dbb: @Int.as.Copy.impl.%Int.as.Copy.impl.Op.type (%Int.as.Copy.impl.Op.type.161) = import_ref Core//prelude/parts/int, loc{{\d+_\d+}}, loaded [symbolic = @Int.as.Copy.impl.%Int.as.Copy.impl.Op (constants.%Int.as.Copy.impl.Op.012)]
// CHECK:STDOUT: %Copy.impl_witness_table.1ee = impl_witness_table (%Core.import_ref.dbb), @Int.as.Copy.impl [concrete]
// CHECK:STDOUT: %Core.import_ref.843: @const.as.Copy.impl.%const.as.Copy.impl.Op.type (%const.as.Copy.impl.Op.type.7ab) = import_ref Core//prelude/parts/copy, loc{{\d+_\d+}}, loaded [symbolic = @const.as.Copy.impl.%const.as.Copy.impl.Op (constants.%const.as.Copy.impl.Op.e11)]
// CHECK:STDOUT: %Copy.impl_witness_table.f86 = impl_witness_table (%Core.import_ref.843), @const.as.Copy.impl [concrete]
// CHECK:STDOUT: %Core.import_ref.809: @Int.as.Copy.impl.%Int.as.Copy.impl.Op.type (%Int.as.Copy.impl.Op.type.b5d) = import_ref Core//prelude/parts/int, loc{{\d+_\d+}}, loaded [symbolic = @Int.as.Copy.impl.%Int.as.Copy.impl.Op (constants.%Int.as.Copy.impl.Op.c85)]
// CHECK:STDOUT: %Copy.impl_witness_table.07a = impl_witness_table (%Core.import_ref.809), @Int.as.Copy.impl [concrete]
// CHECK:STDOUT: %Core.import_ref.583: @const.as.Copy.impl.%const.as.Copy.impl.Op.type (%const.as.Copy.impl.Op.type.545) = import_ref Core//prelude/parts/copy, loc{{\d+_\d+}}, loaded [symbolic = @const.as.Copy.impl.%const.as.Copy.impl.Op (constants.%const.as.Copy.impl.Op.376)]
// CHECK:STDOUT: %Copy.impl_witness_table.032 = impl_witness_table (%Core.import_ref.583), @const.as.Copy.impl [concrete]
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
@@ -74,41 +74,41 @@ fn F(p: const (const (const i32*)*)) -> const i32 {
// CHECK:STDOUT: }
// CHECK:STDOUT: %Core.import = import Core
// CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [concrete = constants.%F] {
// CHECK:STDOUT: %p.param_patt: %pattern_type.800 = value_param_pattern [concrete]
// CHECK:STDOUT: %p.patt: %pattern_type.800 = at_binding_pattern p, %p.param_patt [concrete]
// CHECK:STDOUT: %return.param_patt: %pattern_type.a65 = out_param_pattern [concrete]
// CHECK:STDOUT: %return.patt: %pattern_type.a65 = return_slot_pattern %return.param_patt, %const.loc16_41 [concrete]
// CHECK:STDOUT: %p.param_patt: %pattern_type.d89 = value_param_pattern [concrete]
// CHECK:STDOUT: %p.patt: %pattern_type.d89 = at_binding_pattern p, %p.param_patt [concrete]
// CHECK:STDOUT: %return.param_patt: %pattern_type.807 = out_param_pattern [concrete]
// CHECK:STDOUT: %return.patt: %pattern_type.807 = return_slot_pattern %return.param_patt, %const.loc16_41 [concrete]
// CHECK:STDOUT: } {
// CHECK:STDOUT: %i32.loc16_47: type = type_literal constants.%i32 [concrete = constants.%i32]
// CHECK:STDOUT: %const.loc16_41: type = const_type %i32.loc16_47 [concrete = constants.%const.20a]
// CHECK:STDOUT: %.loc16_41: Core.Form = init_form %const.loc16_41 [concrete = constants.%.121]
// CHECK:STDOUT: %p.param: %const.fa2 = value_param call_param0
// CHECK:STDOUT: %.loc16_9: type = splice_block %const.loc16_9 [concrete = constants.%const.fa2] {
// CHECK:STDOUT: %const.loc16_41: type = const_type %i32.loc16_47 [concrete = constants.%const.da1]
// CHECK:STDOUT: %.loc16_41: Core.Form = init_form %const.loc16_41 [concrete = constants.%.001]
// CHECK:STDOUT: %p.param: %const.5d8 = value_param call_param0
// CHECK:STDOUT: %.loc16_9: type = splice_block %const.loc16_9 [concrete = constants.%const.5d8] {
// CHECK:STDOUT: %i32.loc16_29: type = type_literal constants.%i32 [concrete = constants.%i32]
// CHECK:STDOUT: %const.loc16_23: type = const_type %i32.loc16_29 [concrete = constants.%const.20a]
// CHECK:STDOUT: %ptr.loc16_32: type = ptr_type %const.loc16_23 [concrete = constants.%ptr.36b]
// CHECK:STDOUT: %const.loc16_16: type = const_type %ptr.loc16_32 [concrete = constants.%const.58f]
// CHECK:STDOUT: %ptr.loc16_34: type = ptr_type %const.loc16_16 [concrete = constants.%ptr.6e8]
// CHECK:STDOUT: %const.loc16_9: type = const_type %ptr.loc16_34 [concrete = constants.%const.fa2]
// CHECK:STDOUT: %const.loc16_23: type = const_type %i32.loc16_29 [concrete = constants.%const.da1]
// CHECK:STDOUT: %ptr.loc16_32: type = ptr_type %const.loc16_23 [concrete = constants.%ptr.768]
// CHECK:STDOUT: %const.loc16_16: type = const_type %ptr.loc16_32 [concrete = constants.%const.46b]
// CHECK:STDOUT: %ptr.loc16_34: type = ptr_type %const.loc16_16 [concrete = constants.%ptr.c64]
// CHECK:STDOUT: %const.loc16_9: type = const_type %ptr.loc16_34 [concrete = constants.%const.5d8]
// CHECK:STDOUT: }
// CHECK:STDOUT: %p: %const.fa2 = value_binding p, %p.param
// CHECK:STDOUT: %return.param: ref %const.20a = out_param call_param1
// CHECK:STDOUT: %return: ref %const.20a = return_slot %return.param
// CHECK:STDOUT: %p: %const.5d8 = value_binding p, %p.param
// CHECK:STDOUT: %return.param: ref %const.da1 = out_param call_param1
// CHECK:STDOUT: %return: ref %const.da1 = return_slot %return.param
// CHECK:STDOUT: }
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @F(%p.param: %const.fa2) -> out %return.param: %const.20a {
// CHECK:STDOUT: fn @F(%p.param: %const.5d8) -> out %return.param: %const.da1 {
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: %p.ref: %const.fa2 = name_ref p, %p
// CHECK:STDOUT: %.loc17_11.1: ref %const.58f = deref %p.ref
// CHECK:STDOUT: %.loc17_11.2: %const.58f = acquire_value %.loc17_11.1
// CHECK:STDOUT: %.loc17_10.1: ref %const.20a = deref %.loc17_11.2
// CHECK:STDOUT: %.loc17_10.2: %const.20a = acquire_value %.loc17_10.1
// CHECK:STDOUT: %impl.elem0: %.5b5 = impl_witness_access constants.%Copy.impl_witness.38b, element0 [concrete = constants.%const.as.Copy.impl.Op.129]
// CHECK:STDOUT: %p.ref: %const.5d8 = name_ref p, %p
// CHECK:STDOUT: %.loc17_11.1: ref %const.46b = deref %p.ref
// CHECK:STDOUT: %.loc17_11.2: %const.46b = acquire_value %.loc17_11.1
// CHECK:STDOUT: %.loc17_10.1: ref %const.da1 = deref %.loc17_11.2
// CHECK:STDOUT: %.loc17_10.2: %const.da1 = acquire_value %.loc17_10.1
// CHECK:STDOUT: %impl.elem0: %.b36 = impl_witness_access constants.%Copy.impl_witness.0d9, element0 [concrete = constants.%const.as.Copy.impl.Op.453]
// CHECK:STDOUT: %bound_method.loc17_10.1: <bound method> = bound_method %.loc17_10.2, %impl.elem0
// CHECK:STDOUT: %specific_fn: <specific function> = specific_function %impl.elem0, @const.as.Copy.impl.Op(constants.%Copy.facet.d1a) [concrete = constants.%const.as.Copy.impl.Op.specific_fn]
// CHECK:STDOUT: %specific_fn: <specific function> = specific_function %impl.elem0, @const.as.Copy.impl.Op(constants.%Copy.facet.66a) [concrete = constants.%const.as.Copy.impl.Op.specific_fn]
// CHECK:STDOUT: %bound_method.loc17_10.2: <bound method> = bound_method %.loc17_10.2, %specific_fn
// CHECK:STDOUT: %const.as.Copy.impl.Op.call: init %const.20a = call %bound_method.loc17_10.2(%.loc17_10.2)
// CHECK:STDOUT: %const.as.Copy.impl.Op.call: init %const.da1 = call %bound_method.loc17_10.2(%.loc17_10.2)
// CHECK:STDOUT: return %const.as.Copy.impl.Op.call
// CHECK:STDOUT: }
// CHECK:STDOUT: