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

Emit NameBindingDecl after the initializer (if any) (#7467)

Browse Source 
In some cases the pattern block can depend on the initializer, so it
must be sequenced after it. See #7469 for a more detailed explanation of
why this is necessary.
This commit is contained in:
Geoff Romer
2026-07-07 19:18:33 +00:00
committed by GitHub
parent ae3c4266d4
commit 8945305dfc
310 changed files with 3375 additions and 3366 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/testdata/pointer/address_of_deref.carbon
Vendored
+4 -4
View File
@@ -106,10 +106,6 @@ fn F() -> i32 {
// CHECK:STDOUT:
// CHECK:STDOUT: fn @F() -> out %return.param: %i32 {
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: name_binding_decl {
// CHECK:STDOUT: %n.patt: %pattern_type.6b6 = ref_binding_pattern n [concrete = constants.%n.patt]
// CHECK:STDOUT: %n.var_patt: %pattern_type.6b6 = var_pattern %n.patt [concrete = constants.%n.var_patt]
// CHECK:STDOUT: }
// CHECK:STDOUT: %n.var: ref %i32 = var_storage %n.var_patt
// CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [concrete = constants.%int_0.5c6]
// CHECK:STDOUT: %impl.elem0.loc16: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39]
@@ -121,6 +117,10 @@ fn F() -> i32 {
// CHECK:STDOUT: assign %n.var, %.loc16
// CHECK:STDOUT: %i32.loc16: type = type_literal constants.%i32 [concrete = constants.%i32]
// CHECK:STDOUT: %n: ref %i32 = wrapper_binding n, %n.var
// CHECK:STDOUT: name_binding_decl {
// CHECK:STDOUT: %n.patt: %pattern_type.6b6 = ref_binding_pattern n [concrete = constants.%n.patt]
// CHECK:STDOUT: %n.var_patt: %pattern_type.6b6 = var_pattern %n.patt [concrete = constants.%n.var_patt]
// CHECK:STDOUT: }
// CHECK:STDOUT: %n.ref: ref %i32 = name_ref n, %n
// CHECK:STDOUT: %addr.loc17_13: %ptr.d08 = addr_of %n.ref
// CHECK:STDOUT: %.loc17_12: ref %i32 = deref %addr.loc17_13
toolchain/check/testdata/pointer/address_of_lvalue.carbon
Vendored
+16 -16
View File
@@ -146,10 +146,6 @@ fn F() {
// CHECK:STDOUT:
// CHECK:STDOUT: fn @F() {
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: name_binding_decl {
// CHECK:STDOUT: %s.patt: %pattern_type.20e3 = ref_binding_pattern s [concrete = constants.%s.patt]
// CHECK:STDOUT: %s.var_patt: %pattern_type.20e3 = var_pattern %s.patt [concrete = constants.%s.var_patt]
// CHECK:STDOUT: }
// CHECK:STDOUT: %s.var: ref %struct_type.a.b.b4c = var_storage %s.var_patt
// CHECK:STDOUT: %int_1.loc16: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8]
// CHECK:STDOUT: %int_2.loc16: Core.IntLiteral = int_value 2 [concrete = constants.%int_2.ecc]
@@ -180,8 +176,8 @@ fn F() {
// CHECK:STDOUT: }
// CHECK:STDOUT: %s: ref %struct_type.a.b.b4c = wrapper_binding s, %s.var
// CHECK:STDOUT: name_binding_decl {
// CHECK:STDOUT: %p.patt: %pattern_type.88d = ref_binding_pattern p [concrete = constants.%p.patt]
// CHECK:STDOUT: %p.var_patt: %pattern_type.88d = var_pattern %p.patt [concrete = constants.%p.var_patt]
// CHECK:STDOUT: %s.patt: %pattern_type.20e3 = ref_binding_pattern s [concrete = constants.%s.patt]
// CHECK:STDOUT: %s.var_patt: %pattern_type.20e3 = var_pattern %s.patt [concrete = constants.%s.var_patt]
// CHECK:STDOUT: }
// CHECK:STDOUT: %p.var: ref %ptr.939 = var_storage %p.var_patt
// CHECK:STDOUT: %s.ref.loc18: ref %struct_type.a.b.b4c = name_ref s, %s
@@ -200,8 +196,8 @@ fn F() {
// CHECK:STDOUT: }
// CHECK:STDOUT: %p: ref %ptr.939 = wrapper_binding p, %p.var
// CHECK:STDOUT: name_binding_decl {
// CHECK:STDOUT: %q.patt: %pattern_type.f00 = ref_binding_pattern q [concrete = constants.%q.patt]
// CHECK:STDOUT: %q.var_patt: %pattern_type.f00 = var_pattern %q.patt [concrete = constants.%q.var_patt]
// CHECK:STDOUT: %p.patt: %pattern_type.88d = ref_binding_pattern p [concrete = constants.%p.patt]
// CHECK:STDOUT: %p.var_patt: %pattern_type.88d = var_pattern %p.patt [concrete = constants.%p.var_patt]
// CHECK:STDOUT: }
// CHECK:STDOUT: %q.var: ref %ptr.d08 = var_storage %q.var_patt
// CHECK:STDOUT: %s.ref.loc19: ref %struct_type.a.b.b4c = name_ref s, %s
@@ -219,8 +215,8 @@ fn F() {
// CHECK:STDOUT: }
// CHECK:STDOUT: %q: ref %ptr.d08 = wrapper_binding q, %q.var
// CHECK:STDOUT: name_binding_decl {
// CHECK:STDOUT: %r.patt: %pattern_type.f00 = ref_binding_pattern r [concrete = constants.%r.patt]
// CHECK:STDOUT: %r.var_patt: %pattern_type.f00 = var_pattern %r.patt [concrete = constants.%r.var_patt]
// CHECK:STDOUT: %q.patt: %pattern_type.f00 = ref_binding_pattern q [concrete = constants.%q.patt]
// CHECK:STDOUT: %q.var_patt: %pattern_type.f00 = var_pattern %q.patt [concrete = constants.%q.var_patt]
// CHECK:STDOUT: }
// CHECK:STDOUT: %r.var: ref %ptr.d08 = var_storage %r.var_patt
// CHECK:STDOUT: %s.ref.loc20: ref %struct_type.a.b.b4c = name_ref s, %s
@@ -238,8 +234,8 @@ fn F() {
// CHECK:STDOUT: }
// CHECK:STDOUT: %r: ref %ptr.d08 = wrapper_binding r, %r.var
// CHECK:STDOUT: name_binding_decl {
// CHECK:STDOUT: %t.patt: %pattern_type.394 = ref_binding_pattern t [concrete = constants.%t.patt]
// CHECK:STDOUT: %t.var_patt: %pattern_type.394 = var_pattern %t.patt [concrete = constants.%t.var_patt]
// CHECK:STDOUT: %r.patt: %pattern_type.f00 = ref_binding_pattern r [concrete = constants.%r.patt]
// CHECK:STDOUT: %r.var_patt: %pattern_type.f00 = var_pattern %r.patt [concrete = constants.%r.var_patt]
// CHECK:STDOUT: }
// CHECK:STDOUT: %t.var: ref %tuple.type.e55 = var_storage %t.var_patt
// CHECK:STDOUT: %int_1.loc22: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8]
@@ -272,8 +268,8 @@ fn F() {
// CHECK:STDOUT: }
// CHECK:STDOUT: %t: ref %tuple.type.e55 = wrapper_binding t, %t.var
// CHECK:STDOUT: name_binding_decl {
// CHECK:STDOUT: %t0.patt: %pattern_type.f00 = ref_binding_pattern t0 [concrete = constants.%t0.patt]
// CHECK:STDOUT: %t0.var_patt: %pattern_type.f00 = var_pattern %t0.patt [concrete = constants.%t0.var_patt]
// CHECK:STDOUT: %t.patt: %pattern_type.394 = ref_binding_pattern t [concrete = constants.%t.patt]
// CHECK:STDOUT: %t.var_patt: %pattern_type.394 = var_pattern %t.patt [concrete = constants.%t.var_patt]
// CHECK:STDOUT: }
// CHECK:STDOUT: %t0.var: ref %ptr.d08 = var_storage %t0.var_patt
// CHECK:STDOUT: %t.ref.loc23: ref %tuple.type.e55 = name_ref t, %t
@@ -292,8 +288,8 @@ fn F() {
// CHECK:STDOUT: }
// CHECK:STDOUT: %t0: ref %ptr.d08 = wrapper_binding t0, %t0.var
// CHECK:STDOUT: name_binding_decl {
// CHECK:STDOUT: %t1.patt: %pattern_type.f00 = ref_binding_pattern t1 [concrete = constants.%t1.patt]
// CHECK:STDOUT: %t1.var_patt: %pattern_type.f00 = var_pattern %t1.patt [concrete = constants.%t1.var_patt]
// CHECK:STDOUT: %t0.patt: %pattern_type.f00 = ref_binding_pattern t0 [concrete = constants.%t0.patt]
// CHECK:STDOUT: %t0.var_patt: %pattern_type.f00 = var_pattern %t0.patt [concrete = constants.%t0.var_patt]
// CHECK:STDOUT: }
// CHECK:STDOUT: %t1.var: ref %ptr.d08 = var_storage %t1.var_patt
// CHECK:STDOUT: %t.ref.loc24: ref %tuple.type.e55 = name_ref t, %t
@@ -311,6 +307,10 @@ fn F() {
// CHECK:STDOUT: %ptr.loc24: type = ptr_type %i32.loc24 [concrete = constants.%ptr.d08]
// CHECK:STDOUT: }
// CHECK:STDOUT: %t1: ref %ptr.d08 = wrapper_binding t1, %t1.var
// CHECK:STDOUT: name_binding_decl {
// CHECK:STDOUT: %t1.patt: %pattern_type.f00 = ref_binding_pattern t1 [concrete = constants.%t1.patt]
// CHECK:STDOUT: %t1.var_patt: %pattern_type.f00 = var_pattern %t1.patt [concrete = constants.%t1.var_patt]
// CHECK:STDOUT: }
// CHECK:STDOUT: %Destroy.Op.bound.loc24: <bound method> = bound_method %t1.var, constants.%Destroy.Op.1a2547.1
// CHECK:STDOUT: %Destroy.Op.call.loc24: init %empty_tuple.type = call %Destroy.Op.bound.loc24(%t1.var)
// CHECK:STDOUT: %Destroy.Op.bound.loc23: <bound method> = bound_method %t0.var, constants.%Destroy.Op.1a2547.1
toolchain/check/testdata/pointer/basic.carbon
Vendored
+6 -6
View File
@@ -125,10 +125,6 @@ fn F() -> i32 {
// CHECK:STDOUT:
// CHECK:STDOUT: fn @F() -> out %return.param: %i32 {
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: name_binding_decl {
// CHECK:STDOUT: %n.patt: %pattern_type.6b6 = ref_binding_pattern n [concrete = constants.%n.patt]
// CHECK:STDOUT: %n.var_patt: %pattern_type.6b6 = var_pattern %n.patt [concrete = constants.%n.var_patt]
// CHECK:STDOUT: }
// CHECK:STDOUT: %n.var: ref %i32 = var_storage %n.var_patt
// CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [concrete = constants.%int_0.5c6]
// CHECK:STDOUT: %impl.elem0.loc16: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39]
@@ -141,8 +137,8 @@ fn F() -> i32 {
// CHECK:STDOUT: %i32.loc16: type = type_literal constants.%i32 [concrete = constants.%i32]
// CHECK:STDOUT: %n: ref %i32 = wrapper_binding n, %n.var
// CHECK:STDOUT: name_binding_decl {
// CHECK:STDOUT: %p.patt: %pattern_type.f00 = ref_binding_pattern p [concrete = constants.%p.patt]
// CHECK:STDOUT: %p.var_patt: %pattern_type.f00 = var_pattern %p.patt [concrete = constants.%p.var_patt]
// CHECK:STDOUT: %n.patt: %pattern_type.6b6 = ref_binding_pattern n [concrete = constants.%n.patt]
// CHECK:STDOUT: %n.var_patt: %pattern_type.6b6 = var_pattern %n.patt [concrete = constants.%n.var_patt]
// CHECK:STDOUT: }
// CHECK:STDOUT: %p.var: ref %ptr.d08 = var_storage %p.var_patt
// CHECK:STDOUT: %n.ref: ref %i32 = name_ref n, %n
@@ -158,6 +154,10 @@ fn F() -> i32 {
// CHECK:STDOUT: %ptr: type = ptr_type %i32.loc17 [concrete = constants.%ptr.d08]
// CHECK:STDOUT: }
// CHECK:STDOUT: %p: ref %ptr.d08 = wrapper_binding p, %p.var
// CHECK:STDOUT: name_binding_decl {
// CHECK:STDOUT: %p.patt: %pattern_type.f00 = ref_binding_pattern p [concrete = constants.%p.patt]
// CHECK:STDOUT: %p.var_patt: %pattern_type.f00 = var_pattern %p.patt [concrete = constants.%p.var_patt]
// CHECK:STDOUT: }
// CHECK:STDOUT: %p.ref: ref %ptr.d08 = name_ref p, %p
// CHECK:STDOUT: %.loc19_11: %ptr.d08 = acquire_value %p.ref
// CHECK:STDOUT: %.loc19_10.1: ref %i32 = deref %.loc19_11
toolchain/check/testdata/pointer/fail_deref_error.carbon
Vendored
+4 -4
View File
@@ -52,16 +52,16 @@ let n2: i32 = undeclared->foo;
// CHECK:STDOUT: .n2 = %n2
// CHECK:STDOUT: }
// CHECK:STDOUT: %Core.import = import Core
// CHECK:STDOUT: name_binding_decl {
// CHECK:STDOUT: %n.patt: %pattern_type.6b6 = value_binding_pattern n [concrete = constants.%n.patt]
// CHECK:STDOUT: }
// CHECK:STDOUT: %i32.loc19: type = type_literal constants.%i32 [concrete = constants.%i32]
// CHECK:STDOUT: %n: %i32 = wrapper_binding n, <error> [concrete = <error>]
// CHECK:STDOUT: name_binding_decl {
// CHECK:STDOUT: %n2.patt: %pattern_type.6b6 = value_binding_pattern n2 [concrete = constants.%n2.patt]
// CHECK:STDOUT: %n.patt: %pattern_type.6b6 = value_binding_pattern n [concrete = constants.%n.patt]
// CHECK:STDOUT: }
// CHECK:STDOUT: %i32.loc24: type = type_literal constants.%i32 [concrete = constants.%i32]
// CHECK:STDOUT: %n2: %i32 = wrapper_binding n2, <error> [concrete = <error>]
// CHECK:STDOUT: name_binding_decl {
// CHECK:STDOUT: %n2.patt: %pattern_type.6b6 = value_binding_pattern n2 [concrete = constants.%n2.patt]
// CHECK:STDOUT: }
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @__global_init() {
toolchain/check/testdata/pointer/fail_deref_type.carbon
Vendored
+6 -6
View File
@@ -51,10 +51,6 @@ var p2: i32->foo;
// CHECK:STDOUT: .p2 = %p2
// CHECK:STDOUT: }
// CHECK:STDOUT: %Core.import = import Core
// CHECK:STDOUT: name_binding_decl {
// CHECK:STDOUT: %p.patt: <error> = ref_binding_pattern p [concrete = <error>]
// CHECK:STDOUT: %p.var_patt: <error> = var_pattern %p.patt [concrete = <error>]
// CHECK:STDOUT: }
// CHECK:STDOUT: %p.var: ref <error> = var_storage %p.var_patt [concrete = <error>]
// CHECK:STDOUT: %.1: <error> = splice_block <error> [concrete = <error>] {
// CHECK:STDOUT: %i32.loc22: type = type_literal constants.%i32 [concrete = constants.%i32]
@@ -62,8 +58,8 @@ var p2: i32->foo;
// CHECK:STDOUT: }
// CHECK:STDOUT: %p: <error> = wrapper_binding p, <error> [concrete = <error>]
// CHECK:STDOUT: name_binding_decl {
// CHECK:STDOUT: %p2.patt: <error> = ref_binding_pattern p2 [concrete = <error>]
// CHECK:STDOUT: %p2.var_patt: <error> = var_pattern %p2.patt [concrete = <error>]
// CHECK:STDOUT: %p.patt: <error> = ref_binding_pattern p [concrete = <error>]
// CHECK:STDOUT: %p.var_patt: <error> = var_pattern %p.patt [concrete = <error>]
// CHECK:STDOUT: }
// CHECK:STDOUT: %p2.var: ref <error> = var_storage %p2.var_patt [concrete = <error>]
// CHECK:STDOUT: %.2: <error> = splice_block <error> [concrete = <error>] {
@@ -72,6 +68,10 @@ var p2: i32->foo;
// CHECK:STDOUT: %foo.ref: <error> = name_ref foo, <error> [concrete = <error>]
// CHECK:STDOUT: }
// CHECK:STDOUT: %p2: <error> = wrapper_binding p2, <error> [concrete = <error>]
// CHECK:STDOUT: name_binding_decl {
// CHECK:STDOUT: %p2.patt: <error> = ref_binding_pattern p2 [concrete = <error>]
// CHECK:STDOUT: %p2.var_patt: <error> = var_pattern %p2.patt [concrete = <error>]
// CHECK:STDOUT: }
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @__global_init() {
toolchain/check/testdata/pointer/import.carbon
Vendored
+10 -10
View File
@@ -96,16 +96,12 @@ var a: i32* = a_ref;
// CHECK:STDOUT: .a_ref = %a_ref
// CHECK:STDOUT: }
// CHECK:STDOUT: %Core.import = import Core
// CHECK:STDOUT: name_binding_decl {
// CHECK:STDOUT: %a_orig.patt: %pattern_type.6b6 = ref_binding_pattern a_orig [concrete = constants.%a_orig.patt]
// CHECK:STDOUT: %a_orig.var_patt: %pattern_type.6b6 = var_pattern %a_orig.patt [concrete = constants.%a_orig.var_patt]
// CHECK:STDOUT: }
// CHECK:STDOUT: %a_orig.var: ref %i32 = var_storage %a_orig.var_patt [concrete]
// CHECK:STDOUT: %i32.loc4: type = type_literal constants.%i32 [concrete = constants.%i32]
// CHECK:STDOUT: %a_orig: ref %i32 = wrapper_binding a_orig, %a_orig.var [concrete = %a_orig.var]
// CHECK:STDOUT: name_binding_decl {
// CHECK:STDOUT: %a_ref.patt: %pattern_type.f00 = ref_binding_pattern a_ref [concrete = constants.%a_ref.patt]
// CHECK:STDOUT: %a_ref.var_patt: %pattern_type.f00 = var_pattern %a_ref.patt [concrete = constants.%a_ref.var_patt]
// CHECK:STDOUT: %a_orig.patt: %pattern_type.6b6 = ref_binding_pattern a_orig [concrete = constants.%a_orig.patt]
// CHECK:STDOUT: %a_orig.var_patt: %pattern_type.6b6 = var_pattern %a_orig.patt [concrete = constants.%a_orig.var_patt]
// CHECK:STDOUT: }
// CHECK:STDOUT: %a_ref.var: ref %ptr.d08 = var_storage %a_ref.var_patt [concrete]
// CHECK:STDOUT: %.loc5: type = splice_block %ptr [concrete = constants.%ptr.d08] {
@@ -113,6 +109,10 @@ var a: i32* = a_ref;
// CHECK:STDOUT: %ptr: type = ptr_type %i32.loc5 [concrete = constants.%ptr.d08]
// CHECK:STDOUT: }
// CHECK:STDOUT: %a_ref: ref %ptr.d08 = wrapper_binding a_ref, %a_ref.var [concrete = %a_ref.var]
// CHECK:STDOUT: name_binding_decl {
// CHECK:STDOUT: %a_ref.patt: %pattern_type.f00 = ref_binding_pattern a_ref [concrete = constants.%a_ref.patt]
// CHECK:STDOUT: %a_ref.var_patt: %pattern_type.f00 = var_pattern %a_ref.patt [concrete = constants.%a_ref.var_patt]
// CHECK:STDOUT: }
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @__global_init() {
@@ -188,16 +188,16 @@ var a: i32* = a_ref;
// CHECK:STDOUT: %Implicit.import = import Implicit
// CHECK:STDOUT: %default.import = import <none>
// CHECK:STDOUT: %Core.import = import Core
// CHECK:STDOUT: name_binding_decl {
// CHECK:STDOUT: %a.patt: %pattern_type.f00 = ref_binding_pattern a [concrete = constants.%a.patt]
// CHECK:STDOUT: %a.var_patt: %pattern_type.f00 = var_pattern %a.patt [concrete = constants.%a.var_patt]
// CHECK:STDOUT: }
// CHECK:STDOUT: %a.var: ref %ptr.d08 = var_storage %a.var_patt [concrete]
// CHECK:STDOUT: %.loc4: type = splice_block %ptr [concrete = constants.%ptr.d08] {
// CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32]
// CHECK:STDOUT: %ptr: type = ptr_type %i32 [concrete = constants.%ptr.d08]
// CHECK:STDOUT: }
// CHECK:STDOUT: %a: ref %ptr.d08 = wrapper_binding a, %a.var [concrete = %a.var]
// CHECK:STDOUT: name_binding_decl {
// CHECK:STDOUT: %a.patt: %pattern_type.f00 = ref_binding_pattern a [concrete = constants.%a.patt]
// CHECK:STDOUT: %a.var_patt: %pattern_type.f00 = var_pattern %a.patt [concrete = constants.%a.var_patt]
// CHECK:STDOUT: }
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @__global_init() {