diff --git a/toolchain/check/eval.cpp b/toolchain/check/eval.cpp index d7f50b3f6e40..e68cb5b4acd1 100644 --- a/toolchain/check/eval.cpp +++ b/toolchain/check/eval.cpp @@ -3569,11 +3569,11 @@ auto TryExecTypedInst(FunctionExecContext& eval_context, } template <> -auto TryExecTypedInst(FunctionExecContext& eval_context, - SemIR::InstId inst_id, - SemIR::Inst inst) +auto TryExecTypedInst(FunctionExecContext& eval_context, + SemIR::InstId inst_id, + SemIR::Inst inst) -> SemIR::ConstantId { - auto value_binding = inst.As(); + auto value_binding = inst.As(); auto local_value_id = eval_context.GetConstantValue(value_binding.value_id); eval_context.locals().Insert(inst_id, local_value_id); return SemIR::ConstantId::None; diff --git a/toolchain/check/eval_inst.cpp b/toolchain/check/eval_inst.cpp index 2ecb22935e8e..0a1864baf206 100644 --- a/toolchain/check/eval_inst.cpp +++ b/toolchain/check/eval_inst.cpp @@ -115,26 +115,11 @@ auto EvalConstantInst(Context& context, SemIR::AliasBinding inst) context.constant_values().Get(inst.value_id)); } -auto EvalConstantInst(Context& context, SemIR::RefBinding inst) - -> ConstantEvalResult { - // A reference binding evaluates to the value it's bound to. - if (inst.value_id.has_value()) { - return ConstantEvalResult::Existing( - context.constant_values().Get(inst.value_id)); - } - return ConstantEvalResult::NotConstant; -} - -auto EvalConstantInst(Context& /*context*/, SemIR::ValueBinding /*inst*/) - -> ConstantEvalResult { - // Non-`:!` value bindings are not constant. - return ConstantEvalResult::NotConstant; -} - auto EvalConstantInst(Context& context, SemIR::WrapperBinding inst) -> ConstantEvalResult { - // A wrapper binding evaluates to the value it's bound to. - if (inst.value_id.has_value()) { + // A reference binding evaluates to the value it's bound to. + if (inst.value_id.has_value() && SemIR::IsRefCategory(SemIR::GetExprCategory( + context.sem_ir(), inst.value_id))) { return ConstantEvalResult::Existing( context.constant_values().Get(inst.value_id)); } diff --git a/toolchain/check/handle_choice.cpp b/toolchain/check/handle_choice.cpp index e08295d55b07..54b9bc5274f6 100644 --- a/toolchain/check/handle_choice.cpp +++ b/toolchain/check/handle_choice.cpp @@ -222,7 +222,7 @@ static auto MakeLetBinding(Context& context, const ChoiceInfo& choice_info, {.name_id = binding.name_component.name_id, .parent_scope_id = choice_info.name_scope_id}); auto bind_name_id = AddInst(context, binding.node_id, - SemIR::ValueBinding{ + SemIR::WrapperBinding{ .type_id = choice_info.self_type_id, .entity_name_id = entity_name_id, .value_id = self_value_id, diff --git a/toolchain/check/import.cpp b/toolchain/check/import.cpp index 64b0b96e5877..d7b4f5421be5 100644 --- a/toolchain/check/import.cpp +++ b/toolchain/check/import.cpp @@ -45,9 +45,8 @@ static auto GetImportName(const SemIR::File& import_sem_ir, -> std::pair { CARBON_KIND_SWITCH(import_inst) { case SemIR::AliasBinding::Kind: - case SemIR::RefBinding::Kind: case SemIR::SymbolicBinding::Kind: - case SemIR::ValueBinding::Kind: + case SemIR::WrapperBinding::Kind: case SemIR::ExportDecl::Kind: { auto bind_inst = import_inst.As(); return GetImportNameForEntity( diff --git a/toolchain/check/pattern.cpp b/toolchain/check/pattern.cpp index a024628cbd92..eda3103143db 100644 --- a/toolchain/check/pattern.cpp +++ b/toolchain/check/pattern.cpp @@ -107,38 +107,14 @@ auto AddBindingForPattern(Context& context, SemIR::LocId name_loc, -> SemIR::InstId { SemIR::InstKind bind_name_kind; switch (pattern.kind) { - case SemIR::RefBindingPattern::Kind: - bind_name_kind = SemIR::RefBinding::Kind; - break; case SemIR::SymbolicBindingPattern::Kind: bind_name_kind = SemIR::SymbolicBinding::Kind; break; + case SemIR::RefBindingPattern::Kind: case SemIR::ValueBindingPattern::Kind: - bind_name_kind = SemIR::ValueBinding::Kind; + case SemIR::WrapperBindingPattern::Kind: + bind_name_kind = SemIR::WrapperBinding::Kind; break; - case SemIR::WrapperBindingPattern::Kind: { - auto subpattern = context.insts().Get(pattern.subpattern_id); - if (subpattern.Is()) { - subpattern = context.constant_values().GetInst( - context.constant_values().Get(pattern.subpattern_id)); - } - CARBON_KIND_SWITCH(subpattern) { - case SemIR::RefParamPattern::Kind: - case SemIR::VarPattern::Kind: - bind_name_kind = SemIR::RefBinding::Kind; - break; - case SemIR::ValueParamPattern::Kind: - bind_name_kind = SemIR::ValueBinding::Kind; - break; - case SemIR::SpliceInst::Kind: - bind_name_kind = SemIR::WrapperBinding::Kind; - break; - default: - CARBON_FATAL("Unexpected subpattern kind for at_binding_pattern: {0}", - subpattern); - } - break; - } default: CARBON_FATAL("pattern_kind {0} is not a binding pattern kind", pattern.kind); diff --git a/toolchain/check/testdata/alias/basics.carbon b/toolchain/check/testdata/alias/basics.carbon index 4187938e1516..4efa309a080f 100644 --- a/toolchain/check/testdata/alias/basics.carbon +++ b/toolchain/check/testdata/alias/basics.carbon @@ -199,7 +199,7 @@ extern alias C = Class; // CHECK:STDOUT: %.loc10_13.4: ref %C = temporary %.loc10_13.1, %.loc10_13.3 [concrete = constants.%.115] // CHECK:STDOUT: %.loc10_13.5: %C = acquire_value %.loc10_13.4 [concrete = constants.%C.val] // CHECK:STDOUT: %c.ref: type = name_ref c, %c [concrete = constants.%C] -// CHECK:STDOUT: %d: %C = value_binding d, %.loc10_13.5 +// CHECK:STDOUT: %d: %C = wrapper_binding d, %.loc10_13.5 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/alias/builtins.carbon b/toolchain/check/testdata/alias/builtins.carbon index 8332956a1d4c..fd4a4a93827f 100644 --- a/toolchain/check/testdata/alias/builtins.carbon +++ b/toolchain/check/testdata/alias/builtins.carbon @@ -70,7 +70,7 @@ let a_test: bool = a; // CHECK:STDOUT: %a_test.patt: %pattern_type = value_binding_pattern a_test [concrete = constants.%a_test.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc7: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %a_test: bool = value_binding a_test, @__global_init.%a.ref +// CHECK:STDOUT: %a_test: bool = wrapper_binding a_test, @__global_init.%a.ref // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/alias/export_name.carbon b/toolchain/check/testdata/alias/export_name.carbon index 17f10418f609..3a74553b08a2 100644 --- a/toolchain/check/testdata/alias/export_name.carbon +++ b/toolchain/check/testdata/alias/export_name.carbon @@ -218,7 +218,7 @@ var d: D* = &c; // CHECK:STDOUT: } // CHECK:STDOUT: %d.var: ref %C = var %d.var_patt [concrete] // CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [concrete = constants.%C] -// CHECK:STDOUT: %d: ref %C = ref_binding d, %d.var [concrete = %d.var] +// CHECK:STDOUT: %d: ref %C = wrapper_binding d, %d.var [concrete = %d.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export.carbon"] { @@ -267,7 +267,7 @@ var d: D* = &c; // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref = var %c.var_patt [concrete = ] // CHECK:STDOUT: %C.ref: = name_ref C, [concrete = ] -// CHECK:STDOUT: %c: ref = ref_binding c, [concrete = ] +// CHECK:STDOUT: %c: = wrapper_binding c, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -339,7 +339,7 @@ var d: D* = &c; // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.fcb = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.fcb = var_pattern %d.patt [concrete = constants.%d.var_patt] @@ -349,7 +349,7 @@ var d: D* = &c; // CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [concrete = constants.%C] // CHECK:STDOUT: %ptr: type = ptr_type %D.ref [concrete = constants.%ptr.6b6] // CHECK:STDOUT: } -// CHECK:STDOUT: %d: ref %ptr.6b6 = ref_binding d, %d.var [concrete = %d.var] +// CHECK:STDOUT: %d: ref %ptr.6b6 = wrapper_binding d, %d.var [concrete = %d.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export_orig.carbon"] { diff --git a/toolchain/check/testdata/alias/import.carbon b/toolchain/check/testdata/alias/import.carbon index 6813ccef4278..5872b661d554 100644 --- a/toolchain/check/testdata/alias/import.carbon +++ b/toolchain/check/testdata/alias/import.carbon @@ -117,7 +117,7 @@ var c: () = a_alias_alias; // CHECK:STDOUT: %C.ref.loc8: type = name_ref C, %C.decl [concrete = constants.%C] // CHECK:STDOUT: %ptr: type = ptr_type %C.ref.loc8 [concrete = constants.%ptr] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %ptr = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %ptr = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C { @@ -199,7 +199,7 @@ var c: () = a_alias_alias; // CHECK:STDOUT: %c_alias.ref.loc8: type = name_ref c_alias, imports.%Main.c_alias [concrete = constants.%C] // CHECK:STDOUT: %ptr: type = ptr_type %c_alias.ref.loc8 [concrete = constants.%ptr] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: ref %ptr = ref_binding b, %b.var [concrete = %b.var] +// CHECK:STDOUT: %b: ref %ptr = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "class1.carbon"] { @@ -275,7 +275,7 @@ var c: () = a_alias_alias; // CHECK:STDOUT: %c_alias_alias.ref: type = name_ref c_alias_alias, imports.%Main.c_alias_alias [concrete = constants.%C] // CHECK:STDOUT: %ptr: type = ptr_type %c_alias_alias.ref [concrete = constants.%ptr] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %ptr = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %ptr = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "class2.carbon"] { @@ -330,7 +330,7 @@ var c: () = a_alias_alias; // CHECK:STDOUT: %.loc4_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_9.3: type = converted %.loc4_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %empty_tuple.type = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %empty_tuple.type = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: %a.ref: ref %empty_tuple.type = name_ref a, %a [concrete = %a.var] // CHECK:STDOUT: %a_alias: ref %empty_tuple.type = alias_binding a_alias, %a.ref [concrete = %a.var] // CHECK:STDOUT: } @@ -387,7 +387,7 @@ var c: () = a_alias_alias; // CHECK:STDOUT: %.loc8_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_9.3: type = converted %.loc8_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: ref %empty_tuple.type = ref_binding b, %b.var [concrete = %b.var] +// CHECK:STDOUT: %b: ref %empty_tuple.type = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -439,7 +439,7 @@ var c: () = a_alias_alias; // CHECK:STDOUT: %.loc6_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_9.3: type = converted %.loc6_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %empty_tuple.type = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %empty_tuple.type = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/alias/import_access.carbon b/toolchain/check/testdata/alias/import_access.carbon index 7ae4b4b2a672..914fb5575865 100644 --- a/toolchain/check/testdata/alias/import_access.carbon +++ b/toolchain/check/testdata/alias/import_access.carbon @@ -116,7 +116,7 @@ var inst: Test.A = {}; // CHECK:STDOUT: } // CHECK:STDOUT: %inst.var: ref %C = var %inst.var_patt [concrete] // CHECK:STDOUT: %A.ref: type = name_ref A, imports.%Test.A [concrete = constants.%C] -// CHECK:STDOUT: %inst: ref %C = ref_binding inst, %inst.var [concrete = %inst.var] +// CHECK:STDOUT: %inst: ref %C = wrapper_binding inst, %inst.var [concrete = %inst.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "def.carbon"] { @@ -159,7 +159,7 @@ var inst: Test.A = {}; // CHECK:STDOUT: } // CHECK:STDOUT: %inst.var: ref = var %inst.var_patt [concrete = ] // CHECK:STDOUT: %A.ref: = name_ref A, [concrete = ] -// CHECK:STDOUT: %inst: ref = ref_binding inst, [concrete = ] +// CHECK:STDOUT: %inst: = wrapper_binding inst, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -198,7 +198,7 @@ var inst: Test.A = {}; // CHECK:STDOUT: %Test.ref: = name_ref Test, imports.%Test [concrete = imports.%Test] // CHECK:STDOUT: %A.ref: = name_ref A, [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %inst: ref = ref_binding inst, [concrete = ] +// CHECK:STDOUT: %inst: = wrapper_binding inst, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/alias/import_order.carbon b/toolchain/check/testdata/alias/import_order.carbon index b705c8ae7243..4e9e6ad5510a 100644 --- a/toolchain/check/testdata/alias/import_order.carbon +++ b/toolchain/check/testdata/alias/import_order.carbon @@ -132,28 +132,28 @@ var a_val: a = {.v = b_val.v}; // CHECK:STDOUT: } // CHECK:STDOUT: %d_val.var: ref %C = var %d_val.var_patt [concrete] // CHECK:STDOUT: %d.ref: type = name_ref d, imports.%Main.d [concrete = constants.%C] -// CHECK:STDOUT: %d_val: ref %C = ref_binding d_val, %d_val.var [concrete = %d_val.var] +// CHECK:STDOUT: %d_val: ref %C = wrapper_binding d_val, %d_val.var [concrete = %d_val.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c_val.patt: %pattern_type = ref_binding_pattern c_val [concrete = constants.%c_val.patt] // CHECK:STDOUT: %c_val.var_patt: %pattern_type = var_pattern %c_val.patt [concrete = constants.%c_val.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %c_val.var: ref %C = var %c_val.var_patt [concrete] // CHECK:STDOUT: %c.ref: type = name_ref c, imports.%Main.c [concrete = constants.%C] -// CHECK:STDOUT: %c_val: ref %C = ref_binding c_val, %c_val.var [concrete = %c_val.var] +// CHECK:STDOUT: %c_val: ref %C = wrapper_binding c_val, %c_val.var [concrete = %c_val.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b_val.patt: %pattern_type = ref_binding_pattern b_val [concrete = constants.%b_val.patt] // CHECK:STDOUT: %b_val.var_patt: %pattern_type = var_pattern %b_val.patt [concrete = constants.%b_val.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %b_val.var: ref %C = var %b_val.var_patt [concrete] // CHECK:STDOUT: %b.ref: type = name_ref b, imports.%Main.b [concrete = constants.%C] -// CHECK:STDOUT: %b_val: ref %C = ref_binding b_val, %b_val.var [concrete = %b_val.var] +// CHECK:STDOUT: %b_val: ref %C = wrapper_binding b_val, %b_val.var [concrete = %b_val.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %a_val.patt: %pattern_type = ref_binding_pattern a_val [concrete = constants.%a_val.patt] // CHECK:STDOUT: %a_val.var_patt: %pattern_type = var_pattern %a_val.patt [concrete = constants.%a_val.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %a_val.var: ref %C = var %a_val.var_patt [concrete] // CHECK:STDOUT: %a.ref: type = name_ref a, imports.%Main.a [concrete = constants.%C] -// CHECK:STDOUT: %a_val: ref %C = ref_binding a_val, %a_val.var [concrete = %a_val.var] +// CHECK:STDOUT: %a_val: ref %C = wrapper_binding a_val, %a_val.var [concrete = %a_val.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "a.carbon"] { diff --git a/toolchain/check/testdata/array/basics.carbon b/toolchain/check/testdata/array/basics.carbon index 30b47c38b11e..5ad4b71d3129 100644 --- a/toolchain/check/testdata/array/basics.carbon +++ b/toolchain/check/testdata/array/basics.carbon @@ -137,7 +137,7 @@ var a: array(1, 1); // CHECK:STDOUT: %.loc6_15.2: type = converted %.loc6_15.1, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: %array_type: type = array_type %int_3, %.loc6_15.2 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: ref %array_type = ref_binding b, %b.var [concrete = %b.var] +// CHECK:STDOUT: %b: ref %array_type = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -223,7 +223,7 @@ var a: array(1, 1); // CHECK:STDOUT: %.loc10_31.2: type = converted %.loc10_31.1, constants.%tuple.type.a8c [concrete = constants.%tuple.type.a8c] // CHECK:STDOUT: %array_type: type = array_type %int_2, %.loc10_31.2 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: ref %array_type = ref_binding v, %v.var +// CHECK:STDOUT: %v: ref %array_type = wrapper_binding v, %v.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %v.var, constants.%Destroy.Op.1a2547.4 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%v.var) // CHECK:STDOUT: @@ -301,7 +301,7 @@ var a: array(1, 1); // CHECK:STDOUT: %.loc7_24.2: type = converted %.loc7_24.1, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: %array_type: type = array_type %int_3, %.loc7_24.2 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %array_type = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %array_type = wrapper_binding a, %a.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.8c1 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.8c1 = var_pattern %b.patt [concrete = constants.%b.var_patt] @@ -325,7 +325,7 @@ var a: array(1, 1); // CHECK:STDOUT: %.loc8_28.5: type = converted constants.%empty_tuple, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: %.loc8_28.6: type = converted %.loc8_28.2, constants.%tuple.type [concrete = constants.%tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: ref %tuple.type = ref_binding b, %b.var +// CHECK:STDOUT: %b: ref %tuple.type = wrapper_binding b, %b.var // CHECK:STDOUT: %Destroy.Op.bound.loc8: = bound_method %b.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call.loc8: init %empty_tuple.type = call %Destroy.Op.bound.loc8(%b.var) // CHECK:STDOUT: %Destroy.Op.bound.loc7: = bound_method %a.var, constants.%Destroy.Op.1a2547.3 @@ -392,7 +392,7 @@ var a: array(1, 1); // CHECK:STDOUT: %.loc8_24.2: type = converted %.loc8_24.1, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: %array_type: type = array_type %int_1, %.loc8_24.2 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %t: ref %array_type = ref_binding t, %t.var +// CHECK:STDOUT: %t: ref %array_type = wrapper_binding t, %t.var // CHECK:STDOUT: %Destroy.Op.bound.loc8_34: = bound_method %.loc8_34.2, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call.loc8_34: init %empty_tuple.type = call %Destroy.Op.bound.loc8_34(%.loc8_34.2) // CHECK:STDOUT: %Destroy.Op.bound.loc8_3: = bound_method %t.var, constants.%Destroy.Op.1a2547.3 @@ -456,7 +456,7 @@ var a: array(1, 1); // CHECK:STDOUT: %.loc9_15.2: type = converted %.loc9_15.1, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: %array_type: type = array_type %int_9, %.loc9_15.2 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: ref %array_type = ref_binding b, %b.var [concrete = %b.var] +// CHECK:STDOUT: %b: ref %array_type = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/array/import.carbon b/toolchain/check/testdata/array/import.carbon index a8f20ffc66ac..c6808967d13e 100644 --- a/toolchain/check/testdata/array/import.carbon +++ b/toolchain/check/testdata/array/import.carbon @@ -160,7 +160,7 @@ fn F() -> i32 { // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %array_type: type = array_type %int_1, %i32.loc7 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %array_type = value_binding a, %impl.elem0.loc7 +// CHECK:STDOUT: %a: %array_type = wrapper_binding a, %impl.elem0.loc7 // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/array/init_dependent_bound.carbon b/toolchain/check/testdata/array/init_dependent_bound.carbon index 56d1d88f9047..c0b10caa9077 100644 --- a/toolchain/check/testdata/array/init_dependent_bound.carbon +++ b/toolchain/check/testdata/array/init_dependent_bound.carbon @@ -127,7 +127,7 @@ fn H() { G(3); } // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [concrete = constants.%int_0] // CHECK:STDOUT: %array_type.loc7_29.1: type = array_type %int_0, %T.ref [symbolic = %array_type.loc7_29.2 (constants.%array_type.1b3)] // CHECK:STDOUT: } -// CHECK:STDOUT: %arr: ref @G.%array_type.loc7_29.2 (%array_type.1b3) = ref_binding arr, %arr.var +// CHECK:STDOUT: %arr: ref @G.%array_type.loc7_29.2 (%array_type.1b3) = wrapper_binding arr, %arr.var // CHECK:STDOUT: %impl.elem0.loc7_3.1: @G.%.loc7_3.4 (%.1e5) = impl_witness_access constants.%Destroy.lookup_impl_witness, element0 [symbolic = %impl.elem0.loc7_3.2 (constants.%impl.elem0)] // CHECK:STDOUT: %bound_method.loc7_3.1: = bound_method %arr.var, %impl.elem0.loc7_3.1 // CHECK:STDOUT: %Destroy.facet.loc7_3.1: %Destroy.type = facet_value constants.%array_type.1b3, (constants.%Destroy.lookup_impl_witness) [symbolic = %Destroy.facet.loc7_3.3 (constants.%Destroy.facet.a52)] @@ -231,7 +231,7 @@ fn H() { G(3); } // CHECK:STDOUT: %.loc11_43: %tuple.type = tuple_literal (%int_1, %int_2, %int_3) [concrete = constants.%tuple] // CHECK:STDOUT: assign %arr.var, // CHECK:STDOUT: -// CHECK:STDOUT: %arr: ref = ref_binding arr, [concrete = ] +// CHECK:STDOUT: %arr: = wrapper_binding arr, [concrete = ] // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/as/adapter_conversion.carbon b/toolchain/check/testdata/as/adapter_conversion.carbon index 586f129f30e1..0d81069c94ff 100644 --- a/toolchain/check/testdata/as/adapter_conversion.carbon +++ b/toolchain/check/testdata/as/adapter_conversion.carbon @@ -193,7 +193,7 @@ var b: B = {.x = ()} as B; // CHECK:STDOUT: %b_val.patt: %pattern_type.e39 = value_binding_pattern b_val [concrete = constants.%b_val.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %B.ref.loc22: type = name_ref B, %B.decl [concrete = constants.%B] -// CHECK:STDOUT: %b_val: %B = value_binding b_val, @__global_init.%.loc22_22.2 +// CHECK:STDOUT: %b_val: %B = wrapper_binding b_val, @__global_init.%.loc22_22.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b_ptr.patt: %pattern_type.3c8 = value_binding_pattern b_ptr [concrete = constants.%b_ptr.patt] // CHECK:STDOUT: } @@ -201,14 +201,14 @@ var b: B = {.x = ()} as B; // CHECK:STDOUT: %B.ref.loc23: type = name_ref B, %B.decl [concrete = constants.%B] // CHECK:STDOUT: %ptr: type = ptr_type %B.ref.loc23 [concrete = constants.%ptr.432] // CHECK:STDOUT: } -// CHECK:STDOUT: %b_ptr: %ptr.432 = value_binding b_ptr, @__global_init.%addr +// CHECK:STDOUT: %b_ptr: %ptr.432 = wrapper_binding b_ptr, @__global_init.%addr // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b_factory.patt: %pattern_type.e39 = ref_binding_pattern b_factory [concrete = constants.%b_factory.patt] // CHECK:STDOUT: %b_factory.var_patt: %pattern_type.e39 = var_pattern %b_factory.patt [concrete = constants.%b_factory.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %b_factory.var: ref %B = var %b_factory.var_patt [concrete] // CHECK:STDOUT: %B.ref.loc25: type = name_ref B, %B.decl [concrete = constants.%B] -// CHECK:STDOUT: %b_factory: ref %B = ref_binding b_factory, %b_factory.var [concrete = %b_factory.var] +// CHECK:STDOUT: %b_factory: ref %B = wrapper_binding b_factory, %b_factory.var [concrete = %b_factory.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -272,12 +272,12 @@ var b: B = {.x = ()} as B; // CHECK:STDOUT: %a.patt: %pattern_type.9ef = value_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %A.ref: type = name_ref A, %A.decl [concrete = constants.%A] -// CHECK:STDOUT: %a: %A = value_binding a, @__global_init.%.loc9_23.2 +// CHECK:STDOUT: %a: %A = wrapper_binding a, @__global_init.%.loc9_23.2 // 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: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: %i32 = value_binding n, @__global_init.%.loc10_16.2 +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, @__global_init.%.loc10_16.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -317,7 +317,7 @@ var b: B = {.x = ()} as B; // CHECK:STDOUT: %d.patt: %pattern_type = value_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %D.ref: type = name_ref D, %D.decl [concrete = constants.%D] -// CHECK:STDOUT: %d: %D = value_binding d, @__global_init.%.loc10_15.2 +// CHECK:STDOUT: %d: %D = wrapper_binding d, @__global_init.%.loc10_15.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -377,7 +377,7 @@ var b: B = {.x = ()} as B; // CHECK:STDOUT: %.loc14_42.1: ref %B = temporary @__global_init.%.loc14_34.3, @__global_init.%.loc14_42.2 [concrete = constants.%.07b] // CHECK:STDOUT: %.loc14_42.2: %B = acquire_value %.loc14_42.1 [concrete = constants.%B.val] // CHECK:STDOUT: %B.ref: type = name_ref B, %B.decl [concrete = constants.%B] -// CHECK:STDOUT: %b_value: %B = value_binding b_value, %.loc14_42.2 +// CHECK:STDOUT: %b_value: %B = wrapper_binding b_value, %.loc14_42.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -442,7 +442,7 @@ var b: B = {.x = ()} as B; // CHECK:STDOUT: %.loc14_52.1: %A = as_compatible %.loc14_30.2 // CHECK:STDOUT: %.loc14_52.2: %A = converted %.loc14_30.2, %.loc14_52.1 // CHECK:STDOUT: %A.ref.loc14_23: type = name_ref A, file.%A.decl [concrete = constants.%A] -// CHECK:STDOUT: %a_value: %A = value_binding a_value, %.loc14_52.2 +// CHECK:STDOUT: %a_value: %A = wrapper_binding a_value, %.loc14_52.2 // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/as/basics.carbon b/toolchain/check/testdata/as/basics.carbon index 604bcf187c55..cd00fb55c58f 100644 --- a/toolchain/check/testdata/as/basics.carbon +++ b/toolchain/check/testdata/as/basics.carbon @@ -186,7 +186,7 @@ let n: {.x: ()} = {.x = ()} as {.x = ()}; // CHECK:STDOUT: %t.patt: %pattern_type = value_binding_pattern t [concrete = constants.%t.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc5: type = type_literal type [concrete = type] -// CHECK:STDOUT: %t: type = value_binding t, @__global_init.%.loc5_24.3 +// CHECK:STDOUT: %t: type = wrapper_binding t, @__global_init.%.loc5_24.3 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -250,7 +250,7 @@ let n: {.x: ()} = {.x = ()} as {.x = ()}; // CHECK:STDOUT: %.loc13_22.2: %tuple.type.24b = tuple_literal (%X.ref.loc13_18, %X.ref.loc13_21) [concrete = constants.%tuple] // CHECK:STDOUT: %.loc13_22.3: type = converted %.loc13_22.2, constants.%tuple.type.359 [concrete = constants.%tuple.type.359] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %tuple.type.359 = value_binding a, %.loc13_41.2 +// CHECK:STDOUT: %a: %tuple.type.359 = wrapper_binding a, %.loc13_41.2 // CHECK:STDOUT: %Destroy.Op.bound.loc13_40: = bound_method %.loc13_40.2, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call.loc13_40: init %empty_tuple.type = call %Destroy.Op.bound.loc13_40(%.loc13_40.2) // CHECK:STDOUT: %Destroy.Op.bound.loc13_32: = bound_method %.loc13_32.2, constants.%Destroy.Op.1a2547.2 @@ -292,7 +292,7 @@ let n: {.x: ()} = {.x = ()} as {.x = ()}; // CHECK:STDOUT: %.loc20_22.2: %tuple.type.24b = tuple_literal (%X.ref.loc20_18, %X.ref.loc20_21) [concrete = constants.%tuple] // CHECK:STDOUT: %.loc20_22.3: type = converted %.loc20_22.2, constants.%tuple.type.359 [concrete = constants.%tuple.type.359] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: ref %tuple.type.359 = ref_binding b, %b.var +// CHECK:STDOUT: %b: ref %tuple.type.359 = wrapper_binding b, %b.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %b.var, constants.%Destroy.Op.1a2547.3 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%b.var) // CHECK:STDOUT: @@ -330,7 +330,7 @@ let n: {.x: ()} = {.x = ()} as {.x = ()}; // CHECK:STDOUT: %n.ref: %X = name_ref n, %n // CHECK:STDOUT: %X.ref.loc10_26: type = name_ref X, file.%X.decl [concrete = constants.%X] // CHECK:STDOUT: %X.ref.loc10_17: type = name_ref X, file.%X.decl [concrete = constants.%X] -// CHECK:STDOUT: %m: %X = value_binding m, %n.ref +// CHECK:STDOUT: %m: %X = wrapper_binding m, %n.ref // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -347,7 +347,7 @@ let n: {.x: ()} = {.x = ()} as {.x = ()}; // CHECK:STDOUT: %X.ref.loc16_17: type = name_ref X, file.%X.decl [concrete = constants.%X] // CHECK:STDOUT: %ptr.loc16: type = ptr_type %X.ref.loc16_17 [concrete = constants.%ptr.db8] // CHECK:STDOUT: } -// CHECK:STDOUT: %q: %ptr.db8 = value_binding q, %addr +// CHECK:STDOUT: %q: %ptr.db8 = wrapper_binding q, %addr // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -364,7 +364,7 @@ let n: {.x: ()} = {.x = ()} as {.x = ()}; // CHECK:STDOUT: %X.ref.loc24_32: type = name_ref X, file.%X.decl [concrete = constants.%X] // CHECK:STDOUT: assign %x.var, %Make.call // CHECK:STDOUT: %X.ref.loc24_17: type = name_ref X, file.%X.decl [concrete = constants.%X] -// CHECK:STDOUT: %x: ref %X = ref_binding x, %x.var +// CHECK:STDOUT: %x: ref %X = wrapper_binding x, %x.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %x.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%x.var) // CHECK:STDOUT: @@ -407,7 +407,7 @@ let n: {.x: ()} = {.x = ()} as {.x = ()}; // CHECK:STDOUT: %.loc19_29.1: ref %Y = temporary @__global_init.%.loc19_29.1, @__global_init.%.loc19_29.2 // CHECK:STDOUT: %.loc19_29.2: %Y = acquire_value %.loc19_29.1 // CHECK:STDOUT: %Y.ref: type = name_ref Y, %Y.decl [concrete = constants.%Y] -// CHECK:STDOUT: %n: %Y = value_binding n, %.loc19_29.2 +// CHECK:STDOUT: %n: %Y = wrapper_binding n, %.loc19_29.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/as/const.carbon b/toolchain/check/testdata/as/const.carbon index 845b943d9b5a..b40b70135029 100644 --- a/toolchain/check/testdata/as/const.carbon +++ b/toolchain/check/testdata/as/const.carbon @@ -135,7 +135,7 @@ fn Use() { // CHECK:STDOUT: %X.ref.loc14_23: type = name_ref X, file.%X.decl [concrete = constants.%X] // CHECK:STDOUT: %const.loc14_17: type = const_type %X.ref.loc14_23 [concrete = constants.%const] // CHECK:STDOUT: } -// CHECK:STDOUT: %i: ref %const = ref_binding i, %i.var +// CHECK:STDOUT: %i: ref %const = wrapper_binding i, %i.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %v.patt: %pattern_type.dfd = value_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: } @@ -148,7 +148,7 @@ fn Use() { // CHECK:STDOUT: %X.ref.loc15_23: type = name_ref X, file.%X.decl [concrete = constants.%X] // CHECK:STDOUT: %const.loc15_17: type = const_type %X.ref.loc15_23 [concrete = constants.%const] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: %const = value_binding v, %.loc15_33.2 +// CHECK:STDOUT: %v: %const = wrapper_binding v, %.loc15_33.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %a.patt: %pattern_type.7f7 = value_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: } @@ -163,7 +163,7 @@ fn Use() { // CHECK:STDOUT: %const.loc16_17: type = const_type %X.ref.loc16_23 [concrete = constants.%const] // CHECK:STDOUT: %ptr.loc16: type = ptr_type %const.loc16_17 [concrete = constants.%ptr.faf] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %ptr.faf = value_binding a, %addr +// CHECK:STDOUT: %a: %ptr.faf = wrapper_binding a, %addr // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.7f7 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } @@ -178,7 +178,7 @@ fn Use() { // CHECK:STDOUT: %const.loc17_17: type = const_type %X.ref.loc17_23 [concrete = constants.%const] // CHECK:STDOUT: %ptr.loc17_24: type = ptr_type %const.loc17_17 [concrete = constants.%ptr.faf] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %ptr.faf = value_binding b, %.loc17_32.2 +// CHECK:STDOUT: %b: %ptr.faf = wrapper_binding b, %.loc17_32.2 // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %i.var, constants.%Destroy.Op.1a2547.3 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%i.var) // CHECK:STDOUT: @@ -233,7 +233,7 @@ fn Use() { // CHECK:STDOUT: %.loc12_28.2: init %X = converted %Init.call, %.loc12_28.1 // CHECK:STDOUT: assign %i.var, %.loc12_28.2 // CHECK:STDOUT: %X.ref.loc12_17: type = name_ref X, file.%X.decl [concrete = constants.%X] -// CHECK:STDOUT: %i: ref %X = ref_binding i, %i.var +// CHECK:STDOUT: %i: ref %X = wrapper_binding i, %i.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %v.patt: %pattern_type.6cb = value_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: } @@ -242,7 +242,7 @@ fn Use() { // CHECK:STDOUT: %.loc13_27.1: %X = as_compatible %value.ref // CHECK:STDOUT: %.loc13_27.2: %X = converted %value.ref, %.loc13_27.1 // CHECK:STDOUT: %X.ref.loc13_17: type = name_ref X, file.%X.decl [concrete = constants.%X] -// CHECK:STDOUT: %v: %X = value_binding v, %.loc13_27.2 +// CHECK:STDOUT: %v: %X = wrapper_binding v, %.loc13_27.2 // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %i.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%i.var) // CHECK:STDOUT: @@ -288,7 +288,7 @@ fn Use() { // CHECK:STDOUT: %X.ref.loc11_17: type = name_ref X, file.%X.decl [concrete = constants.%X] // CHECK:STDOUT: %ptr.loc11: type = ptr_type %X.ref.loc11_17 [concrete = constants.%ptr.db8] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %ptr.db8 = value_binding a, %addr +// CHECK:STDOUT: %a: %ptr.db8 = wrapper_binding a, %addr // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.990 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } @@ -301,7 +301,7 @@ fn Use() { // CHECK:STDOUT: %X.ref.loc12_17: type = name_ref X, file.%X.decl [concrete = constants.%X] // CHECK:STDOUT: %ptr.loc12_18: type = ptr_type %X.ref.loc12_17 [concrete = constants.%ptr.db8] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %ptr.db8 = value_binding b, %.loc12_33.2 +// CHECK:STDOUT: %b: %ptr.db8 = wrapper_binding b, %.loc12_33.2 // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/as/maybe_unformed.carbon b/toolchain/check/testdata/as/maybe_unformed.carbon index 51f17cb4fb75..f7fc71bb9c92 100644 --- a/toolchain/check/testdata/as/maybe_unformed.carbon +++ b/toolchain/check/testdata/as/maybe_unformed.carbon @@ -181,7 +181,7 @@ fn Use() { // CHECK:STDOUT: %MaybeUnformed.loc12_37: type = class_type @MaybeUnformed, @MaybeUnformed(constants.%X) [concrete = constants.%MaybeUnformed.198] // CHECK:STDOUT: %ptr.loc12: type = ptr_type %MaybeUnformed.loc12_37 [concrete = constants.%ptr.b8c] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %ptr.b8c = value_binding a, %addr +// CHECK:STDOUT: %a: %ptr.b8c = wrapper_binding a, %addr // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.abe = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } @@ -200,7 +200,7 @@ fn Use() { // CHECK:STDOUT: %MaybeUnformed.loc13_37: type = class_type @MaybeUnformed, @MaybeUnformed(constants.%X) [concrete = constants.%MaybeUnformed.198] // CHECK:STDOUT: %ptr.loc13_38: type = ptr_type %MaybeUnformed.loc13_37 [concrete = constants.%ptr.b8c] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %ptr.b8c = value_binding b, %.loc13_46.2 +// CHECK:STDOUT: %b: %ptr.b8c = wrapper_binding b, %.loc13_46.2 // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -267,7 +267,7 @@ fn Use() { // CHECK:STDOUT: %X.ref.loc19_36: type = name_ref X, file.%X.decl [concrete = constants.%X] // CHECK:STDOUT: %MaybeUnformed.loc19_37: type = class_type @MaybeUnformed, @MaybeUnformed(constants.%X) [concrete = constants.%MaybeUnformed.198] // CHECK:STDOUT: } -// CHECK:STDOUT: %i: ref %MaybeUnformed.198 = ref_binding i, %i.var +// CHECK:STDOUT: %i: ref %MaybeUnformed.198 = wrapper_binding i, %i.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %v.patt: %pattern_type.009 = value_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: } @@ -283,7 +283,7 @@ fn Use() { // CHECK:STDOUT: %X.ref.loc27_36: type = name_ref X, file.%X.decl [concrete = constants.%X] // CHECK:STDOUT: %MaybeUnformed.loc27_37: type = class_type @MaybeUnformed, @MaybeUnformed(constants.%X) [concrete = constants.%MaybeUnformed.198] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: %MaybeUnformed.198 = value_binding v, [concrete = ] +// CHECK:STDOUT: %v: %MaybeUnformed.198 = wrapper_binding v, [concrete = ] // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %i.var, constants.%Destroy.Op.1a2547.4 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%i.var) // CHECK:STDOUT: @@ -337,7 +337,7 @@ fn Use() { // CHECK:STDOUT: %.loc13_34.1: %X = as_compatible %value.ref // CHECK:STDOUT: %.loc13_34.2: %X = converted %value.ref, %.loc13_34.1 // CHECK:STDOUT: %X.ref.loc13_17: type = name_ref X, file.%X.decl [concrete = constants.%X] -// CHECK:STDOUT: %v: %X = value_binding v, %.loc13_34.2 +// CHECK:STDOUT: %v: %X = wrapper_binding v, %.loc13_34.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %a.patt: %pattern_type.990 = value_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: } @@ -350,7 +350,7 @@ fn Use() { // CHECK:STDOUT: %X.ref.loc14_17: type = name_ref X, file.%X.decl [concrete = constants.%X] // CHECK:STDOUT: %ptr.loc14: type = ptr_type %X.ref.loc14_17 [concrete = constants.%ptr.db8] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %ptr.db8 = value_binding a, %addr +// CHECK:STDOUT: %a: %ptr.db8 = wrapper_binding a, %addr // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.990 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } @@ -363,7 +363,7 @@ fn Use() { // CHECK:STDOUT: %X.ref.loc15_17: type = name_ref X, file.%X.decl [concrete = constants.%X] // CHECK:STDOUT: %ptr.loc15_18: type = ptr_type %X.ref.loc15_17 [concrete = constants.%ptr.db8] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %ptr.db8 = value_binding b, %.loc15_33.2 +// CHECK:STDOUT: %b: %ptr.db8 = wrapper_binding b, %.loc15_33.2 // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/as/partial.carbon b/toolchain/check/testdata/as/partial.carbon index 301333ecae8c..40c815cba738 100644 --- a/toolchain/check/testdata/as/partial.carbon +++ b/toolchain/check/testdata/as/partial.carbon @@ -149,7 +149,7 @@ fn Use() { // CHECK:STDOUT: %X.ref.loc14_25: type = name_ref X, file.%X.decl [concrete = constants.%X] // CHECK:STDOUT: %.loc14_17.2: type = partial_type %X.ref.loc14_25 [concrete = constants.%.d74] // CHECK:STDOUT: } -// CHECK:STDOUT: %i: ref %.d74 = ref_binding i, %i.var +// CHECK:STDOUT: %i: ref %.d74 = wrapper_binding i, %i.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %v.patt: %pattern_type.53b = value_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: } @@ -162,7 +162,7 @@ fn Use() { // CHECK:STDOUT: %X.ref.loc15_25: type = name_ref X, file.%X.decl [concrete = constants.%X] // CHECK:STDOUT: %.loc15_17.2: type = partial_type %X.ref.loc15_25 [concrete = constants.%.d74] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: %.d74 = value_binding v, %.loc15_35.2 +// CHECK:STDOUT: %v: %.d74 = wrapper_binding v, %.loc15_35.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %a.patt: %pattern_type.12c = value_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: } @@ -177,7 +177,7 @@ fn Use() { // CHECK:STDOUT: %.loc16_17: type = partial_type %X.ref.loc16_25 [concrete = constants.%.d74] // CHECK:STDOUT: %ptr.loc16: type = ptr_type %.loc16_17 [concrete = constants.%ptr.44a] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %ptr.44a = value_binding a, %addr +// CHECK:STDOUT: %a: %ptr.44a = wrapper_binding a, %addr // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.12c = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } @@ -192,7 +192,7 @@ fn Use() { // CHECK:STDOUT: %.loc17_17: type = partial_type %X.ref.loc17_25 [concrete = constants.%.d74] // CHECK:STDOUT: %ptr.loc17_26: type = ptr_type %.loc17_17 [concrete = constants.%ptr.44a] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %ptr.44a = value_binding b, %.loc17_34.2 +// CHECK:STDOUT: %b: %ptr.44a = wrapper_binding b, %.loc17_34.2 // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %i.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%i.var) // CHECK:STDOUT: @@ -244,7 +244,7 @@ fn Use() { // CHECK:STDOUT: %.loc10_3.3: init %X = converted %Init.call.loc10, %.loc10_3.2 // CHECK:STDOUT: assign %i.var, %.loc10_3.3 // CHECK:STDOUT: %X.ref.loc10: type = name_ref X, file.%X.decl [concrete = constants.%X] -// CHECK:STDOUT: %i: ref %X = ref_binding i, %i.var +// CHECK:STDOUT: %i: ref %X = wrapper_binding i, %i.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %j.patt: %pattern_type.6cb = ref_binding_pattern j [concrete = constants.%j.patt] // CHECK:STDOUT: %j.var_patt: %pattern_type.6cb = var_pattern %j.patt [concrete = constants.%j.var_patt] @@ -258,7 +258,7 @@ fn Use() { // CHECK:STDOUT: %.loc11_28.2: init %X = converted %Init.call.loc11, %.loc11_28.1 // CHECK:STDOUT: assign %j.var, %.loc11_28.2 // CHECK:STDOUT: %X.ref.loc11_17: type = name_ref X, file.%X.decl [concrete = constants.%X] -// CHECK:STDOUT: %j: ref %X = ref_binding j, %j.var +// CHECK:STDOUT: %j: ref %X = wrapper_binding j, %j.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %k.patt: %pattern_type.6cb = ref_binding_pattern k [concrete = constants.%k.patt] // CHECK:STDOUT: %k.var_patt: %pattern_type.6cb = var_pattern %k.patt [concrete = constants.%k.var_patt] @@ -272,7 +272,7 @@ fn Use() { // CHECK:STDOUT: %.loc12_35.2: init %X = converted %Init.call.loc12, %.loc12_35.1 // CHECK:STDOUT: assign %k.var, %.loc12_35.2 // CHECK:STDOUT: %X.ref.loc12_17: type = name_ref X, file.%X.decl [concrete = constants.%X] -// CHECK:STDOUT: %k: ref %X = ref_binding k, %k.var +// CHECK:STDOUT: %k: ref %X = wrapper_binding k, %k.var // CHECK:STDOUT: %Destroy.Op.bound.loc12: = bound_method %k.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call.loc12: init %empty_tuple.type = call %Destroy.Op.bound.loc12(%k.var) // CHECK:STDOUT: %Destroy.Op.bound.loc11: = bound_method %j.var, constants.%Destroy.Op.1a2547.2 @@ -315,7 +315,7 @@ fn Use() { // CHECK:STDOUT: %.loc14_34.1: %X = as_compatible %value.ref // CHECK:STDOUT: %.loc14_34.2: %X = converted %value.ref, %.loc14_34.1 // CHECK:STDOUT: %X.ref.loc14_17: type = name_ref X, file.%X.decl [concrete = constants.%X] -// CHECK:STDOUT: %v: %X = value_binding v, %.loc14_34.2 +// CHECK:STDOUT: %v: %X = wrapper_binding v, %.loc14_34.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %a.patt: %pattern_type.990 = value_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: } @@ -328,7 +328,7 @@ fn Use() { // CHECK:STDOUT: %X.ref.loc15_17: type = name_ref X, file.%X.decl [concrete = constants.%X] // CHECK:STDOUT: %ptr.loc15: type = ptr_type %X.ref.loc15_17 [concrete = constants.%ptr.db8] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %ptr.db8 = value_binding a, %addr +// CHECK:STDOUT: %a: %ptr.db8 = wrapper_binding a, %addr // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.990 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } @@ -341,7 +341,7 @@ fn Use() { // CHECK:STDOUT: %X.ref.loc16_17: type = name_ref X, file.%X.decl [concrete = constants.%X] // CHECK:STDOUT: %ptr.loc16_18: type = ptr_type %X.ref.loc16_17 [concrete = constants.%ptr.db8] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %ptr.db8 = value_binding b, %.loc16_33.2 +// CHECK:STDOUT: %b: %ptr.db8 = wrapper_binding b, %.loc16_33.2 // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/as/var_init.carbon b/toolchain/check/testdata/as/var_init.carbon index d2c7f33b93ec..ade1015be8b2 100644 --- a/toolchain/check/testdata/as/var_init.carbon +++ b/toolchain/check/testdata/as/var_init.carbon @@ -66,7 +66,7 @@ fn Convert(unused t: ()) { // CHECK:STDOUT: %.loc12_3.2: init %X = converted %.loc12_22.1, %empty_tuple.type.as.ImplicitAs.impl.Convert.call // CHECK:STDOUT: assign %x.var, %.loc12_3.2 // CHECK:STDOUT: %X.ref: type = name_ref X, file.%X.decl [concrete = constants.%X] -// CHECK:STDOUT: %x: ref %X = ref_binding x, %x.var +// CHECK:STDOUT: %x: ref %X = wrapper_binding x, %x.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %x.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%x.var) // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/dump_sem_ir_ranges.carbon b/toolchain/check/testdata/basics/dump_sem_ir_ranges.carbon index 6b077b747a5d..fd06f6c3c906 100644 --- a/toolchain/check/testdata/basics/dump_sem_ir_ranges.carbon +++ b/toolchain/check/testdata/basics/dump_sem_ir_ranges.carbon @@ -156,7 +156,7 @@ library "[[@TEST_NAME]]"; // CHECK:STDOUT: %.loc18_11.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc18_11.3: type = converted %.loc18_11.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %empty_tuple.type = ref_binding c, %c.var +// CHECK:STDOUT: %c: ref %empty_tuple.type = wrapper_binding c, %c.var // CHECK:STDOUT: %c.ref.loc19: ref %empty_tuple.type = name_ref c, %c // CHECK:STDOUT: %B.ref: %B.type = name_ref B, file.%B.decl [concrete = constants.%B] // CHECK:STDOUT: %B.call: init %empty_tuple.type = call %B.ref() diff --git a/toolchain/check/testdata/basics/duplicate_name_same_line.carbon b/toolchain/check/testdata/basics/duplicate_name_same_line.carbon index b50ae7750242..eae42d00ce6b 100644 --- a/toolchain/check/testdata/basics/duplicate_name_same_line.carbon +++ b/toolchain/check/testdata/basics/duplicate_name_same_line.carbon @@ -52,7 +52,7 @@ fn A() { // CHECK:STDOUT: %.loc18_20.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc18_20.3: type = converted %.loc18_20.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %n.loc18_17: ref %empty_tuple.type = ref_binding n, %n.var.loc18_5 +// CHECK:STDOUT: %n.loc18_17: ref %empty_tuple.type = wrapper_binding n, %n.var.loc18_5 // CHECK:STDOUT: // CHECK:STDOUT: // CHECK:STDOUT: !if.else: @@ -69,7 +69,7 @@ fn A() { // CHECK:STDOUT: %.loc18_52.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc18_52.3: type = converted %.loc18_52.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %n.loc18_49: ref %empty_tuple.type = ref_binding n, %n.var.loc18_37 +// CHECK:STDOUT: %n.loc18_49: ref %empty_tuple.type = wrapper_binding n, %n.var.loc18_37 // CHECK:STDOUT: // CHECK:STDOUT: // CHECK:STDOUT: !if.done: diff --git a/toolchain/check/testdata/basics/include_in_dumps.carbon b/toolchain/check/testdata/basics/include_in_dumps.carbon index dc2a1e7ae9e0..f4e4eefecdd4 100644 --- a/toolchain/check/testdata/basics/include_in_dumps.carbon +++ b/toolchain/check/testdata/basics/include_in_dumps.carbon @@ -158,7 +158,7 @@ fn F(c: C) { c.(I.Op)(); } // CHECK:STDOUT: %Self.as_type.loc8_9.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc8_9.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc8_9.2: type = converted %Self.ref, %Self.as_type.loc8_9.2 [symbolic = %Self.as_type.loc8_9.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @I.WithSelf.Op.%Self.as_type.loc8_9.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @I.WithSelf.Op.%Self.as_type.loc8_9.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0: %I.assoc_type = assoc_entity element0, %I.WithSelf.Op.decl [concrete = constants.%assoc0] // CHECK:STDOUT: @@ -277,7 +277,7 @@ fn F(c: C) { c.(I.Op)(); } // CHECK:STDOUT: } { // CHECK:STDOUT: %c.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %c: %C = value_binding c, %c.param +// CHECK:STDOUT: %c: %C = wrapper_binding c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -399,7 +399,7 @@ fn F(c: C) { c.(I.Op)(); } // CHECK:STDOUT: } { // CHECK:STDOUT: %c.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %c: %C = value_binding c, %c.param +// CHECK:STDOUT: %c: %C = wrapper_binding c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/parens.carbon b/toolchain/check/testdata/basics/parens.carbon index 246db27ba066..deef98d4c127 100644 --- a/toolchain/check/testdata/basics/parens.carbon +++ b/toolchain/check/testdata/basics/parens.carbon @@ -75,14 +75,14 @@ var b: i32 = ((2)); // CHECK:STDOUT: } // CHECK:STDOUT: %a.var: ref %i32 = var %a.var_patt [concrete] // CHECK:STDOUT: %i32.loc14: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: ref %i32 = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %i32 = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] // CHECK:STDOUT: %i32.loc15: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: ref %i32 = ref_binding b, %b.var [concrete = %b.var] +// CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/basics/raw_identifier.carbon b/toolchain/check/testdata/basics/raw_identifier.carbon index 1197c500b86e..5d576ecb0e29 100644 --- a/toolchain/check/testdata/basics/raw_identifier.carbon +++ b/toolchain/check/testdata/basics/raw_identifier.carbon @@ -64,7 +64,7 @@ fn C(r#if: ()) -> () { // CHECK:STDOUT: %.loc14_10.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc14_10.3: type = converted %.loc14_10.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %n: %empty_tuple.type = value_binding n, %n.param +// CHECK:STDOUT: %n: %empty_tuple.type = wrapper_binding n, %n.param // CHECK:STDOUT: %return.param: ref %empty_tuple.type = out_param call_param1 // CHECK:STDOUT: %return: ref %empty_tuple.type = return_slot %return.param // CHECK:STDOUT: } @@ -82,7 +82,7 @@ fn C(r#if: ()) -> () { // CHECK:STDOUT: %.loc18_12.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc18_12.3: type = converted %.loc18_12.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %n: %empty_tuple.type = value_binding n, %n.param +// CHECK:STDOUT: %n: %empty_tuple.type = wrapper_binding n, %n.param // CHECK:STDOUT: %return.param: ref %empty_tuple.type = out_param call_param1 // CHECK:STDOUT: %return: ref %empty_tuple.type = return_slot %return.param // CHECK:STDOUT: } @@ -100,7 +100,7 @@ fn C(r#if: ()) -> () { // CHECK:STDOUT: %.loc22_13.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc22_13.3: type = converted %.loc22_13.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %if: %empty_tuple.type = value_binding r#if, %if.param +// CHECK:STDOUT: %if: %empty_tuple.type = wrapper_binding r#if, %if.param // CHECK:STDOUT: %return.param: ref %empty_tuple.type = out_param call_param1 // CHECK:STDOUT: %return: ref %empty_tuple.type = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/basics/raw_sem_ir/cpp_interop.carbon b/toolchain/check/testdata/basics/raw_sem_ir/cpp_interop.carbon index 6fdb17779693..ce463e09d287 100644 --- a/toolchain/check/testdata/basics/raw_sem_ir/cpp_interop.carbon +++ b/toolchain/check/testdata/basics/raw_sem_ir/cpp_interop.carbon @@ -209,7 +209,7 @@ fn G(x: Cpp.X) { // CHECK:STDOUT: inst50000018: {kind: ValueParamPattern, arg0: name1, type: type(inst50000016)} // CHECK:STDOUT: inst50000019: {kind: WrapperBindingPattern, arg0: entity_name50000000, arg1: inst50000017, type: type(inst50000016)} // CHECK:STDOUT: inst5000001A: {kind: WrapperBindingPattern, arg0: entity_name50000000, arg1: inst50000018, type: type(inst50000016)} -// CHECK:STDOUT: inst5000001B: {kind: ValueBinding, arg0: entity_name50000000, arg1: inst5000001C, type: type(inst50000014)} +// CHECK:STDOUT: inst5000001B: {kind: WrapperBinding, arg0: entity_name50000000, arg1: inst5000001C, type: type(inst50000014)} // CHECK:STDOUT: inst5000001C: {kind: ValueParam, arg0: call_param0, arg1: name1, type: type(inst50000014)} // CHECK:STDOUT: inst5000001D: {kind: SpliceBlock, arg0: inst_block50000005, arg1: inst50000015, type: type(TypeType)} // CHECK:STDOUT: inst5000001E: {kind: FunctionDecl, arg0: function50000000, arg1: inst_block5000000A, type: type(inst5000001F)} @@ -241,7 +241,7 @@ fn G(x: Cpp.X) { // CHECK:STDOUT: inst50000038: {kind: NameRef, arg0: name1, arg1: inst5000001B, type: type(inst50000014)} // CHECK:STDOUT: inst50000039: {kind: ValueParamPattern, arg0: name1, type: type(inst50000016)} // CHECK:STDOUT: inst5000003A: {kind: WrapperBindingPattern, arg0: entity_name50000001, arg1: inst50000039, type: type(inst50000016)} -// CHECK:STDOUT: inst5000003B: {kind: ValueBinding, arg0: entity_name50000001, arg1: inst5000003C, type: type(inst50000014)} +// CHECK:STDOUT: inst5000003B: {kind: WrapperBinding, arg0: entity_name50000001, arg1: inst5000003C, type: type(inst50000014)} // CHECK:STDOUT: inst5000003C: {kind: ValueParam, arg0: call_param0, arg1: name1, type: type(inst50000014)} // CHECK:STDOUT: inst5000003D: {kind: FunctionDecl, arg0: function50000003, arg1: inst_block50000012, type: type(inst5000003E)} // CHECK:STDOUT: inst5000003E: {kind: FunctionType, arg0: function50000003, arg1: specific, type: type(TypeType)} @@ -251,7 +251,7 @@ fn G(x: Cpp.X) { // CHECK:STDOUT: inst50000042: {kind: ValueParamPattern, arg0: name1, type: type(inst50000040)} // CHECK:STDOUT: inst50000043: {kind: WrapperBindingPattern, arg0: entity_name50000002, arg1: inst50000041, type: type(inst50000040)} // CHECK:STDOUT: inst50000044: {kind: WrapperBindingPattern, arg0: entity_name50000000, arg1: inst50000042, type: type(inst50000040)} -// CHECK:STDOUT: inst50000045: {kind: ValueBinding, arg0: entity_name50000002, arg1: inst50000046, type: type(inst50000022)} +// CHECK:STDOUT: inst50000045: {kind: WrapperBinding, arg0: entity_name50000002, arg1: inst50000046, type: type(inst50000022)} // CHECK:STDOUT: inst50000046: {kind: ValueParam, arg0: call_param0, arg1: name1, type: type(inst50000022)} // CHECK:STDOUT: inst50000047: {kind: FunctionDecl, arg0: function50000004, arg1: inst_block50000018, type: type(inst50000048)} // CHECK:STDOUT: inst50000048: {kind: FunctionType, arg0: function50000004, arg1: specific, type: type(TypeType)} diff --git a/toolchain/check/testdata/basics/raw_sem_ir/non_core_interfaces.carbon b/toolchain/check/testdata/basics/raw_sem_ir/non_core_interfaces.carbon index 06a4fdb65c39..23a1f0314094 100644 --- a/toolchain/check/testdata/basics/raw_sem_ir/non_core_interfaces.carbon +++ b/toolchain/check/testdata/basics/raw_sem_ir/non_core_interfaces.carbon @@ -409,7 +409,7 @@ fn UseLocalCopy[T:! Copy](_: T.T1, _: T.T2) {} // CHECK:STDOUT: inst5000004D: {kind: WrapperBindingPattern, arg0: entity_name50000008, arg1: inst50000049, type: type(symbolic_constant50000010)} // CHECK:STDOUT: inst5000004E: {kind: WrapperBindingPattern, arg0: entity_name50000008, arg1: inst5000004A, type: type(symbolic_constant5000000E)} // CHECK:STDOUT: inst5000004F: {kind: WrapperBindingPattern, arg0: entity_name50000008, arg1: inst5000004C, type: type(symbolic_constant50000010)} -// CHECK:STDOUT: inst50000050: {kind: ValueBinding, arg0: entity_name50000008, arg1: inst50000066, type: type(symbolic_constant5000000D)} +// CHECK:STDOUT: inst50000050: {kind: WrapperBinding, arg0: entity_name50000008, arg1: inst50000066, type: type(symbolic_constant5000000D)} // CHECK:STDOUT: inst50000051: {kind: NameRef, arg0: name5, arg1: inst50000035, type: type(inst50000027)} // CHECK:STDOUT: inst50000052: {kind: FacetAccessType, arg0: inst50000051, type: type(TypeType)} // CHECK:STDOUT: inst50000053: {kind: Converted, arg0: inst50000051, arg1: inst50000052, type: type(TypeType)} @@ -429,7 +429,7 @@ fn UseLocalCopy[T:! Copy](_: T.T1, _: T.T2) {} // CHECK:STDOUT: inst50000061: {kind: WrapperBindingPattern, arg0: entity_name50000009, arg1: inst5000005D, type: type(symbolic_constant50000018)} // CHECK:STDOUT: inst50000062: {kind: WrapperBindingPattern, arg0: entity_name50000008, arg1: inst5000005E, type: type(symbolic_constant50000016)} // CHECK:STDOUT: inst50000063: {kind: WrapperBindingPattern, arg0: entity_name50000008, arg1: inst50000060, type: type(symbolic_constant50000018)} -// CHECK:STDOUT: inst50000064: {kind: ValueBinding, arg0: entity_name50000009, arg1: inst50000068, type: type(symbolic_constant50000015)} +// CHECK:STDOUT: inst50000064: {kind: WrapperBinding, arg0: entity_name50000009, arg1: inst50000068, type: type(symbolic_constant50000015)} // CHECK:STDOUT: inst50000065: {kind: SpliceBlock, arg0: inst_block5000000E, arg1: inst50000030, type: type(TypeType)} // CHECK:STDOUT: inst50000066: {kind: ValueParam, arg0: call_param0, arg1: name(Underscore), type: type(symbolic_constant5000000D)} // CHECK:STDOUT: inst50000067: {kind: SpliceBlock, arg0: inst_block50000013, arg1: inst50000044, type: type(TypeType)} @@ -475,7 +475,7 @@ fn UseLocalCopy[T:! Copy](_: T.T1, _: T.T2) {} // CHECK:STDOUT: inst5000008F: {kind: WrapperBindingPattern, arg0: entity_name5000000B, arg1: inst5000008B, type: type(symbolic_constant5000002C)} // CHECK:STDOUT: inst50000090: {kind: WrapperBindingPattern, arg0: entity_name50000008, arg1: inst5000008C, type: type(symbolic_constant5000002A)} // CHECK:STDOUT: inst50000091: {kind: WrapperBindingPattern, arg0: entity_name50000008, arg1: inst5000008E, type: type(symbolic_constant5000002C)} -// CHECK:STDOUT: inst50000092: {kind: ValueBinding, arg0: entity_name5000000B, arg1: inst500000A5, type: type(symbolic_constant50000029)} +// CHECK:STDOUT: inst50000092: {kind: WrapperBinding, arg0: entity_name5000000B, arg1: inst500000A5, type: type(symbolic_constant50000029)} // CHECK:STDOUT: inst50000093: {kind: NameRef, arg0: name5, arg1: inst5000007B, type: type(inst50000013)} // CHECK:STDOUT: inst50000094: {kind: FacetAccessType, arg0: inst50000093, type: type(TypeType)} // CHECK:STDOUT: inst50000095: {kind: Converted, arg0: inst50000093, arg1: inst50000094, type: type(TypeType)} @@ -492,7 +492,7 @@ fn UseLocalCopy[T:! Copy](_: T.T1, _: T.T2) {} // CHECK:STDOUT: inst500000A0: {kind: WrapperBindingPattern, arg0: entity_name5000000C, arg1: inst5000009C, type: type(symbolic_constant50000034)} // CHECK:STDOUT: inst500000A1: {kind: WrapperBindingPattern, arg0: entity_name50000008, arg1: inst5000009D, type: type(symbolic_constant50000032)} // CHECK:STDOUT: inst500000A2: {kind: WrapperBindingPattern, arg0: entity_name50000008, arg1: inst5000009F, type: type(symbolic_constant50000034)} -// CHECK:STDOUT: inst500000A3: {kind: ValueBinding, arg0: entity_name5000000C, arg1: inst500000A7, type: type(symbolic_constant50000031)} +// CHECK:STDOUT: inst500000A3: {kind: WrapperBinding, arg0: entity_name5000000C, arg1: inst500000A7, type: type(symbolic_constant50000031)} // CHECK:STDOUT: inst500000A4: {kind: SpliceBlock, arg0: inst_block50000021, arg1: inst50000076, type: type(TypeType)} // CHECK:STDOUT: inst500000A5: {kind: ValueParam, arg0: call_param0, arg1: name(Underscore), type: type(symbolic_constant50000029)} // CHECK:STDOUT: inst500000A6: {kind: SpliceBlock, arg0: inst_block50000023, arg1: inst50000086, type: type(TypeType)} diff --git a/toolchain/check/testdata/basics/raw_sem_ir/one_file.carbon b/toolchain/check/testdata/basics/raw_sem_ir/one_file.carbon index cb6d42b2b870..43ee6519d593 100644 --- a/toolchain/check/testdata/basics/raw_sem_ir/one_file.carbon +++ b/toolchain/check/testdata/basics/raw_sem_ir/one_file.carbon @@ -625,7 +625,7 @@ fn Foo[T:! type](p: T*) -> (T*, ()) { // CHECK:STDOUT: inst78000026: {kind: WrapperBindingPattern, arg0: entity_name78000002, arg1: inst78000022, type: type(symbolic_constant78000009)} // CHECK:STDOUT: inst78000027: {kind: WrapperBindingPattern, arg0: entity_name78000002, arg1: inst78000023, type: type(symbolic_constant78000007)} // CHECK:STDOUT: inst78000028: {kind: WrapperBindingPattern, arg0: entity_name78000002, arg1: inst78000025, type: type(symbolic_constant78000009)} -// CHECK:STDOUT: inst78000029: {kind: ValueBinding, arg0: entity_name78000002, arg1: inst78000044, type: type(symbolic_constant78000006)} +// CHECK:STDOUT: inst78000029: {kind: WrapperBinding, arg0: entity_name78000002, arg1: inst78000044, type: type(symbolic_constant78000006)} // CHECK:STDOUT: inst7800002A: {kind: NameRef, arg0: name1, arg1: inst7800001A, type: type(TypeType)} // CHECK:STDOUT: inst7800002B: {kind: PointerType, arg0: inst7800002A, type: type(TypeType)} // CHECK:STDOUT: inst7800002C: {kind: TupleType, arg0: inst_block_empty, type: type(TypeType)} diff --git a/toolchain/check/testdata/basics/raw_sem_ir/one_file_with_textual_ir.carbon b/toolchain/check/testdata/basics/raw_sem_ir/one_file_with_textual_ir.carbon index bd248794d214..3f588cb92fe6 100644 --- a/toolchain/check/testdata/basics/raw_sem_ir/one_file_with_textual_ir.carbon +++ b/toolchain/check/testdata/basics/raw_sem_ir/one_file_with_textual_ir.carbon @@ -102,7 +102,7 @@ fn Foo(n: ()) -> ((), ()) { // CHECK:STDOUT: inst50000016: {kind: ValueParamPattern, arg0: name1, type: type(inst50000014)} // CHECK:STDOUT: inst50000017: {kind: WrapperBindingPattern, arg0: entity_name50000000, arg1: inst50000015, type: type(inst50000014)} // CHECK:STDOUT: inst50000018: {kind: WrapperBindingPattern, arg0: entity_name50000000, arg1: inst50000016, type: type(inst50000014)} -// CHECK:STDOUT: inst50000019: {kind: ValueBinding, arg0: entity_name50000000, arg1: inst5000002A, type: type(inst50000010)} +// CHECK:STDOUT: inst50000019: {kind: WrapperBinding, arg0: entity_name50000000, arg1: inst5000002A, type: type(inst50000010)} // CHECK:STDOUT: inst5000001A: {kind: TupleLiteral, arg0: inst_block_empty, type: type(inst50000010)} // CHECK:STDOUT: inst5000001B: {kind: TupleLiteral, arg0: inst_block_empty, type: type(inst50000010)} // CHECK:STDOUT: inst5000001C: {kind: TupleType, arg0: inst_block50000008, type: type(TypeType)} @@ -306,7 +306,7 @@ fn Foo(n: ()) -> ((), ()) { // CHECK:STDOUT: %.loc16_12.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc16_12.3: type = converted %.loc16_12.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %n: %empty_tuple.type = value_binding n, %n.param +// CHECK:STDOUT: %n: %empty_tuple.type = wrapper_binding n, %n.param // CHECK:STDOUT: %return.param: ref %tuple.type = out_param call_param1 // CHECK:STDOUT: %return: ref %tuple.type = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtins/bool/eq.carbon b/toolchain/check/testdata/builtins/bool/eq.carbon index e52ce6017822..b75f883e98b4 100644 --- a/toolchain/check/testdata/builtins/bool/eq.carbon +++ b/toolchain/check/testdata/builtins/bool/eq.carbon @@ -76,7 +76,7 @@ var d: C(false == false) = True(); // CHECK:STDOUT: %.loc12_24.3: bool = converted %Eq.call.loc12, %.loc12_24.2 [concrete = constants.%true] // CHECK:STDOUT: %C.loc12: type = class_type @C, @C(constants.%true) [concrete = constants.%C.ac4] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %C.ac4 = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %C.ac4 = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -133,7 +133,7 @@ var d: C(false == false) = True(); // CHECK:STDOUT: %.loc10_22.3: bool = converted %bool.as.EqWith.impl.Equal.call.loc10, %.loc10_22.2 [concrete = constants.%true] // CHECK:STDOUT: %C.loc10: type = class_type @C, @C(constants.%true) [concrete = constants.%C.ac4] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %C.ac4 = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %C.ac4 = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/builtins/bool/make_type.carbon b/toolchain/check/testdata/builtins/bool/make_type.carbon index 4d0da2138735..bffb3292fb63 100644 --- a/toolchain/check/testdata/builtins/bool/make_type.carbon +++ b/toolchain/check/testdata/builtins/bool/make_type.carbon @@ -50,7 +50,7 @@ let b: Bool() = false; // CHECK:STDOUT: %.loc7_13.2: type = value_of_initializer %Bool.call [concrete = bool] // CHECK:STDOUT: %.loc7_13.3: type = converted %Bool.call, %.loc7_13.2 [concrete = bool] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: bool = value_binding b, @__global_init.%false +// CHECK:STDOUT: %b: bool = wrapper_binding b, @__global_init.%false // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/builtins/bool/neq.carbon b/toolchain/check/testdata/builtins/bool/neq.carbon index 63feddfe88e7..882b37fc2899 100644 --- a/toolchain/check/testdata/builtins/bool/neq.carbon +++ b/toolchain/check/testdata/builtins/bool/neq.carbon @@ -77,7 +77,7 @@ var d: C(false != false) = False(); // CHECK:STDOUT: %.loc12_25.3: bool = converted %Neq.call.loc12, %.loc12_25.2 [concrete = constants.%false] // CHECK:STDOUT: %C.loc12: type = class_type @C, @C(constants.%false) [concrete = constants.%C.4b2] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %C.4b2 = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %C.4b2 = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -135,7 +135,7 @@ var d: C(false != false) = False(); // CHECK:STDOUT: %.loc10_22.3: bool = converted %bool.as.EqWith.impl.NotEqual.call.loc10, %.loc10_22.2 [concrete = constants.%false] // CHECK:STDOUT: %C.loc10: type = class_type @C, @C(constants.%false) [concrete = constants.%C.4b2] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %C.4b2 = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %C.4b2 = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/builtins/char_literal/add.carbon b/toolchain/check/testdata/builtins/char_literal/add.carbon index 121d1591bd7c..eec4598609b6 100644 --- a/toolchain/check/testdata/builtins/char_literal/add.carbon +++ b/toolchain/check/testdata/builtins/char_literal/add.carbon @@ -97,21 +97,21 @@ let c: CharLiteral = AddCharInt('a', Negate(98)); // CHECK:STDOUT: %.loc12_39.1: Core.CharLiteral = value_of_initializer @__global_init.%AddCharInt.call.loc12 [concrete = constants.%.711] // CHECK:STDOUT: %.loc12_39.2: Core.CharLiteral = converted @__global_init.%AddCharInt.call.loc12, %.loc12_39.1 [concrete = constants.%.711] // CHECK:STDOUT: %CharLiteral.ref.loc12: type = name_ref CharLiteral, %CharLiteral [concrete = Core.CharLiteral] -// CHECK:STDOUT: %a: Core.CharLiteral = value_binding a, %.loc12_39.2 +// CHECK:STDOUT: %a: Core.CharLiteral = wrapper_binding a, %.loc12_39.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.8c6 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc15_44.1: Core.CharLiteral = value_of_initializer @__global_init.%AddCharInt.call.loc15 [concrete = constants.%.ae7] // CHECK:STDOUT: %.loc15_44.2: Core.CharLiteral = converted @__global_init.%AddCharInt.call.loc15, %.loc15_44.1 [concrete = constants.%.ae7] // CHECK:STDOUT: %CharLiteral.ref.loc15: type = name_ref CharLiteral, %CharLiteral [concrete = Core.CharLiteral] -// CHECK:STDOUT: %b: Core.CharLiteral = value_binding b, %.loc15_44.2 +// CHECK:STDOUT: %b: Core.CharLiteral = wrapper_binding b, %.loc15_44.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.8c6 = value_binding_pattern c [concrete = constants.%c.patt.c30] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc16_44.1: Core.CharLiteral = value_of_initializer @__global_init.%AddCharInt.call.loc16 [concrete = constants.%.a8b] // CHECK:STDOUT: %.loc16_44.2: Core.CharLiteral = converted @__global_init.%AddCharInt.call.loc16, %.loc16_44.1 [concrete = constants.%.a8b] // CHECK:STDOUT: %CharLiteral.ref.loc16: type = name_ref CharLiteral, %CharLiteral [concrete = Core.CharLiteral] -// CHECK:STDOUT: %c: Core.CharLiteral = value_binding c, %.loc16_44.2 +// CHECK:STDOUT: %c: Core.CharLiteral = wrapper_binding c, %.loc16_44.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/builtins/char_literal/convert_char.carbon b/toolchain/check/testdata/builtins/char_literal/convert_char.carbon index 977573807405..858c82bc2edb 100644 --- a/toolchain/check/testdata/builtins/char_literal/convert_char.carbon +++ b/toolchain/check/testdata/builtins/char_literal/convert_char.carbon @@ -132,7 +132,7 @@ let c: UInt(8) = ToChar('\u{1E15}'); // CHECK:STDOUT: %.loc6_14.2: type = value_of_initializer %UInt.call.loc6 [concrete = constants.%u8.builtin] // CHECK:STDOUT: %.loc6_14.3: type = converted %UInt.call.loc6, %.loc6_14.2 [concrete = constants.%u8.builtin] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %u8.builtin = value_binding a, %.loc6_29.2 +// CHECK:STDOUT: %a: %u8.builtin = wrapper_binding a, %.loc6_29.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.456 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } @@ -145,7 +145,7 @@ let c: UInt(8) = ToChar('\u{1E15}'); // CHECK:STDOUT: %.loc7_14.2: type = value_of_initializer %UInt.call.loc7 [concrete = constants.%u8.builtin] // CHECK:STDOUT: %.loc7_14.3: type = converted %UInt.call.loc7, %.loc7_14.2 [concrete = constants.%u8.builtin] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %u8.builtin = value_binding b, %.loc7_28.2 +// CHECK:STDOUT: %b: %u8.builtin = wrapper_binding b, %.loc7_28.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.456 = value_binding_pattern c [concrete = constants.%c.patt.7eb] // CHECK:STDOUT: } @@ -158,7 +158,7 @@ let c: UInt(8) = ToChar('\u{1E15}'); // CHECK:STDOUT: %.loc8_14.2: type = value_of_initializer %UInt.call.loc8 [concrete = constants.%u8.builtin] // CHECK:STDOUT: %.loc8_14.3: type = converted %UInt.call.loc8, %.loc8_14.2 [concrete = constants.%u8.builtin] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %u8.builtin = value_binding c, %.loc8_33.2 +// CHECK:STDOUT: %c: %u8.builtin = wrapper_binding c, %.loc8_33.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/builtins/char_literal/convert_int.carbon b/toolchain/check/testdata/builtins/char_literal/convert_int.carbon index 0f2fc060af88..74326a1522ac 100644 --- a/toolchain/check/testdata/builtins/char_literal/convert_int.carbon +++ b/toolchain/check/testdata/builtins/char_literal/convert_int.carbon @@ -111,42 +111,42 @@ let g: u8 = ConvertToU8('\u{100}'); // CHECK:STDOUT: %.loc14_30.1: %i32 = value_of_initializer @__global_init.%ConvertToI32.call [concrete = constants.%int_97] // CHECK:STDOUT: %.loc14_30.2: %i32 = converted @__global_init.%ConvertToI32.call, %.loc14_30.1 [concrete = constants.%int_97] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %.loc14_30.2 +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %.loc14_30.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.668 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc15_30.1: %u32 = value_of_initializer @__global_init.%ConvertToU32.call [concrete = constants.%int_98] // CHECK:STDOUT: %.loc15_30.2: %u32 = converted @__global_init.%ConvertToU32.call, %.loc15_30.1 [concrete = constants.%int_98] // CHECK:STDOUT: %u32: type = type_literal constants.%u32 [concrete = constants.%u32] -// CHECK:STDOUT: %b: %u32 = value_binding b, %.loc15_30.2 +// CHECK:STDOUT: %b: %u32 = wrapper_binding b, %.loc15_30.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.f57 = value_binding_pattern c [concrete = constants.%c.patt.a8f] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc16_39.1: %i64 = value_of_initializer @__global_init.%ConvertToI64.call [concrete = constants.%int_1114111] // CHECK:STDOUT: %.loc16_39.2: %i64 = converted @__global_init.%ConvertToI64.call, %.loc16_39.1 [concrete = constants.%int_1114111] // CHECK:STDOUT: %i64: type = type_literal constants.%i64 [concrete = constants.%i64] -// CHECK:STDOUT: %c: %i64 = value_binding c, %.loc16_39.2 +// CHECK:STDOUT: %c: %i64 = wrapper_binding c, %.loc16_39.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.b35 = value_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc17_31.1: %u64 = value_of_initializer @__global_init.%ConvertToU64.call [concrete = constants.%int_0] // CHECK:STDOUT: %.loc17_31.2: %u64 = converted @__global_init.%ConvertToU64.call, %.loc17_31.1 [concrete = constants.%int_0] // CHECK:STDOUT: %u64: type = type_literal constants.%u64 [concrete = constants.%u64] -// CHECK:STDOUT: %d: %u64 = value_binding d, %.loc17_31.2 +// CHECK:STDOUT: %d: %u64 = wrapper_binding d, %.loc17_31.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %e.patt: %pattern_type.186 = value_binding_pattern e [concrete = constants.%e.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc19_33.1: %u8 = value_of_initializer @__global_init.%ConvertToU8.call.loc19 [concrete = constants.%int_128] // CHECK:STDOUT: %.loc19_33.2: %u8 = converted @__global_init.%ConvertToU8.call.loc19, %.loc19_33.1 [concrete = constants.%int_128] // CHECK:STDOUT: %u8.loc19: type = type_literal constants.%u8 [concrete = constants.%u8] -// CHECK:STDOUT: %e: %u8 = value_binding e, %.loc19_33.2 +// CHECK:STDOUT: %e: %u8 = wrapper_binding e, %.loc19_33.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %f.patt: %pattern_type.186 = value_binding_pattern f [concrete = constants.%f.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc20_33.1: %u8 = value_of_initializer @__global_init.%ConvertToU8.call.loc20 [concrete = constants.%int_255] // CHECK:STDOUT: %.loc20_33.2: %u8 = converted @__global_init.%ConvertToU8.call.loc20, %.loc20_33.1 [concrete = constants.%int_255] // CHECK:STDOUT: %u8.loc20: type = type_literal constants.%u8 [concrete = constants.%u8] -// CHECK:STDOUT: %f: %u8 = value_binding f, %.loc20_33.2 +// CHECK:STDOUT: %f: %u8 = wrapper_binding f, %.loc20_33.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/builtins/char_literal/eq.carbon b/toolchain/check/testdata/builtins/char_literal/eq.carbon index ff9ed3cbf5ac..f53a3c1050ed 100644 --- a/toolchain/check/testdata/builtins/char_literal/eq.carbon +++ b/toolchain/check/testdata/builtins/char_literal/eq.carbon @@ -43,14 +43,14 @@ let b: bool = Eq('a', 'b'); // CHECK:STDOUT: %.loc21_26.1: bool = value_of_initializer @__global_init.%Eq.call.loc21 [concrete = constants.%true] // CHECK:STDOUT: %.loc21_26.2: bool = converted @__global_init.%Eq.call.loc21, %.loc21_26.1 [concrete = constants.%true] // CHECK:STDOUT: %.loc21_8: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %a: bool = value_binding a, %.loc21_26.2 +// CHECK:STDOUT: %a: bool = wrapper_binding a, %.loc21_26.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.831 = value_binding_pattern b [concrete = constants.%b.patt.438] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc22_26.1: bool = value_of_initializer @__global_init.%Eq.call.loc22 [concrete = constants.%false] // CHECK:STDOUT: %.loc22_26.2: bool = converted @__global_init.%Eq.call.loc22, %.loc22_26.1 [concrete = constants.%false] // CHECK:STDOUT: %.loc22_8: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %b: bool = value_binding b, %.loc22_26.2 +// CHECK:STDOUT: %b: bool = wrapper_binding b, %.loc22_26.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/builtins/char_literal/greater.carbon b/toolchain/check/testdata/builtins/char_literal/greater.carbon index f536a8173e17..e4a9dfa1f883 100644 --- a/toolchain/check/testdata/builtins/char_literal/greater.carbon +++ b/toolchain/check/testdata/builtins/char_literal/greater.carbon @@ -43,14 +43,14 @@ let b: bool = Greater('a', 'b'); // CHECK:STDOUT: %.loc21_31.1: bool = value_of_initializer @__global_init.%Greater.call.loc21 [concrete = constants.%true] // CHECK:STDOUT: %.loc21_31.2: bool = converted @__global_init.%Greater.call.loc21, %.loc21_31.1 [concrete = constants.%true] // CHECK:STDOUT: %.loc21_8: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %a: bool = value_binding a, %.loc21_31.2 +// CHECK:STDOUT: %a: bool = wrapper_binding a, %.loc21_31.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.831 = value_binding_pattern b [concrete = constants.%b.patt.438] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc22_31.1: bool = value_of_initializer @__global_init.%Greater.call.loc22 [concrete = constants.%false] // CHECK:STDOUT: %.loc22_31.2: bool = converted @__global_init.%Greater.call.loc22, %.loc22_31.1 [concrete = constants.%false] // CHECK:STDOUT: %.loc22_8: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %b: bool = value_binding b, %.loc22_31.2 +// CHECK:STDOUT: %b: bool = wrapper_binding b, %.loc22_31.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/builtins/char_literal/greater_eq.carbon b/toolchain/check/testdata/builtins/char_literal/greater_eq.carbon index ef64958542bf..c467a866a986 100644 --- a/toolchain/check/testdata/builtins/char_literal/greater_eq.carbon +++ b/toolchain/check/testdata/builtins/char_literal/greater_eq.carbon @@ -45,21 +45,21 @@ let c: bool = GreaterEq('a', 'b'); // CHECK:STDOUT: %.loc21_33.1: bool = value_of_initializer @__global_init.%GreaterEq.call.loc21 [concrete = constants.%true] // CHECK:STDOUT: %.loc21_33.2: bool = converted @__global_init.%GreaterEq.call.loc21, %.loc21_33.1 [concrete = constants.%true] // CHECK:STDOUT: %.loc21_8: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %a: bool = value_binding a, %.loc21_33.2 +// CHECK:STDOUT: %a: bool = wrapper_binding a, %.loc21_33.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.831 = value_binding_pattern b [concrete = constants.%b.patt.438] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc22_33.1: bool = value_of_initializer @__global_init.%GreaterEq.call.loc22 [concrete = constants.%true] // CHECK:STDOUT: %.loc22_33.2: bool = converted @__global_init.%GreaterEq.call.loc22, %.loc22_33.1 [concrete = constants.%true] // CHECK:STDOUT: %.loc22_8: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %b: bool = value_binding b, %.loc22_33.2 +// CHECK:STDOUT: %b: bool = wrapper_binding b, %.loc22_33.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.831 = value_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc23_33.1: bool = value_of_initializer @__global_init.%GreaterEq.call.loc23 [concrete = constants.%false] // CHECK:STDOUT: %.loc23_33.2: bool = converted @__global_init.%GreaterEq.call.loc23, %.loc23_33.1 [concrete = constants.%false] // CHECK:STDOUT: %.loc23_8: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %c: bool = value_binding c, %.loc23_33.2 +// CHECK:STDOUT: %c: bool = wrapper_binding c, %.loc23_33.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/builtins/char_literal/less.carbon b/toolchain/check/testdata/builtins/char_literal/less.carbon index ab03bda131e7..7e41c895341a 100644 --- a/toolchain/check/testdata/builtins/char_literal/less.carbon +++ b/toolchain/check/testdata/builtins/char_literal/less.carbon @@ -43,14 +43,14 @@ let b: bool = Less('b', 'a'); // CHECK:STDOUT: %.loc21_28.1: bool = value_of_initializer @__global_init.%Less.call.loc21 [concrete = constants.%true] // CHECK:STDOUT: %.loc21_28.2: bool = converted @__global_init.%Less.call.loc21, %.loc21_28.1 [concrete = constants.%true] // CHECK:STDOUT: %.loc21_8: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %a: bool = value_binding a, %.loc21_28.2 +// CHECK:STDOUT: %a: bool = wrapper_binding a, %.loc21_28.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.831 = value_binding_pattern b [concrete = constants.%b.patt.438] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc22_28.1: bool = value_of_initializer @__global_init.%Less.call.loc22 [concrete = constants.%false] // CHECK:STDOUT: %.loc22_28.2: bool = converted @__global_init.%Less.call.loc22, %.loc22_28.1 [concrete = constants.%false] // CHECK:STDOUT: %.loc22_8: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %b: bool = value_binding b, %.loc22_28.2 +// CHECK:STDOUT: %b: bool = wrapper_binding b, %.loc22_28.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/builtins/char_literal/less_eq.carbon b/toolchain/check/testdata/builtins/char_literal/less_eq.carbon index 4b6c2f0faeee..b9609779fee8 100644 --- a/toolchain/check/testdata/builtins/char_literal/less_eq.carbon +++ b/toolchain/check/testdata/builtins/char_literal/less_eq.carbon @@ -45,21 +45,21 @@ let c: bool = LessEq('b', 'a'); // CHECK:STDOUT: %.loc21_30.1: bool = value_of_initializer @__global_init.%LessEq.call.loc21 [concrete = constants.%true] // CHECK:STDOUT: %.loc21_30.2: bool = converted @__global_init.%LessEq.call.loc21, %.loc21_30.1 [concrete = constants.%true] // CHECK:STDOUT: %.loc21_8: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %a: bool = value_binding a, %.loc21_30.2 +// CHECK:STDOUT: %a: bool = wrapper_binding a, %.loc21_30.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.831 = value_binding_pattern b [concrete = constants.%b.patt.438] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc22_30.1: bool = value_of_initializer @__global_init.%LessEq.call.loc22 [concrete = constants.%true] // CHECK:STDOUT: %.loc22_30.2: bool = converted @__global_init.%LessEq.call.loc22, %.loc22_30.1 [concrete = constants.%true] // CHECK:STDOUT: %.loc22_8: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %b: bool = value_binding b, %.loc22_30.2 +// CHECK:STDOUT: %b: bool = wrapper_binding b, %.loc22_30.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.831 = value_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc23_30.1: bool = value_of_initializer @__global_init.%LessEq.call.loc23 [concrete = constants.%false] // CHECK:STDOUT: %.loc23_30.2: bool = converted @__global_init.%LessEq.call.loc23, %.loc23_30.1 [concrete = constants.%false] // CHECK:STDOUT: %.loc23_8: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %c: bool = value_binding c, %.loc23_30.2 +// CHECK:STDOUT: %c: bool = wrapper_binding c, %.loc23_30.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/builtins/char_literal/make_type.carbon b/toolchain/check/testdata/builtins/char_literal/make_type.carbon index 23df1054bed4..28d353d18437 100644 --- a/toolchain/check/testdata/builtins/char_literal/make_type.carbon +++ b/toolchain/check/testdata/builtins/char_literal/make_type.carbon @@ -50,17 +50,17 @@ let not_8_bit: CharLiteral = '\u{1E15}'; // CHECK:STDOUT: %ascii_x.patt: %pattern_type = value_binding_pattern ascii_x [concrete = constants.%ascii_x.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %CharLiteral.ref.loc7: type = name_ref CharLiteral, imports.%Main.CharLiteral [concrete = Core.CharLiteral] -// CHECK:STDOUT: %ascii_x: Core.CharLiteral = value_binding ascii_x, @__global_init.%.loc7 +// CHECK:STDOUT: %ascii_x: Core.CharLiteral = wrapper_binding ascii_x, @__global_init.%.loc7 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %not_7_bit.patt: %pattern_type = value_binding_pattern not_7_bit [concrete = constants.%not_7_bit.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %CharLiteral.ref.loc8: type = name_ref CharLiteral, imports.%Main.CharLiteral [concrete = Core.CharLiteral] -// CHECK:STDOUT: %not_7_bit: Core.CharLiteral = value_binding not_7_bit, @__global_init.%.loc8 +// CHECK:STDOUT: %not_7_bit: Core.CharLiteral = wrapper_binding not_7_bit, @__global_init.%.loc8 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %not_8_bit.patt: %pattern_type = value_binding_pattern not_8_bit [concrete = constants.%not_8_bit.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %CharLiteral.ref.loc9: type = name_ref CharLiteral, imports.%Main.CharLiteral [concrete = Core.CharLiteral] -// CHECK:STDOUT: %not_8_bit: Core.CharLiteral = value_binding not_8_bit, @__global_init.%.loc9 +// CHECK:STDOUT: %not_8_bit: Core.CharLiteral = wrapper_binding not_8_bit, @__global_init.%.loc9 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/builtins/char_literal/neq.carbon b/toolchain/check/testdata/builtins/char_literal/neq.carbon index 4cdc91e5b5b7..b20d4cb64dd3 100644 --- a/toolchain/check/testdata/builtins/char_literal/neq.carbon +++ b/toolchain/check/testdata/builtins/char_literal/neq.carbon @@ -43,14 +43,14 @@ let b: bool = Neq('a', 'a'); // CHECK:STDOUT: %.loc21_27.1: bool = value_of_initializer @__global_init.%Neq.call.loc21 [concrete = constants.%true] // CHECK:STDOUT: %.loc21_27.2: bool = converted @__global_init.%Neq.call.loc21, %.loc21_27.1 [concrete = constants.%true] // CHECK:STDOUT: %.loc21_8: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %a: bool = value_binding a, %.loc21_27.2 +// CHECK:STDOUT: %a: bool = wrapper_binding a, %.loc21_27.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.831 = value_binding_pattern b [concrete = constants.%b.patt.438] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc22_27.1: bool = value_of_initializer @__global_init.%Neq.call.loc22 [concrete = constants.%false] // CHECK:STDOUT: %.loc22_27.2: bool = converted @__global_init.%Neq.call.loc22, %.loc22_27.1 [concrete = constants.%false] // CHECK:STDOUT: %.loc22_8: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %b: bool = value_binding b, %.loc22_27.2 +// CHECK:STDOUT: %b: bool = wrapper_binding b, %.loc22_27.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/builtins/char_literal/sub_char.carbon b/toolchain/check/testdata/builtins/char_literal/sub_char.carbon index 9cf166ec2bd6..aee62aba5b96 100644 --- a/toolchain/check/testdata/builtins/char_literal/sub_char.carbon +++ b/toolchain/check/testdata/builtins/char_literal/sub_char.carbon @@ -65,42 +65,42 @@ let min: i32 = SubCharCharToI32('\u{0}', '\u{10FFFF}'); // CHECK:STDOUT: %.loc24_53.1: Core.IntLiteral = value_of_initializer @__global_init.%SubCharCharToIntLiteral.call.loc24 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %.loc24_53.2: Core.IntLiteral = converted @__global_init.%SubCharCharToIntLiteral.call.loc24, %.loc24_53.1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %IntLiteral.ref.loc24: type = name_ref IntLiteral, %IntLiteral [concrete = Core.IntLiteral] -// CHECK:STDOUT: %a: Core.IntLiteral = value_binding a, %.loc24_53.2 +// CHECK:STDOUT: %a: Core.IntLiteral = wrapper_binding a, %.loc24_53.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = value_binding_pattern b [concrete = constants.%b.patt.3f7] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc25_39.1: %i32 = value_of_initializer @__global_init.%SubCharCharToI32.call.loc25 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %.loc25_39.2: %i32 = converted @__global_init.%SubCharCharToI32.call.loc25, %.loc25_39.1 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %i32.loc25: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: %i32 = value_binding b, %.loc25_39.2 +// CHECK:STDOUT: %b: %i32 = wrapper_binding b, %.loc25_39.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.dc0 = value_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc26_53.1: Core.IntLiteral = value_of_initializer @__global_init.%SubCharCharToIntLiteral.call.loc26 [concrete = constants.%int_-1.638] // CHECK:STDOUT: %.loc26_53.2: Core.IntLiteral = converted @__global_init.%SubCharCharToIntLiteral.call.loc26, %.loc26_53.1 [concrete = constants.%int_-1.638] // CHECK:STDOUT: %IntLiteral.ref.loc26: type = name_ref IntLiteral, %IntLiteral [concrete = Core.IntLiteral] -// CHECK:STDOUT: %c: Core.IntLiteral = value_binding c, %.loc26_53.2 +// CHECK:STDOUT: %c: Core.IntLiteral = wrapper_binding c, %.loc26_53.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.6b6 = value_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc27_39.1: %i32 = value_of_initializer @__global_init.%SubCharCharToI32.call.loc27 [concrete = constants.%int_-1.4ef] // CHECK:STDOUT: %.loc27_39.2: %i32 = converted @__global_init.%SubCharCharToI32.call.loc27, %.loc27_39.1 [concrete = constants.%int_-1.4ef] // CHECK:STDOUT: %i32.loc27: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %d: %i32 = value_binding d, %.loc27_39.2 +// CHECK:STDOUT: %d: %i32 = wrapper_binding d, %.loc27_39.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %max.patt: %pattern_type.6b6 = value_binding_pattern max [concrete = constants.%max.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc28_54.1: %i32 = value_of_initializer @__global_init.%SubCharCharToI32.call.loc28 [concrete = constants.%int_1114111] // CHECK:STDOUT: %.loc28_54.2: %i32 = converted @__global_init.%SubCharCharToI32.call.loc28, %.loc28_54.1 [concrete = constants.%int_1114111] // CHECK:STDOUT: %i32.loc28: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %max: %i32 = value_binding max, %.loc28_54.2 +// CHECK:STDOUT: %max: %i32 = wrapper_binding max, %.loc28_54.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %min.patt: %pattern_type.6b6 = value_binding_pattern min [concrete = constants.%min.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc29_54.1: %i32 = value_of_initializer @__global_init.%SubCharCharToI32.call.loc29 [concrete = constants.%int_-1114111] // CHECK:STDOUT: %.loc29_54.2: %i32 = converted @__global_init.%SubCharCharToI32.call.loc29, %.loc29_54.1 [concrete = constants.%int_-1114111] // CHECK:STDOUT: %i32.loc29: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %min: %i32 = value_binding min, %.loc29_54.2 +// CHECK:STDOUT: %min: %i32 = wrapper_binding min, %.loc29_54.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/builtins/char_literal/sub_int.carbon b/toolchain/check/testdata/builtins/char_literal/sub_int.carbon index 468463eb6668..5af25b39652b 100644 --- a/toolchain/check/testdata/builtins/char_literal/sub_int.carbon +++ b/toolchain/check/testdata/builtins/char_literal/sub_int.carbon @@ -82,21 +82,21 @@ let b: CharLiteral = SubCharInt('\u{10FFFF}', Negate(1)); // CHECK:STDOUT: %.loc13_39.1: Core.CharLiteral = value_of_initializer @__global_init.%SubCharInt.call.loc13 [concrete = constants.%.54f] // CHECK:STDOUT: %.loc13_39.2: Core.CharLiteral = converted @__global_init.%SubCharInt.call.loc13, %.loc13_39.1 [concrete = constants.%.54f] // CHECK:STDOUT: %CharLiteral.ref.loc13: type = name_ref CharLiteral, %CharLiteral [concrete = Core.CharLiteral] -// CHECK:STDOUT: %a: Core.CharLiteral = value_binding a, %.loc13_39.2 +// CHECK:STDOUT: %a: Core.CharLiteral = wrapper_binding a, %.loc13_39.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.8c6 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc16_52.1: Core.CharLiteral = value_of_initializer @__global_init.%SubCharInt.call.loc16 [concrete = constants.%.ae7] // CHECK:STDOUT: %.loc16_52.2: Core.CharLiteral = converted @__global_init.%SubCharInt.call.loc16, %.loc16_52.1 [concrete = constants.%.ae7] // CHECK:STDOUT: %CharLiteral.ref.loc16: type = name_ref CharLiteral, %CharLiteral [concrete = Core.CharLiteral] -// CHECK:STDOUT: %b: Core.CharLiteral = value_binding b, %.loc16_52.2 +// CHECK:STDOUT: %b: Core.CharLiteral = wrapper_binding b, %.loc16_52.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.8c6 = value_binding_pattern c [concrete = constants.%c.patt.c30] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc17_52.1: Core.CharLiteral = value_of_initializer @__global_init.%SubCharInt.call.loc17 [concrete = constants.%.a8b] // CHECK:STDOUT: %.loc17_52.2: Core.CharLiteral = converted @__global_init.%SubCharInt.call.loc17, %.loc17_52.1 [concrete = constants.%.a8b] // CHECK:STDOUT: %CharLiteral.ref.loc17: type = name_ref CharLiteral, %CharLiteral [concrete = Core.CharLiteral] -// CHECK:STDOUT: %c: Core.CharLiteral = value_binding c, %.loc17_52.2 +// CHECK:STDOUT: %c: Core.CharLiteral = wrapper_binding c, %.loc17_52.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/builtins/float/convert.carbon b/toolchain/check/testdata/builtins/float/convert.carbon index 7b8611c6b3e5..24c0b0dfc31f 100644 --- a/toolchain/check/testdata/builtins/float/convert.carbon +++ b/toolchain/check/testdata/builtins/float/convert.carbon @@ -141,7 +141,7 @@ let b: f64 = Float32ToFloat64(1.0e30); // CHECK:STDOUT: %.loc6_53.1: Core.FloatLiteral = value_of_initializer @__global_init.%FloatLiteralToFloatLiteral.call [concrete = constants.%float] // CHECK:STDOUT: %.loc6_53.2: Core.FloatLiteral = converted @__global_init.%FloatLiteralToFloatLiteral.call, %.loc6_53.1 [concrete = constants.%float] // CHECK:STDOUT: %FloatLiteral.ref: type = name_ref FloatLiteral, imports.%Main.FloatLiteral [concrete = Core.FloatLiteral] -// CHECK:STDOUT: %f: Core.FloatLiteral = value_binding f, %.loc6_53.2 +// CHECK:STDOUT: %f: Core.FloatLiteral = wrapper_binding f, %.loc6_53.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -185,28 +185,28 @@ let b: f64 = Float32ToFloat64(1.0e30); // CHECK:STDOUT: %.loc6_39.1: %f64.dc1 = value_of_initializer @__global_init.%FloatLiteralToFloat64.call.loc6 [concrete = constants.%float.895] // CHECK:STDOUT: %.loc6_39.2: %f64.dc1 = converted @__global_init.%FloatLiteralToFloat64.call.loc6, %.loc6_39.1 [concrete = constants.%float.895] // CHECK:STDOUT: %f64.loc6: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %a: %f64.dc1 = value_binding a, %.loc6_39.2 +// CHECK:STDOUT: %a: %f64.dc1 = wrapper_binding a, %.loc6_39.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.fb7 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_39.1: %f64.dc1 = value_of_initializer @__global_init.%FloatLiteralToFloat64.call.loc7 [concrete = constants.%float.3b9] // CHECK:STDOUT: %.loc7_39.2: %f64.dc1 = converted @__global_init.%FloatLiteralToFloat64.call.loc7, %.loc7_39.1 [concrete = constants.%float.3b9] // CHECK:STDOUT: %f64.loc7: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %b: %f64.dc1 = value_binding b, %.loc7_39.2 +// CHECK:STDOUT: %b: %f64.dc1 = wrapper_binding b, %.loc7_39.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.fb7 = value_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc8_43.1: %f64.dc1 = value_of_initializer @__global_init.%FloatLiteralToFloat64.call.loc8 [concrete = constants.%float.672] // CHECK:STDOUT: %.loc8_43.2: %f64.dc1 = converted @__global_init.%FloatLiteralToFloat64.call.loc8, %.loc8_43.1 [concrete = constants.%float.672] // CHECK:STDOUT: %f64.loc8: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %c: %f64.dc1 = value_binding c, %.loc8_43.2 +// CHECK:STDOUT: %c: %f64.dc1 = wrapper_binding c, %.loc8_43.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.fb7 = value_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc10_43.1: %f64.dc1 = value_of_initializer @__global_init.%FloatLiteralToFloat64.call.loc10 [concrete = constants.%float.7ae] // CHECK:STDOUT: %.loc10_43.2: %f64.dc1 = converted @__global_init.%FloatLiteralToFloat64.call.loc10, %.loc10_43.1 [concrete = constants.%float.7ae] // CHECK:STDOUT: %f64.loc10: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %d: %f64.dc1 = value_binding d, %.loc10_43.2 +// CHECK:STDOUT: %d: %f64.dc1 = wrapper_binding d, %.loc10_43.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -259,28 +259,28 @@ let b: f64 = Float32ToFloat64(1.0e30); // CHECK:STDOUT: %.loc6_39.1: %f32.c73 = value_of_initializer @__global_init.%FloatLiteralToFloat32.call.loc6 [concrete = constants.%float.5cd] // CHECK:STDOUT: %.loc6_39.2: %f32.c73 = converted @__global_init.%FloatLiteralToFloat32.call.loc6, %.loc6_39.1 [concrete = constants.%float.5cd] // CHECK:STDOUT: %f32.loc6: type = type_literal constants.%f32.c73 [concrete = constants.%f32.c73] -// CHECK:STDOUT: %a: %f32.c73 = value_binding a, %.loc6_39.2 +// CHECK:STDOUT: %a: %f32.c73 = wrapper_binding a, %.loc6_39.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.240 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_39.1: %f32.c73 = value_of_initializer @__global_init.%FloatLiteralToFloat32.call.loc7 [concrete = constants.%float.943] // CHECK:STDOUT: %.loc7_39.2: %f32.c73 = converted @__global_init.%FloatLiteralToFloat32.call.loc7, %.loc7_39.1 [concrete = constants.%float.943] // CHECK:STDOUT: %f32.loc7: type = type_literal constants.%f32.c73 [concrete = constants.%f32.c73] -// CHECK:STDOUT: %b: %f32.c73 = value_binding b, %.loc7_39.2 +// CHECK:STDOUT: %b: %f32.c73 = wrapper_binding b, %.loc7_39.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.240 = value_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc8_42.1: %f32.c73 = value_of_initializer @__global_init.%FloatLiteralToFloat32.call.loc8 [concrete = constants.%float.c47] // CHECK:STDOUT: %.loc8_42.2: %f32.c73 = converted @__global_init.%FloatLiteralToFloat32.call.loc8, %.loc8_42.1 [concrete = constants.%float.c47] // CHECK:STDOUT: %f32.loc8: type = type_literal constants.%f32.c73 [concrete = constants.%f32.c73] -// CHECK:STDOUT: %c: %f32.c73 = value_binding c, %.loc8_42.2 +// CHECK:STDOUT: %c: %f32.c73 = wrapper_binding c, %.loc8_42.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.240 = value_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc10_42.1: %f32.c73 = value_of_initializer @__global_init.%FloatLiteralToFloat32.call.loc10 [concrete = constants.%float.021] // CHECK:STDOUT: %.loc10_42.2: %f32.c73 = converted @__global_init.%FloatLiteralToFloat32.call.loc10, %.loc10_42.1 [concrete = constants.%float.021] // CHECK:STDOUT: %f32.loc10: type = type_literal constants.%f32.c73 [concrete = constants.%f32.c73] -// CHECK:STDOUT: %d: %f32.c73 = value_binding d, %.loc10_42.2 +// CHECK:STDOUT: %d: %f32.c73 = wrapper_binding d, %.loc10_42.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -349,21 +349,21 @@ let b: f64 = Float32ToFloat64(1.0e30); // CHECK:STDOUT: %.loc6_34.1: %f64.dc1 = value_of_initializer @__global_init.%Float64ToFloat64.call.loc6 [concrete = constants.%float.895] // CHECK:STDOUT: %.loc6_34.2: %f64.dc1 = converted @__global_init.%Float64ToFloat64.call.loc6, %.loc6_34.1 [concrete = constants.%float.895] // CHECK:STDOUT: %f64.loc6: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %a: %f64.dc1 = value_binding a, %.loc6_34.2 +// CHECK:STDOUT: %a: %f64.dc1 = wrapper_binding a, %.loc6_34.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.fb7 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_34.1: %f64.dc1 = value_of_initializer @__global_init.%Float64ToFloat64.call.loc7 [concrete = constants.%float.3b9] // CHECK:STDOUT: %.loc7_34.2: %f64.dc1 = converted @__global_init.%Float64ToFloat64.call.loc7, %.loc7_34.1 [concrete = constants.%float.3b9] // CHECK:STDOUT: %f64.loc7: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %b: %f64.dc1 = value_binding b, %.loc7_34.2 +// CHECK:STDOUT: %b: %f64.dc1 = wrapper_binding b, %.loc7_34.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.fb7 = value_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc8_38.1: %f64.dc1 = value_of_initializer @__global_init.%Float64ToFloat64.call.loc8 [concrete = constants.%float.672] // CHECK:STDOUT: %.loc8_38.2: %f64.dc1 = converted @__global_init.%Float64ToFloat64.call.loc8, %.loc8_38.1 [concrete = constants.%float.672] // CHECK:STDOUT: %f64.loc8: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %c: %f64.dc1 = value_binding c, %.loc8_38.2 +// CHECK:STDOUT: %c: %f64.dc1 = wrapper_binding c, %.loc8_38.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -450,21 +450,21 @@ let b: f64 = Float32ToFloat64(1.0e30); // CHECK:STDOUT: %.loc6_34.1: %f32.c73 = value_of_initializer @__global_init.%Float32ToFloat32.call.loc6 [concrete = constants.%float.5cd] // CHECK:STDOUT: %.loc6_34.2: %f32.c73 = converted @__global_init.%Float32ToFloat32.call.loc6, %.loc6_34.1 [concrete = constants.%float.5cd] // CHECK:STDOUT: %f32.loc6: type = type_literal constants.%f32.c73 [concrete = constants.%f32.c73] -// CHECK:STDOUT: %a: %f32.c73 = value_binding a, %.loc6_34.2 +// CHECK:STDOUT: %a: %f32.c73 = wrapper_binding a, %.loc6_34.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.240 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_34.1: %f32.c73 = value_of_initializer @__global_init.%Float32ToFloat32.call.loc7 [concrete = constants.%float.943] // CHECK:STDOUT: %.loc7_34.2: %f32.c73 = converted @__global_init.%Float32ToFloat32.call.loc7, %.loc7_34.1 [concrete = constants.%float.943] // CHECK:STDOUT: %f32.loc7: type = type_literal constants.%f32.c73 [concrete = constants.%f32.c73] -// CHECK:STDOUT: %b: %f32.c73 = value_binding b, %.loc7_34.2 +// CHECK:STDOUT: %b: %f32.c73 = wrapper_binding b, %.loc7_34.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.240 = value_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc8_37.1: %f32.c73 = value_of_initializer @__global_init.%Float32ToFloat32.call.loc8 [concrete = constants.%float.c47] // CHECK:STDOUT: %.loc8_37.2: %f32.c73 = converted @__global_init.%Float32ToFloat32.call.loc8, %.loc8_37.1 [concrete = constants.%float.c47] // CHECK:STDOUT: %f32.loc8: type = type_literal constants.%f32.c73 [concrete = constants.%f32.c73] -// CHECK:STDOUT: %c: %f32.c73 = value_binding c, %.loc8_37.2 +// CHECK:STDOUT: %c: %f32.c73 = wrapper_binding c, %.loc8_37.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -550,14 +550,14 @@ let b: f64 = Float32ToFloat64(1.0e30); // CHECK:STDOUT: %.loc7_34.1: %f32.c73 = value_of_initializer @__global_init.%Float64ToFloat32.call.loc7 [concrete = constants.%float.943] // CHECK:STDOUT: %.loc7_34.2: %f32.c73 = converted @__global_init.%Float64ToFloat32.call.loc7, %.loc7_34.1 [concrete = constants.%float.943] // CHECK:STDOUT: %f32.loc7: type = type_literal constants.%f32.c73 [concrete = constants.%f32.c73] -// CHECK:STDOUT: %a: %f32.c73 = value_binding a, %.loc7_34.2 +// CHECK:STDOUT: %a: %f32.c73 = wrapper_binding a, %.loc7_34.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.240 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc9_37.1: %f32.c73 = value_of_initializer @__global_init.%Float64ToFloat32.call.loc9 [concrete = constants.%float.021] // CHECK:STDOUT: %.loc9_37.2: %f32.c73 = converted @__global_init.%Float64ToFloat32.call.loc9, %.loc9_37.1 [concrete = constants.%float.021] // CHECK:STDOUT: %f32.loc9: type = type_literal constants.%f32.c73 [concrete = constants.%f32.c73] -// CHECK:STDOUT: %b: %f32.c73 = value_binding b, %.loc9_37.2 +// CHECK:STDOUT: %b: %f32.c73 = wrapper_binding b, %.loc9_37.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -633,14 +633,14 @@ let b: f64 = Float32ToFloat64(1.0e30); // CHECK:STDOUT: %.loc7_34.1: %f64.dc1 = value_of_initializer @__global_init.%Float32ToFloat64.call.loc7 [concrete = constants.%float.3b9] // CHECK:STDOUT: %.loc7_34.2: %f64.dc1 = converted @__global_init.%Float32ToFloat64.call.loc7, %.loc7_34.1 [concrete = constants.%float.3b9] // CHECK:STDOUT: %f64.loc7: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %a: %f64.dc1 = value_binding a, %.loc7_34.2 +// CHECK:STDOUT: %a: %f64.dc1 = wrapper_binding a, %.loc7_34.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.fb7 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc8_37.1: %f64.dc1 = value_of_initializer @__global_init.%Float32ToFloat64.call.loc8 [concrete = constants.%float.84e] // CHECK:STDOUT: %.loc8_37.2: %f64.dc1 = converted @__global_init.%Float32ToFloat64.call.loc8, %.loc8_37.1 [concrete = constants.%float.84e] // CHECK:STDOUT: %f64.loc8: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %b: %f64.dc1 = value_binding b, %.loc8_37.2 +// CHECK:STDOUT: %b: %f64.dc1 = wrapper_binding b, %.loc8_37.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/builtins/float/convert_checked.carbon b/toolchain/check/testdata/builtins/float/convert_checked.carbon index dbe88755b19d..da7798465829 100644 --- a/toolchain/check/testdata/builtins/float/convert_checked.carbon +++ b/toolchain/check/testdata/builtins/float/convert_checked.carbon @@ -177,7 +177,7 @@ let convert_not_constant: f64 = Float64ToFloat64(not_constant_64); // CHECK:STDOUT: %.loc6_53.1: Core.FloatLiteral = value_of_initializer @__global_init.%FloatLiteralToFloatLiteral.call [concrete = constants.%float] // CHECK:STDOUT: %.loc6_53.2: Core.FloatLiteral = converted @__global_init.%FloatLiteralToFloatLiteral.call, %.loc6_53.1 [concrete = constants.%float] // CHECK:STDOUT: %FloatLiteral.ref: type = name_ref FloatLiteral, imports.%Main.FloatLiteral [concrete = Core.FloatLiteral] -// CHECK:STDOUT: %f: Core.FloatLiteral = value_binding f, %.loc6_53.2 +// CHECK:STDOUT: %f: Core.FloatLiteral = wrapper_binding f, %.loc6_53.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -218,21 +218,21 @@ let convert_not_constant: f64 = Float64ToFloat64(not_constant_64); // CHECK:STDOUT: %.loc6_39.1: %f64.dc1 = value_of_initializer @__global_init.%FloatLiteralToFloat64.call.loc6 [concrete = constants.%float.895] // CHECK:STDOUT: %.loc6_39.2: %f64.dc1 = converted @__global_init.%FloatLiteralToFloat64.call.loc6, %.loc6_39.1 [concrete = constants.%float.895] // CHECK:STDOUT: %f64.loc6: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %a: %f64.dc1 = value_binding a, %.loc6_39.2 +// CHECK:STDOUT: %a: %f64.dc1 = wrapper_binding a, %.loc6_39.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.fb7 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_39.1: %f64.dc1 = value_of_initializer @__global_init.%FloatLiteralToFloat64.call.loc7 [concrete = constants.%float.3b9] // CHECK:STDOUT: %.loc7_39.2: %f64.dc1 = converted @__global_init.%FloatLiteralToFloat64.call.loc7, %.loc7_39.1 [concrete = constants.%float.3b9] // CHECK:STDOUT: %f64.loc7: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %b: %f64.dc1 = value_binding b, %.loc7_39.2 +// CHECK:STDOUT: %b: %f64.dc1 = wrapper_binding b, %.loc7_39.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.fb7 = value_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc8_43.1: %f64.dc1 = value_of_initializer @__global_init.%FloatLiteralToFloat64.call.loc8 [concrete = constants.%float.672] // CHECK:STDOUT: %.loc8_43.2: %f64.dc1 = converted @__global_init.%FloatLiteralToFloat64.call.loc8, %.loc8_43.1 [concrete = constants.%float.672] // CHECK:STDOUT: %f64.loc8: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %c: %f64.dc1 = value_binding c, %.loc8_43.2 +// CHECK:STDOUT: %c: %f64.dc1 = wrapper_binding c, %.loc8_43.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -279,21 +279,21 @@ let convert_not_constant: f64 = Float64ToFloat64(not_constant_64); // CHECK:STDOUT: %.loc6_39.1: %f32.c73 = value_of_initializer @__global_init.%FloatLiteralToFloat32.call.loc6 [concrete = constants.%float.5cd] // CHECK:STDOUT: %.loc6_39.2: %f32.c73 = converted @__global_init.%FloatLiteralToFloat32.call.loc6, %.loc6_39.1 [concrete = constants.%float.5cd] // CHECK:STDOUT: %f32.loc6: type = type_literal constants.%f32.c73 [concrete = constants.%f32.c73] -// CHECK:STDOUT: %a: %f32.c73 = value_binding a, %.loc6_39.2 +// CHECK:STDOUT: %a: %f32.c73 = wrapper_binding a, %.loc6_39.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.240 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_39.1: %f32.c73 = value_of_initializer @__global_init.%FloatLiteralToFloat32.call.loc7 [concrete = constants.%float.943] // CHECK:STDOUT: %.loc7_39.2: %f32.c73 = converted @__global_init.%FloatLiteralToFloat32.call.loc7, %.loc7_39.1 [concrete = constants.%float.943] // CHECK:STDOUT: %f32.loc7: type = type_literal constants.%f32.c73 [concrete = constants.%f32.c73] -// CHECK:STDOUT: %b: %f32.c73 = value_binding b, %.loc7_39.2 +// CHECK:STDOUT: %b: %f32.c73 = wrapper_binding b, %.loc7_39.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.240 = value_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc8_42.1: %f32.c73 = value_of_initializer @__global_init.%FloatLiteralToFloat32.call.loc8 [concrete = constants.%float.c47] // CHECK:STDOUT: %.loc8_42.2: %f32.c73 = converted @__global_init.%FloatLiteralToFloat32.call.loc8, %.loc8_42.1 [concrete = constants.%float.c47] // CHECK:STDOUT: %f32.loc8: type = type_literal constants.%f32.c73 [concrete = constants.%f32.c73] -// CHECK:STDOUT: %c: %f32.c73 = value_binding c, %.loc8_42.2 +// CHECK:STDOUT: %c: %f32.c73 = wrapper_binding c, %.loc8_42.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -359,21 +359,21 @@ let convert_not_constant: f64 = Float64ToFloat64(not_constant_64); // CHECK:STDOUT: %.loc6_34.1: %f64.dc1 = value_of_initializer @__global_init.%Float64ToFloat64.call.loc6 [concrete = constants.%float.895] // CHECK:STDOUT: %.loc6_34.2: %f64.dc1 = converted @__global_init.%Float64ToFloat64.call.loc6, %.loc6_34.1 [concrete = constants.%float.895] // CHECK:STDOUT: %f64.loc6: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %a: %f64.dc1 = value_binding a, %.loc6_34.2 +// CHECK:STDOUT: %a: %f64.dc1 = wrapper_binding a, %.loc6_34.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.fb7 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_34.1: %f64.dc1 = value_of_initializer @__global_init.%Float64ToFloat64.call.loc7 [concrete = constants.%float.3b9] // CHECK:STDOUT: %.loc7_34.2: %f64.dc1 = converted @__global_init.%Float64ToFloat64.call.loc7, %.loc7_34.1 [concrete = constants.%float.3b9] // CHECK:STDOUT: %f64.loc7: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %b: %f64.dc1 = value_binding b, %.loc7_34.2 +// CHECK:STDOUT: %b: %f64.dc1 = wrapper_binding b, %.loc7_34.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.fb7 = value_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc8_38.1: %f64.dc1 = value_of_initializer @__global_init.%Float64ToFloat64.call.loc8 [concrete = constants.%float.672] // CHECK:STDOUT: %.loc8_38.2: %f64.dc1 = converted @__global_init.%Float64ToFloat64.call.loc8, %.loc8_38.1 [concrete = constants.%float.672] // CHECK:STDOUT: %f64.loc8: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %c: %f64.dc1 = value_binding c, %.loc8_38.2 +// CHECK:STDOUT: %c: %f64.dc1 = wrapper_binding c, %.loc8_38.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -460,21 +460,21 @@ let convert_not_constant: f64 = Float64ToFloat64(not_constant_64); // CHECK:STDOUT: %.loc6_34.1: %f32.c73 = value_of_initializer @__global_init.%Float32ToFloat32.call.loc6 [concrete = constants.%float.5cd] // CHECK:STDOUT: %.loc6_34.2: %f32.c73 = converted @__global_init.%Float32ToFloat32.call.loc6, %.loc6_34.1 [concrete = constants.%float.5cd] // CHECK:STDOUT: %f32.loc6: type = type_literal constants.%f32.c73 [concrete = constants.%f32.c73] -// CHECK:STDOUT: %a: %f32.c73 = value_binding a, %.loc6_34.2 +// CHECK:STDOUT: %a: %f32.c73 = wrapper_binding a, %.loc6_34.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.240 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_34.1: %f32.c73 = value_of_initializer @__global_init.%Float32ToFloat32.call.loc7 [concrete = constants.%float.943] // CHECK:STDOUT: %.loc7_34.2: %f32.c73 = converted @__global_init.%Float32ToFloat32.call.loc7, %.loc7_34.1 [concrete = constants.%float.943] // CHECK:STDOUT: %f32.loc7: type = type_literal constants.%f32.c73 [concrete = constants.%f32.c73] -// CHECK:STDOUT: %b: %f32.c73 = value_binding b, %.loc7_34.2 +// CHECK:STDOUT: %b: %f32.c73 = wrapper_binding b, %.loc7_34.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.240 = value_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc8_37.1: %f32.c73 = value_of_initializer @__global_init.%Float32ToFloat32.call.loc8 [concrete = constants.%float.c47] // CHECK:STDOUT: %.loc8_37.2: %f32.c73 = converted @__global_init.%Float32ToFloat32.call.loc8, %.loc8_37.1 [concrete = constants.%float.c47] // CHECK:STDOUT: %f32.loc8: type = type_literal constants.%f32.c73 [concrete = constants.%f32.c73] -// CHECK:STDOUT: %c: %f32.c73 = value_binding c, %.loc8_37.2 +// CHECK:STDOUT: %c: %f32.c73 = wrapper_binding c, %.loc8_37.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -554,7 +554,7 @@ let convert_not_constant: f64 = Float64ToFloat64(not_constant_64); // CHECK:STDOUT: %.loc6_34.1: %f32.c73 = value_of_initializer @__global_init.%Float64ToFloat32.call [concrete = constants.%float.943] // CHECK:STDOUT: %.loc6_34.2: %f32.c73 = converted @__global_init.%Float64ToFloat32.call, %.loc6_34.1 [concrete = constants.%float.943] // CHECK:STDOUT: %f32: type = type_literal constants.%f32.c73 [concrete = constants.%f32.c73] -// CHECK:STDOUT: %a: %f32.c73 = value_binding a, %.loc6_34.2 +// CHECK:STDOUT: %a: %f32.c73 = wrapper_binding a, %.loc6_34.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -624,21 +624,21 @@ let convert_not_constant: f64 = Float64ToFloat64(not_constant_64); // CHECK:STDOUT: %.loc11_37.1: %f32.c73 = value_of_initializer @__global_init.%Float64ToFloat32.call [concrete = ] // CHECK:STDOUT: %.loc11_37.2: %f32.c73 = converted @__global_init.%Float64ToFloat32.call, %.loc11_37.1 [concrete = ] // CHECK:STDOUT: %f32.loc11: type = type_literal constants.%f32.c73 [concrete = constants.%f32.c73] -// CHECK:STDOUT: %a: %f32.c73 = value_binding a, %.loc11_37.2 [concrete = ] +// CHECK:STDOUT: %a: %f32.c73 = wrapper_binding a, %.loc11_37.2 [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.240 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc16_42.1: %f32.c73 = value_of_initializer @__global_init.%FloatLiteralToFloat32.call [concrete = ] // CHECK:STDOUT: %.loc16_42.2: %f32.c73 = converted @__global_init.%FloatLiteralToFloat32.call, %.loc16_42.1 [concrete = ] // CHECK:STDOUT: %f32.loc16: type = type_literal constants.%f32.c73 [concrete = constants.%f32.c73] -// CHECK:STDOUT: %b: %f32.c73 = value_binding b, %.loc16_42.2 [concrete = ] +// CHECK:STDOUT: %b: %f32.c73 = wrapper_binding b, %.loc16_42.2 [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.fb7 = value_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc21_43.1: %f64.dc1 = value_of_initializer @__global_init.%FloatLiteralToFloat64.call [concrete = ] // CHECK:STDOUT: %.loc21_43.2: %f64.dc1 = converted @__global_init.%FloatLiteralToFloat64.call, %.loc21_43.1 [concrete = ] // CHECK:STDOUT: %f64: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %c: %f64.dc1 = value_binding c, %.loc21_43.2 [concrete = ] +// CHECK:STDOUT: %c: %f64.dc1 = wrapper_binding c, %.loc21_43.2 [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -710,14 +710,14 @@ let convert_not_constant: f64 = Float64ToFloat64(not_constant_64); // CHECK:STDOUT: %.loc6_34.1: %f64.dc1 = value_of_initializer @__global_init.%Float32ToFloat64.call.loc6 [concrete = constants.%float.3b9] // CHECK:STDOUT: %.loc6_34.2: %f64.dc1 = converted @__global_init.%Float32ToFloat64.call.loc6, %.loc6_34.1 [concrete = constants.%float.3b9] // CHECK:STDOUT: %f64.loc6: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %a: %f64.dc1 = value_binding a, %.loc6_34.2 +// CHECK:STDOUT: %a: %f64.dc1 = wrapper_binding a, %.loc6_34.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.fb7 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_37.1: %f64.dc1 = value_of_initializer @__global_init.%Float32ToFloat64.call.loc7 [concrete = constants.%float.84e] // CHECK:STDOUT: %.loc7_37.2: %f64.dc1 = converted @__global_init.%Float32ToFloat64.call.loc7, %.loc7_37.1 [concrete = constants.%float.84e] // CHECK:STDOUT: %f64.loc7: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %b: %f64.dc1 = value_binding b, %.loc7_37.2 +// CHECK:STDOUT: %b: %f64.dc1 = wrapper_binding b, %.loc7_37.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -790,14 +790,14 @@ let convert_not_constant: f64 = Float64ToFloat64(not_constant_64); // CHECK:STDOUT: %.loc6_28.1: %f64.dc1 = value_of_initializer %Core.FloatLiteral.as.ImplicitAs.impl.Convert.call [concrete = constants.%float.895] // CHECK:STDOUT: %.loc6_28.2: %f64.dc1 = converted @__global_init.%float, %.loc6_28.1 [concrete = constants.%float.895] // CHECK:STDOUT: %f64.loc6: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %not_constant_64: %f64.dc1 = value_binding not_constant_64, %.loc6_28.2 +// CHECK:STDOUT: %not_constant_64: %f64.dc1 = wrapper_binding not_constant_64, %.loc6_28.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %convert_not_constant.patt: %pattern_type.fb7 = value_binding_pattern convert_not_constant [concrete = constants.%convert_not_constant.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc15_65.1: %f64.dc1 = value_of_initializer @__global_init.%Float64ToFloat64.call // CHECK:STDOUT: %.loc15_65.2: %f64.dc1 = converted @__global_init.%Float64ToFloat64.call, %.loc15_65.1 // CHECK:STDOUT: %f64.loc15: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %convert_not_constant: %f64.dc1 = value_binding convert_not_constant, %.loc15_65.2 +// CHECK:STDOUT: %convert_not_constant: %f64.dc1 = wrapper_binding convert_not_constant, %.loc15_65.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/builtins/float/convert_int.carbon b/toolchain/check/testdata/builtins/float/convert_int.carbon index c4457f7506cb..fe924f7eb2f5 100644 --- a/toolchain/check/testdata/builtins/float/convert_int.carbon +++ b/toolchain/check/testdata/builtins/float/convert_int.carbon @@ -329,35 +329,35 @@ let inf_val: i32 = ConvertF64ToI32(Div(1.0, 0.0)); // CHECK:STDOUT: %.loc9_49.1: %i32 = value_of_initializer @__global_init.%ConvertF64ToI32.call.loc9 [concrete = ] // CHECK:STDOUT: %.loc9_49.2: %i32 = converted @__global_init.%ConvertF64ToI32.call.loc9, %.loc9_49.1 [concrete = ] // CHECK:STDOUT: %i32.loc9: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %overflow: %i32 = value_binding overflow, %.loc9_49.2 [concrete = ] +// CHECK:STDOUT: %overflow: %i32 = wrapper_binding overflow, %.loc9_49.2 [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %underflow.patt: %pattern_type.6b6 = value_binding_pattern underflow [concrete = constants.%underflow.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc15_58.1: %i32 = value_of_initializer @__global_init.%ConvertF64ToI32.call.loc15 [concrete = ] // CHECK:STDOUT: %.loc15_58.2: %i32 = converted @__global_init.%ConvertF64ToI32.call.loc15, %.loc15_58.1 [concrete = ] // CHECK:STDOUT: %i32.loc15: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %underflow: %i32 = value_binding underflow, %.loc15_58.2 [concrete = ] +// CHECK:STDOUT: %underflow: %i32 = wrapper_binding underflow, %.loc15_58.2 [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %unsigned_neg.patt: %pattern_type.668 = value_binding_pattern unsigned_neg [concrete = constants.%unsigned_neg.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc21_52.1: %u32 = value_of_initializer @__global_init.%ConvertF64ToU32.call [concrete = ] // CHECK:STDOUT: %.loc21_52.2: %u32 = converted @__global_init.%ConvertF64ToU32.call, %.loc21_52.1 [concrete = ] // CHECK:STDOUT: %u32.loc21: type = type_literal constants.%u32 [concrete = constants.%u32] -// CHECK:STDOUT: %unsigned_neg: %u32 = value_binding unsigned_neg, %.loc21_52.2 [concrete = ] +// CHECK:STDOUT: %unsigned_neg: %u32 = wrapper_binding unsigned_neg, %.loc21_52.2 [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %literal_overflow.patt: %pattern_type.6b6 = value_binding_pattern literal_overflow [concrete = constants.%literal_overflow.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc27_66.1: %i32 = value_of_initializer @__global_init.%ConvertFloatLiteralToI32.call.loc27 [concrete = ] // CHECK:STDOUT: %.loc27_66.2: %i32 = converted @__global_init.%ConvertFloatLiteralToI32.call.loc27, %.loc27_66.1 [concrete = ] // CHECK:STDOUT: %i32.loc27: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %literal_overflow: %i32 = value_binding literal_overflow, %.loc27_66.2 [concrete = ] +// CHECK:STDOUT: %literal_overflow: %i32 = wrapper_binding literal_overflow, %.loc27_66.2 [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %giant_literal_overflow.patt: %pattern_type.6b6 = value_binding_pattern giant_literal_overflow [concrete = constants.%giant_literal_overflow.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc33_71.1: %i32 = value_of_initializer @__global_init.%ConvertFloatLiteralToI32.call.loc33 [concrete = ] // CHECK:STDOUT: %.loc33_71.2: %i32 = converted @__global_init.%ConvertFloatLiteralToI32.call.loc33, %.loc33_71.1 [concrete = ] // CHECK:STDOUT: %i32.loc33: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %giant_literal_overflow: %i32 = value_binding giant_literal_overflow, %.loc33_71.2 [concrete = ] +// CHECK:STDOUT: %giant_literal_overflow: %i32 = wrapper_binding giant_literal_overflow, %.loc33_71.2 [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %giant_literal_to_int_literal_overflow.patt: %pattern_type.dc0 = value_binding_pattern giant_literal_to_int_literal_overflow [concrete = constants.%giant_literal_to_int_literal_overflow.patt] // CHECK:STDOUT: } @@ -367,14 +367,14 @@ let inf_val: i32 = ConvertF64ToI32(Div(1.0, 0.0)); // CHECK:STDOUT: %Core.ref.loc40: = name_ref Core, imports.%Core.048aa3.1 [concrete = imports.%Core.048aa3.1] // CHECK:STDOUT: %IntLiteral.ref.loc40: type = name_ref IntLiteral, imports.%Core.IntLiteral [concrete = Core.IntLiteral] // CHECK:STDOUT: } -// CHECK:STDOUT: %giant_literal_to_int_literal_overflow: Core.IntLiteral = value_binding giant_literal_to_int_literal_overflow, %.loc40_106.2 [concrete = ] +// CHECK:STDOUT: %giant_literal_to_int_literal_overflow: Core.IntLiteral = wrapper_binding giant_literal_to_int_literal_overflow, %.loc40_106.2 [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %giant_exponent_literal_overflow.patt: %pattern_type.6b6 = value_binding_pattern giant_exponent_literal_overflow [concrete = constants.%giant_exponent_literal_overflow.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc47_107.1: %i32 = value_of_initializer @__global_init.%ConvertFloatLiteralToI32.call.loc47 [concrete = ] // CHECK:STDOUT: %.loc47_107.2: %i32 = converted @__global_init.%ConvertFloatLiteralToI32.call.loc47, %.loc47_107.1 [concrete = ] // CHECK:STDOUT: %i32.loc47: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %giant_exponent_literal_overflow: %i32 = value_binding giant_exponent_literal_overflow, %.loc47_107.2 [concrete = ] +// CHECK:STDOUT: %giant_exponent_literal_overflow: %i32 = wrapper_binding giant_exponent_literal_overflow, %.loc47_107.2 [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %giant_exponent_literal_to_int_literal_overflow.patt: %pattern_type.dc0 = value_binding_pattern giant_exponent_literal_to_int_literal_overflow [concrete = constants.%giant_exponent_literal_to_int_literal_overflow.patt] // CHECK:STDOUT: } @@ -384,56 +384,56 @@ let inf_val: i32 = ConvertF64ToI32(Div(1.0, 0.0)); // CHECK:STDOUT: %Core.ref.loc55: = name_ref Core, imports.%Core.048aa3.1 [concrete = imports.%Core.048aa3.1] // CHECK:STDOUT: %IntLiteral.ref.loc55: type = name_ref IntLiteral, imports.%Core.IntLiteral [concrete = Core.IntLiteral] // CHECK:STDOUT: } -// CHECK:STDOUT: %giant_exponent_literal_to_int_literal_overflow: Core.IntLiteral = value_binding giant_exponent_literal_to_int_literal_overflow, %.loc55_141.2 [concrete = ] +// CHECK:STDOUT: %giant_exponent_literal_to_int_literal_overflow: Core.IntLiteral = wrapper_binding giant_exponent_literal_to_int_literal_overflow, %.loc55_141.2 [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %literal_overflow_large_mantissa.patt: %pattern_type.6b6 = value_binding_pattern literal_overflow_large_mantissa [concrete = constants.%literal_overflow_large_mantissa.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc62_82.1: %i32 = value_of_initializer @__global_init.%ConvertFloatLiteralToI32.call.loc62 [concrete = ] // CHECK:STDOUT: %.loc62_82.2: %i32 = converted @__global_init.%ConvertFloatLiteralToI32.call.loc62, %.loc62_82.1 [concrete = ] // CHECK:STDOUT: %i32.loc62: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %literal_overflow_large_mantissa: %i32 = value_binding literal_overflow_large_mantissa, %.loc62_82.2 [concrete = ] +// CHECK:STDOUT: %literal_overflow_large_mantissa: %i32 = wrapper_binding literal_overflow_large_mantissa, %.loc62_82.2 [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %literal_overflow_med_mantissa.patt: %pattern_type.6b6 = value_binding_pattern literal_overflow_med_mantissa [concrete = constants.%literal_overflow_med_mantissa.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc69_80.1: %i32 = value_of_initializer @__global_init.%ConvertFloatLiteralToI32.call.loc69 [concrete = ] // CHECK:STDOUT: %.loc69_80.2: %i32 = converted @__global_init.%ConvertFloatLiteralToI32.call.loc69, %.loc69_80.1 [concrete = ] // CHECK:STDOUT: %i32.loc69: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %literal_overflow_med_mantissa: %i32 = value_binding literal_overflow_med_mantissa, %.loc69_80.2 [concrete = ] +// CHECK:STDOUT: %literal_overflow_med_mantissa: %i32 = wrapper_binding literal_overflow_med_mantissa, %.loc69_80.2 [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %literal_overflow_hex_med_mantissa.patt: %pattern_type.6b6 = value_binding_pattern literal_overflow_hex_med_mantissa [concrete = constants.%literal_overflow_hex_med_mantissa.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc76_85.1: %i32 = value_of_initializer @__global_init.%ConvertFloatLiteralToI32.call.loc76 [concrete = ] // CHECK:STDOUT: %.loc76_85.2: %i32 = converted @__global_init.%ConvertFloatLiteralToI32.call.loc76, %.loc76_85.1 [concrete = ] // CHECK:STDOUT: %i32.loc76: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %literal_overflow_hex_med_mantissa: %i32 = value_binding literal_overflow_hex_med_mantissa, %.loc76_85.2 [concrete = ] +// CHECK:STDOUT: %literal_overflow_hex_med_mantissa: %i32 = wrapper_binding literal_overflow_hex_med_mantissa, %.loc76_85.2 [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %literal_overflow_small_mantissa.patt: %pattern_type.6b6 = value_binding_pattern literal_overflow_small_mantissa [concrete = constants.%literal_overflow_small_mantissa.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc83_75.1: %i32 = value_of_initializer @__global_init.%ConvertFloatLiteralToI32.call.loc83 [concrete = ] // CHECK:STDOUT: %.loc83_75.2: %i32 = converted @__global_init.%ConvertFloatLiteralToI32.call.loc83, %.loc83_75.1 [concrete = ] // CHECK:STDOUT: %i32.loc83: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %literal_overflow_small_mantissa: %i32 = value_binding literal_overflow_small_mantissa, %.loc83_75.2 [concrete = ] +// CHECK:STDOUT: %literal_overflow_small_mantissa: %i32 = wrapper_binding literal_overflow_small_mantissa, %.loc83_75.2 [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %literal_overflow_bin_small_mantissa.patt: %pattern_type.6b6 = value_binding_pattern literal_overflow_bin_small_mantissa [concrete = constants.%literal_overflow_bin_small_mantissa.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc90_81.1: %i32 = value_of_initializer @__global_init.%ConvertFloatLiteralToI32.call.loc90 [concrete = ] // CHECK:STDOUT: %.loc90_81.2: %i32 = converted @__global_init.%ConvertFloatLiteralToI32.call.loc90, %.loc90_81.1 [concrete = ] // CHECK:STDOUT: %i32.loc90: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %literal_overflow_bin_small_mantissa: %i32 = value_binding literal_overflow_bin_small_mantissa, %.loc90_81.2 [concrete = ] +// CHECK:STDOUT: %literal_overflow_bin_small_mantissa: %i32 = wrapper_binding literal_overflow_bin_small_mantissa, %.loc90_81.2 [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %literal_overflow_unsigned_neg.patt: %pattern_type.668 = value_binding_pattern literal_overflow_unsigned_neg [concrete = constants.%literal_overflow_unsigned_neg.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc97_72.1: %u32 = value_of_initializer @__global_init.%ConvertFloatLiteralToU32.call.loc97 [concrete = ] // CHECK:STDOUT: %.loc97_72.2: %u32 = converted @__global_init.%ConvertFloatLiteralToU32.call.loc97, %.loc97_72.1 [concrete = ] // CHECK:STDOUT: %u32.loc97: type = type_literal constants.%u32 [concrete = constants.%u32] -// CHECK:STDOUT: %literal_overflow_unsigned_neg: %u32 = value_binding literal_overflow_unsigned_neg, %.loc97_72.2 [concrete = ] +// CHECK:STDOUT: %literal_overflow_unsigned_neg: %u32 = wrapper_binding literal_overflow_unsigned_neg, %.loc97_72.2 [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %literal_overflow_bin_unsigned_neg.patt: %pattern_type.668 = value_binding_pattern literal_overflow_bin_unsigned_neg [concrete = constants.%literal_overflow_bin_unsigned_neg.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc104_79.1: %u32 = value_of_initializer @__global_init.%ConvertFloatLiteralToU32.call.loc104 [concrete = ] // CHECK:STDOUT: %.loc104_79.2: %u32 = converted @__global_init.%ConvertFloatLiteralToU32.call.loc104, %.loc104_79.1 [concrete = ] // CHECK:STDOUT: %u32.loc104: type = type_literal constants.%u32 [concrete = constants.%u32] -// CHECK:STDOUT: %literal_overflow_bin_unsigned_neg: %u32 = value_binding literal_overflow_bin_unsigned_neg, %.loc104_79.2 [concrete = ] +// CHECK:STDOUT: %literal_overflow_bin_unsigned_neg: %u32 = wrapper_binding literal_overflow_bin_unsigned_neg, %.loc104_79.2 [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -572,14 +572,14 @@ let inf_val: i32 = ConvertF64ToI32(Div(1.0, 0.0)); // CHECK:STDOUT: %.loc9_49.1: %i32 = value_of_initializer @__global_init.%ConvertF64ToI32.call.loc9 [concrete = ] // CHECK:STDOUT: %.loc9_49.2: %i32 = converted @__global_init.%ConvertF64ToI32.call.loc9, %.loc9_49.1 [concrete = ] // CHECK:STDOUT: %i32.loc9: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %nan_val: %i32 = value_binding nan_val, %.loc9_49.2 [concrete = ] +// CHECK:STDOUT: %nan_val: %i32 = wrapper_binding nan_val, %.loc9_49.2 [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %inf_val.patt: %pattern_type.6b6 = value_binding_pattern inf_val [concrete = constants.%inf_val.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc15_49.1: %i32 = value_of_initializer @__global_init.%ConvertF64ToI32.call.loc15 [concrete = ] // CHECK:STDOUT: %.loc15_49.2: %i32 = converted @__global_init.%ConvertF64ToI32.call.loc15, %.loc15_49.1 [concrete = ] // CHECK:STDOUT: %i32.loc15: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %inf_val: %i32 = value_binding inf_val, %.loc15_49.2 [concrete = ] +// CHECK:STDOUT: %inf_val: %i32 = wrapper_binding inf_val, %.loc15_49.2 [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/builtins/float_literal/make_type.carbon b/toolchain/check/testdata/builtins/float_literal/make_type.carbon index 191a34279653..5f135c412dc9 100644 --- a/toolchain/check/testdata/builtins/float_literal/make_type.carbon +++ b/toolchain/check/testdata/builtins/float_literal/make_type.carbon @@ -44,7 +44,7 @@ let f: FloatLiteral = 1.0; // CHECK:STDOUT: %f.patt: %pattern_type = value_binding_pattern f [concrete = constants.%f.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %FloatLiteral.ref: type = name_ref FloatLiteral, imports.%Main.FloatLiteral [concrete = Core.FloatLiteral] -// CHECK:STDOUT: %f: Core.FloatLiteral = value_binding f, @__global_init.%float +// CHECK:STDOUT: %f: Core.FloatLiteral = wrapper_binding f, @__global_init.%float // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/builtins/form/make_type.carbon b/toolchain/check/testdata/builtins/form/make_type.carbon index d1e365f3920e..723f0c8affb5 100644 --- a/toolchain/check/testdata/builtins/form/make_type.carbon +++ b/toolchain/check/testdata/builtins/form/make_type.carbon @@ -46,7 +46,7 @@ let f: Form = form(var ()); // CHECK:STDOUT: %f.patt: %pattern_type = value_binding_pattern f [concrete = constants.%f.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %Form.ref: type = name_ref Form, imports.%Main.Form [concrete = Core.Form] -// CHECK:STDOUT: %f: Core.Form = value_binding f, @__global_init.%.loc7_20 +// CHECK:STDOUT: %f: Core.Form = wrapper_binding f, @__global_init.%.loc7_20 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/builtins/int/add_char_literal.carbon b/toolchain/check/testdata/builtins/int/add_char_literal.carbon index 86bde0d78e62..f0919482e0ba 100644 --- a/toolchain/check/testdata/builtins/int/add_char_literal.carbon +++ b/toolchain/check/testdata/builtins/int/add_char_literal.carbon @@ -91,7 +91,7 @@ let c: CharLiteral = AddIntChar(Negate(98), 'a'); // CHECK:STDOUT: %.loc12_39.1: Core.CharLiteral = value_of_initializer @__global_init.%AddIntChar.call [concrete = constants.%.711] // CHECK:STDOUT: %.loc12_39.2: Core.CharLiteral = converted @__global_init.%AddIntChar.call, %.loc12_39.1 [concrete = constants.%.711] // CHECK:STDOUT: %CharLiteral.ref: type = name_ref CharLiteral, %CharLiteral [concrete = Core.CharLiteral] -// CHECK:STDOUT: %a: Core.CharLiteral = value_binding a, %.loc12_39.2 +// CHECK:STDOUT: %a: Core.CharLiteral = wrapper_binding a, %.loc12_39.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/builtins/int/convert_char_literal.carbon b/toolchain/check/testdata/builtins/int/convert_char_literal.carbon index 3a1944dd929e..79752c1c5163 100644 --- a/toolchain/check/testdata/builtins/int/convert_char_literal.carbon +++ b/toolchain/check/testdata/builtins/int/convert_char_literal.carbon @@ -123,21 +123,21 @@ let c: CharLiteral = ConvertFromIntLiteral(0x110000); // CHECK:STDOUT: %.loc14_46.1: Core.CharLiteral = value_of_initializer @__global_init.%ConvertFromIntLiteral.call [concrete = constants.%.54f] // CHECK:STDOUT: %.loc14_46.2: Core.CharLiteral = converted @__global_init.%ConvertFromIntLiteral.call, %.loc14_46.1 [concrete = constants.%.54f] // CHECK:STDOUT: %CharLiteral.ref.loc14: type = name_ref CharLiteral, %CharLiteral [concrete = Core.CharLiteral] -// CHECK:STDOUT: %a: Core.CharLiteral = value_binding a, %.loc14_46.2 +// CHECK:STDOUT: %a: Core.CharLiteral = wrapper_binding a, %.loc14_46.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.8c6 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc15_39.1: Core.CharLiteral = value_of_initializer @__global_init.%ConvertFromI32.call [concrete = constants.%.711] // CHECK:STDOUT: %.loc15_39.2: Core.CharLiteral = converted @__global_init.%ConvertFromI32.call, %.loc15_39.1 [concrete = constants.%.711] // CHECK:STDOUT: %CharLiteral.ref.loc15: type = name_ref CharLiteral, %CharLiteral [concrete = Core.CharLiteral] -// CHECK:STDOUT: %b: Core.CharLiteral = value_binding b, %.loc15_39.2 +// CHECK:STDOUT: %b: Core.CharLiteral = wrapper_binding b, %.loc15_39.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.8c6 = value_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc16_39.1: Core.CharLiteral = value_of_initializer @__global_init.%ConvertFromU32.call [concrete = constants.%.b9b] // CHECK:STDOUT: %.loc16_39.2: Core.CharLiteral = converted @__global_init.%ConvertFromU32.call, %.loc16_39.1 [concrete = constants.%.b9b] // CHECK:STDOUT: %CharLiteral.ref.loc16: type = name_ref CharLiteral, %CharLiteral [concrete = Core.CharLiteral] -// CHECK:STDOUT: %c: Core.CharLiteral = value_binding c, %.loc16_39.2 +// CHECK:STDOUT: %c: Core.CharLiteral = wrapper_binding c, %.loc16_39.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/builtins/int/convert_checked.carbon b/toolchain/check/testdata/builtins/int/convert_checked.carbon index 02f283956e7c..5a234fb4e41f 100644 --- a/toolchain/check/testdata/builtins/int/convert_checked.carbon +++ b/toolchain/check/testdata/builtins/int/convert_checked.carbon @@ -320,21 +320,21 @@ let convert_not_constant_widen: i64 = Int32ToInt64(not_constant); // CHECK:STDOUT: %.loc6_42.1: %u32 = value_of_initializer @__global_init.%Int32ToUint32.call [concrete = constants.%int_1.92d] // CHECK:STDOUT: %.loc6_42.2: %u32 = converted @__global_init.%Int32ToUint32.call, %.loc6_42.1 [concrete = constants.%int_1.92d] // CHECK:STDOUT: %u32: type = type_literal constants.%u32 [concrete = constants.%u32] -// CHECK:STDOUT: %SizePreserving: %u32 = value_binding SizePreserving, %.loc6_42.2 +// CHECK:STDOUT: %SizePreserving: %u32 = wrapper_binding SizePreserving, %.loc6_42.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %Narrowing.patt: %pattern_type.203 = value_binding_pattern Narrowing [concrete = constants.%Narrowing.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_36.1: %i16 = value_of_initializer @__global_init.%Int32ToInt16.call [concrete = constants.%int_1.d17] // CHECK:STDOUT: %.loc7_36.2: %i16 = converted @__global_init.%Int32ToInt16.call, %.loc7_36.1 [concrete = constants.%int_1.d17] // CHECK:STDOUT: %i16: type = type_literal constants.%i16 [concrete = constants.%i16] -// CHECK:STDOUT: %Narrowing: %i16 = value_binding Narrowing, %.loc7_36.2 +// CHECK:STDOUT: %Narrowing: %i16 = wrapper_binding Narrowing, %.loc7_36.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %Widening.patt: %pattern_type.f57 = value_binding_pattern Widening [concrete = constants.%Widening.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc8_35.1: %i64 = value_of_initializer @__global_init.%Int32ToInt64.call [concrete = constants.%int_1.d98] // CHECK:STDOUT: %.loc8_35.2: %i64 = converted @__global_init.%Int32ToInt64.call, %.loc8_35.1 [concrete = constants.%int_1.d98] // CHECK:STDOUT: %i64: type = type_literal constants.%i64 [concrete = constants.%i64] -// CHECK:STDOUT: %Widening: %i64 = value_binding Widening, %.loc8_35.2 +// CHECK:STDOUT: %Widening: %i64 = wrapper_binding Widening, %.loc8_35.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/builtins/int/convert_float.carbon b/toolchain/check/testdata/builtins/int/convert_float.carbon index ca9eb76ab1bb..8903da186e13 100644 --- a/toolchain/check/testdata/builtins/int/convert_float.carbon +++ b/toolchain/check/testdata/builtins/int/convert_float.carbon @@ -90,7 +90,7 @@ let invalid: f64 = ConvertIntLiteralToFloatLiteral(-1) as f64; // CHECK:STDOUT: %.loc9_354.1: %f64.dc1 = value_of_initializer @__global_init.%ConvertIntLiteralToF64.call [concrete = ] // CHECK:STDOUT: %.loc9_354.2: %f64.dc1 = converted @__global_init.%ConvertIntLiteralToF64.call, %.loc9_354.1 [concrete = ] // CHECK:STDOUT: %f64: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %overflow: %f64.dc1 = value_binding overflow, %.loc9_354.2 [concrete = ] +// CHECK:STDOUT: %overflow: %f64.dc1 = wrapper_binding overflow, %.loc9_354.2 [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -147,7 +147,7 @@ let invalid: f64 = ConvertIntLiteralToFloatLiteral(-1) as f64; // CHECK:STDOUT: %invalid.patt: %pattern_type.fb7 = value_binding_pattern invalid [concrete = constants.%invalid.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %f64: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %invalid: %f64.dc1 = value_binding invalid, @__global_init.%.loc9_56.2 [concrete = ] +// CHECK:STDOUT: %invalid: %f64.dc1 = wrapper_binding invalid, @__global_init.%.loc9_56.2 [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/builtins/int/convert_float_checked.carbon b/toolchain/check/testdata/builtins/int/convert_float_checked.carbon index f94de3dbb507..bdc8f997e6b5 100644 --- a/toolchain/check/testdata/builtins/int/convert_float_checked.carbon +++ b/toolchain/check/testdata/builtins/int/convert_float_checked.carbon @@ -66,7 +66,7 @@ let lossy: f32 = ConvertIntLiteralToF32(123456789); // CHECK:STDOUT: %.loc9_50.1: %f32.c73 = value_of_initializer @__global_init.%ConvertIntLiteralToF32.call [concrete = ] // CHECK:STDOUT: %.loc9_50.2: %f32.c73 = converted @__global_init.%ConvertIntLiteralToF32.call, %.loc9_50.1 [concrete = ] // CHECK:STDOUT: %f32: type = type_literal constants.%f32.c73 [concrete = constants.%f32.c73] -// CHECK:STDOUT: %lossy: %f32.c73 = value_binding lossy, %.loc9_50.2 [concrete = ] +// CHECK:STDOUT: %lossy: %f32.c73 = wrapper_binding lossy, %.loc9_50.2 [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/builtins/maybe_unformed/make_type.carbon b/toolchain/check/testdata/builtins/maybe_unformed/make_type.carbon index a6eb2d141f5e..0b7b78e1e9f1 100644 --- a/toolchain/check/testdata/builtins/maybe_unformed/make_type.carbon +++ b/toolchain/check/testdata/builtins/maybe_unformed/make_type.carbon @@ -91,7 +91,7 @@ fn ColonBangParam(T:! type) -> type = "maybe_unformed.make_type"; // CHECK:STDOUT: %.loc7_29.2: type = value_of_initializer %Make.call.loc7_29 [concrete = constants.%.2ba] // CHECK:STDOUT: %.loc7_29.3: type = converted %Make.call.loc7_29, %.loc7_29.2 [concrete = constants.%.2ba] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %.2ba = value_binding b, %b.param +// CHECK:STDOUT: %b: %.2ba = wrapper_binding b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -122,14 +122,14 @@ fn ColonBangParam(T:! type) -> type = "maybe_unformed.make_type"; // CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_16: type = converted @__global_init.%.loc7, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: %.loc7_8: type = type_literal type [concrete = type] -// CHECK:STDOUT: %t: type = value_binding t, %.loc7_16 +// CHECK:STDOUT: %t: type = wrapper_binding t, %.loc7_16 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %u.patt: %pattern_type = value_binding_pattern u [concrete = constants.%u.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc8_21.1: type = value_of_initializer @__global_init.%Make.call // CHECK:STDOUT: %.loc8_21.2: type = converted @__global_init.%Make.call, %.loc8_21.1 // CHECK:STDOUT: %.loc8_8: type = type_literal type [concrete = type] -// CHECK:STDOUT: %u: type = value_binding u, %.loc8_21.2 +// CHECK:STDOUT: %u: type = wrapper_binding u, %.loc8_21.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/builtins/no_op.carbon b/toolchain/check/testdata/builtins/no_op.carbon index 9a5d85f6c0cb..4c7a4604c24a 100644 --- a/toolchain/check/testdata/builtins/no_op.carbon +++ b/toolchain/check/testdata/builtins/no_op.carbon @@ -139,7 +139,7 @@ fn NoOp() -> {} = "no_op"; // CHECK:STDOUT: %.loc7_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_9.3: type = converted %.loc7_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %empty_tuple.type = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %empty_tuple.type = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/builtins/pointer/is_null.carbon b/toolchain/check/testdata/builtins/pointer/is_null.carbon index dcb5ef8209a2..699aa8a4eafc 100644 --- a/toolchain/check/testdata/builtins/pointer/is_null.carbon +++ b/toolchain/check/testdata/builtins/pointer/is_null.carbon @@ -136,7 +136,7 @@ fn NotPointer(p: MakeUnformed({})) -> bool = "pointer.is_null"; // CHECK:STDOUT: %.loc11_39.2: type = value_of_initializer %MakeUnformed.call [concrete = constants.%.b2d] // CHECK:STDOUT: %.loc11_39.3: type = converted %MakeUnformed.call, %.loc11_39.2 [concrete = constants.%.b2d] // CHECK:STDOUT: } -// CHECK:STDOUT: %s: %.b2d = value_binding s, %s.param +// CHECK:STDOUT: %s: %.b2d = wrapper_binding s, %s.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param1 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -157,7 +157,7 @@ fn NotPointer(p: MakeUnformed({})) -> bool = "pointer.is_null"; // CHECK:STDOUT: %.loc15_28.2: type = value_of_initializer %MakeUnformed.call [concrete = constants.%.9e8] // CHECK:STDOUT: %.loc15_28.3: type = converted %MakeUnformed.call, %.loc15_28.2 [concrete = constants.%.9e8] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %.9e8 = value_binding c, %c.param +// CHECK:STDOUT: %c: %.9e8 = wrapper_binding c, %c.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param1 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -230,7 +230,7 @@ fn NotPointer(p: MakeUnformed({})) -> bool = "pointer.is_null"; // CHECK:STDOUT: %.loc10_39.2: type = value_of_initializer %MakeUnformed.call [concrete = constants.%.b2d] // CHECK:STDOUT: %.loc10_39.3: type = converted %MakeUnformed.call, %.loc10_39.2 [concrete = constants.%.b2d] // CHECK:STDOUT: } -// CHECK:STDOUT: %s: %.b2d = value_binding s, %s.param +// CHECK:STDOUT: %s: %.b2d = wrapper_binding s, %s.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param1 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -251,7 +251,7 @@ fn NotPointer(p: MakeUnformed({})) -> bool = "pointer.is_null"; // CHECK:STDOUT: %.loc14_28.2: type = value_of_initializer %MakeUnformed.call [concrete = constants.%.9e8] // CHECK:STDOUT: %.loc14_28.3: type = converted %MakeUnformed.call, %.loc14_28.2 [concrete = constants.%.9e8] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %.9e8 = value_binding c, %c.param +// CHECK:STDOUT: %c: %.9e8 = wrapper_binding c, %c.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param1 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtins/pointer/make_null.carbon b/toolchain/check/testdata/builtins/pointer/make_null.carbon index 1dd1f553a70d..ee7ef8d255f0 100644 --- a/toolchain/check/testdata/builtins/pointer/make_null.carbon +++ b/toolchain/check/testdata/builtins/pointer/make_null.carbon @@ -100,7 +100,7 @@ fn NotPointer() -> MakeUnformed({}) = "pointer.make_null"; // CHECK:STDOUT: %.loc11_24.2: type = value_of_initializer %MakeUnformed.call.loc11 [concrete = constants.%.b2d] // CHECK:STDOUT: %.loc11_24.3: type = converted %MakeUnformed.call.loc11, %.loc11_24.2 [concrete = constants.%.b2d] // CHECK:STDOUT: } -// CHECK:STDOUT: %s: %.b2d = value_binding s, %.loc11_48.2 +// CHECK:STDOUT: %s: %.b2d = wrapper_binding s, %.loc11_48.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.e22 = value_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: } @@ -114,7 +114,7 @@ fn NotPointer() -> MakeUnformed({}) = "pointer.make_null"; // CHECK:STDOUT: %.loc12_23.2: type = value_of_initializer %MakeUnformed.call.loc12 [concrete = constants.%.9e8] // CHECK:STDOUT: %.loc12_23.3: type = converted %MakeUnformed.call.loc12, %.loc12_23.2 [concrete = constants.%.9e8] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %.9e8 = value_binding c, %.loc12_37.2 +// CHECK:STDOUT: %c: %.9e8 = wrapper_binding c, %.loc12_37.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -163,7 +163,7 @@ fn NotPointer() -> MakeUnformed({}) = "pointer.make_null"; // CHECK:STDOUT: %.loc10_24.2: type = value_of_initializer %MakeUnformed.call.loc10 [concrete = constants.%.b2d] // CHECK:STDOUT: %.loc10_24.3: type = converted %MakeUnformed.call.loc10, %.loc10_24.2 [concrete = constants.%.b2d] // CHECK:STDOUT: } -// CHECK:STDOUT: %s: %.b2d = value_binding s, %.loc10_39.2 +// CHECK:STDOUT: %s: %.b2d = wrapper_binding s, %.loc10_39.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.e22 = value_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: } @@ -177,7 +177,7 @@ fn NotPointer() -> MakeUnformed({}) = "pointer.make_null"; // CHECK:STDOUT: %.loc11_23.2: type = value_of_initializer %MakeUnformed.call.loc11 [concrete = constants.%.9e8] // CHECK:STDOUT: %.loc11_23.3: type = converted %MakeUnformed.call.loc11, %.loc11_23.2 [concrete = constants.%.9e8] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %.9e8 = value_binding c, %.loc11_37.2 +// CHECK:STDOUT: %c: %.9e8 = wrapper_binding c, %.loc11_37.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/builtins/read/char.carbon b/toolchain/check/testdata/builtins/read/char.carbon index 95efe053c95f..da12a11da6ce 100644 --- a/toolchain/check/testdata/builtins/read/char.carbon +++ b/toolchain/check/testdata/builtins/read/char.carbon @@ -61,7 +61,7 @@ fn Main() { // CHECK:STDOUT: %.loc8_32.1: %i32 = value_of_initializer %ReadChar.call.loc8 // CHECK:STDOUT: %.loc8_32.2: %i32 = converted %ReadChar.call.loc8, %.loc8_32.1 // CHECK:STDOUT: %i32.loc8: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: %i32 = value_binding n, %.loc8_32.2 +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, %.loc8_32.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %m.patt: %pattern_type.6b6 = value_binding_pattern m [concrete = constants.%m.patt] // CHECK:STDOUT: } @@ -71,7 +71,7 @@ fn Main() { // CHECK:STDOUT: %.loc9_37.1: %i32 = value_of_initializer %ReadChar.call.loc9 // CHECK:STDOUT: %.loc9_37.2: %i32 = converted %ReadChar.call.loc9, %.loc9_37.1 // CHECK:STDOUT: %i32.loc9: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %m: %i32 = value_binding m, %.loc9_37.2 +// CHECK:STDOUT: %m: %i32 = wrapper_binding m, %.loc9_37.2 // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/choice/basic.carbon b/toolchain/check/testdata/choice/basic.carbon index 7bee67ab8329..d5a19874bd7a 100644 --- a/toolchain/check/testdata/choice/basic.carbon +++ b/toolchain/check/testdata/choice/basic.carbon @@ -99,7 +99,7 @@ let never: Never = {}; // CHECK:STDOUT: %mood.patt: %pattern_type = value_binding_pattern mood [concrete = constants.%mood.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %Always.ref: type = name_ref Always, %Always.decl [concrete = constants.%Always] -// CHECK:STDOUT: %mood: %Always = value_binding mood, @__global_init.%Sunny.ref +// CHECK:STDOUT: %mood: %Always = wrapper_binding mood, @__global_init.%Sunny.ref // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Always { @@ -117,7 +117,7 @@ let never: Never = {}; // CHECK:STDOUT: %.loc6_1.10: init %Always = converted %.loc6_1.3, %.loc6_1.9 [concrete = constants.%Always.val] // CHECK:STDOUT: %.loc6_1.11: ref %Always = temporary %.loc6_1.4, %.loc6_1.10 [concrete = constants.%.302] // CHECK:STDOUT: %.loc6_1.12: %Always = acquire_value %.loc6_1.11 [concrete = constants.%Always.val] -// CHECK:STDOUT: %Sunny: %Always = value_binding Sunny, %.loc6_1.12 +// CHECK:STDOUT: %Sunny: %Always = wrapper_binding Sunny, %.loc6_1.12 // CHECK:STDOUT: complete_type_witness = %complete_type // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -217,22 +217,22 @@ let never: Never = {}; // CHECK:STDOUT: %less.patt: %pattern_type.542 = value_binding_pattern less [concrete = constants.%less.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %Ordering.ref.loc11: type = name_ref Ordering, %Ordering.decl [concrete = constants.%Ordering] -// CHECK:STDOUT: %less: %Ordering = value_binding less, @__global_init.%Less.ref +// CHECK:STDOUT: %less: %Ordering = wrapper_binding less, @__global_init.%Less.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %equiv.patt: %pattern_type.542 = value_binding_pattern equiv [concrete = constants.%equiv.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %Ordering.ref.loc12: type = name_ref Ordering, %Ordering.decl [concrete = constants.%Ordering] -// CHECK:STDOUT: %equiv: %Ordering = value_binding equiv, @__global_init.%Equivalent.ref +// CHECK:STDOUT: %equiv: %Ordering = wrapper_binding equiv, @__global_init.%Equivalent.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %greater.patt: %pattern_type.542 = value_binding_pattern greater [concrete = constants.%greater.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %Ordering.ref.loc13: type = name_ref Ordering, %Ordering.decl [concrete = constants.%Ordering] -// CHECK:STDOUT: %greater: %Ordering = value_binding greater, @__global_init.%Greater.ref +// CHECK:STDOUT: %greater: %Ordering = wrapper_binding greater, @__global_init.%Greater.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %inc.patt: %pattern_type.542 = value_binding_pattern inc [concrete = constants.%inc.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %Ordering.ref.loc14: type = name_ref Ordering, %Ordering.decl [concrete = constants.%Ordering] -// CHECK:STDOUT: %inc: %Ordering = value_binding inc, @__global_init.%Incomparable.ref +// CHECK:STDOUT: %inc: %Ordering = wrapper_binding inc, @__global_init.%Incomparable.ref // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Ordering { @@ -258,7 +258,7 @@ let never: Never = {}; // CHECK:STDOUT: %.loc5_7.8: init %Ordering = converted %.loc5_7.3, %.loc5_7.7 [concrete = constants.%Ordering.val.236] // CHECK:STDOUT: %.loc5_7.9: ref %Ordering = temporary %.loc5_7.4, %.loc5_7.8 [concrete = constants.%.156] // CHECK:STDOUT: %.loc5_7.10: %Ordering = acquire_value %.loc5_7.9 [concrete = constants.%Ordering.val.236] -// CHECK:STDOUT: %Less: %Ordering = value_binding Less, %.loc5_7.10 +// CHECK:STDOUT: %Less: %Ordering = wrapper_binding Less, %.loc5_7.10 // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc6_13.1: %.66c = impl_witness_access constants.%ImplicitAs.impl_witness.e93, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.409] // CHECK:STDOUT: %bound_method.loc6_13.1: = bound_method %int_1, %impl.elem0.loc6_13.1 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound.48e] @@ -280,7 +280,7 @@ let never: Never = {}; // CHECK:STDOUT: %.loc6_13.8: init %Ordering = converted %.loc6_13.3, %.loc6_13.7 [concrete = constants.%Ordering.val.4d4] // CHECK:STDOUT: %.loc6_13.9: ref %Ordering = temporary %.loc6_13.4, %.loc6_13.8 [concrete = constants.%.ce0] // CHECK:STDOUT: %.loc6_13.10: %Ordering = acquire_value %.loc6_13.9 [concrete = constants.%Ordering.val.4d4] -// CHECK:STDOUT: %Equivalent: %Ordering = value_binding Equivalent, %.loc6_13.10 +// CHECK:STDOUT: %Equivalent: %Ordering = wrapper_binding Equivalent, %.loc6_13.10 // CHECK:STDOUT: %int_2: Core.IntLiteral = int_value 2 [concrete = constants.%int_2.ecc] // CHECK:STDOUT: %impl.elem0.loc7_10.1: %.66c = impl_witness_access constants.%ImplicitAs.impl_witness.e93, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.409] // CHECK:STDOUT: %bound_method.loc7_10.1: = bound_method %int_2, %impl.elem0.loc7_10.1 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound.6c9] @@ -302,7 +302,7 @@ let never: Never = {}; // CHECK:STDOUT: %.loc7_10.8: init %Ordering = converted %.loc7_10.3, %.loc7_10.7 [concrete = constants.%Ordering.val.fca] // CHECK:STDOUT: %.loc7_10.9: ref %Ordering = temporary %.loc7_10.4, %.loc7_10.8 [concrete = constants.%.267] // CHECK:STDOUT: %.loc7_10.10: %Ordering = acquire_value %.loc7_10.9 [concrete = constants.%Ordering.val.fca] -// CHECK:STDOUT: %Greater: %Ordering = value_binding Greater, %.loc7_10.10 +// CHECK:STDOUT: %Greater: %Ordering = wrapper_binding Greater, %.loc7_10.10 // CHECK:STDOUT: %int_3: Core.IntLiteral = int_value 3 [concrete = constants.%int_3.1ba] // CHECK:STDOUT: %impl.elem0.loc9_1.1: %.66c = impl_witness_access constants.%ImplicitAs.impl_witness.e93, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.409] // CHECK:STDOUT: %bound_method.loc9_1.1: = bound_method %int_3, %impl.elem0.loc9_1.1 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound.0d0] @@ -324,7 +324,7 @@ let never: Never = {}; // CHECK:STDOUT: %.loc9_1.8: init %Ordering = converted %.loc9_1.3, %.loc9_1.7 [concrete = constants.%Ordering.val.3b4] // CHECK:STDOUT: %.loc9_1.9: ref %Ordering = temporary %.loc9_1.4, %.loc9_1.8 [concrete = constants.%.a83] // CHECK:STDOUT: %.loc9_1.10: %Ordering = acquire_value %.loc9_1.9 [concrete = constants.%Ordering.val.3b4] -// CHECK:STDOUT: %Incomparable: %Ordering = value_binding Incomparable, %.loc9_1.10 +// CHECK:STDOUT: %Incomparable: %Ordering = wrapper_binding Incomparable, %.loc9_1.10 // CHECK:STDOUT: complete_type_witness = %complete_type // CHECK:STDOUT: // CHECK:STDOUT: !members: diff --git a/toolchain/check/testdata/choice/generic.carbon b/toolchain/check/testdata/choice/generic.carbon index 1aae4d6e7a47..2d72ef25819f 100644 --- a/toolchain/check/testdata/choice/generic.carbon +++ b/toolchain/check/testdata/choice/generic.carbon @@ -74,7 +74,7 @@ choice Always(T:! type) { // CHECK:STDOUT: %.loc16_1.10: init @Always.%Always (%Always) = converted %.loc16_1.3, %.loc16_1.9 [symbolic = %Always.val (constants.%Always.val)] // CHECK:STDOUT: %.loc16_1.11: ref @Always.%Always (%Always) = temporary %.loc16_1.4, %.loc16_1.10 [symbolic = %.loc16_1.13 (constants.%.4eb)] // CHECK:STDOUT: %.loc16_1.12: @Always.%Always (%Always) = acquire_value %.loc16_1.11 [symbolic = %Always.val (constants.%Always.val)] -// CHECK:STDOUT: %Sunny: @Always.%Always (%Always) = value_binding Sunny, %.loc16_1.12 +// CHECK:STDOUT: %Sunny: @Always.%Always (%Always) = wrapper_binding Sunny, %.loc16_1.12 // CHECK:STDOUT: complete_type_witness = %complete_type // CHECK:STDOUT: // CHECK:STDOUT: !members: diff --git a/toolchain/check/testdata/class/abstract/abstract.carbon b/toolchain/check/testdata/class/abstract/abstract.carbon index 6e10bcb7ee5e..f60b13b7661f 100644 --- a/toolchain/check/testdata/class/abstract/abstract.carbon +++ b/toolchain/check/testdata/class/abstract/abstract.carbon @@ -333,7 +333,7 @@ fn Assign(ref a: Abstract) { // CHECK:STDOUT: %v.var: ref = var %v.var_patt [concrete = ] // CHECK:STDOUT: assign %v.var, // CHECK:STDOUT: %Abstract.ref: type = name_ref Abstract, file.%Abstract.decl [concrete = constants.%Abstract] -// CHECK:STDOUT: %v: ref = ref_binding v, [concrete = ] +// CHECK:STDOUT: %v: = wrapper_binding v, [concrete = ] // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: @@ -368,7 +368,7 @@ fn Assign(ref a: Abstract) { // CHECK:STDOUT: } { // CHECK:STDOUT: %_.param: ref = ref_param call_param0 // CHECK:STDOUT: %Abstract.ref: type = name_ref Abstract, file.%Abstract.decl [concrete = constants.%Abstract] -// CHECK:STDOUT: %_: ref = ref_binding _, [concrete = ] +// CHECK:STDOUT: %_: = wrapper_binding _, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -420,7 +420,7 @@ fn Assign(ref a: Abstract) { // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %Abstract = value_param call_param0 // CHECK:STDOUT: %Abstract.ref.loc6: type = name_ref Abstract, file.%Abstract.decl [concrete = constants.%Abstract] -// CHECK:STDOUT: %a: %Abstract = value_binding a, %a.param +// CHECK:STDOUT: %a: %Abstract = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -439,7 +439,7 @@ fn Assign(ref a: Abstract) { // CHECK:STDOUT: } // CHECK:STDOUT: %a.ref: %Abstract = name_ref a, %a // CHECK:STDOUT: %Abstract.ref.loc7: type = name_ref Abstract, file.%Abstract.decl [concrete = constants.%Abstract] -// CHECK:STDOUT: %l: %Abstract = value_binding l, %a.ref +// CHECK:STDOUT: %l: %Abstract = wrapper_binding l, %a.ref // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: @@ -529,7 +529,7 @@ fn Assign(ref a: Abstract) { // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %Abstract = value_param call_param0 // CHECK:STDOUT: %Abstract.ref: type = name_ref Abstract, file.%Abstract.decl [concrete = constants.%Abstract] -// CHECK:STDOUT: %a: %Abstract = value_binding a, %a.param +// CHECK:STDOUT: %a: %Abstract = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %Call.decl: %Call.type = fn_decl @Call [concrete = constants.%Call] { // CHECK:STDOUT: %p.param_patt: %pattern_type = value_param_pattern [concrete = constants.%p.param_patt] @@ -537,7 +537,7 @@ fn Assign(ref a: Abstract) { // CHECK:STDOUT: } { // CHECK:STDOUT: %p.param: %Abstract = value_param call_param0 // CHECK:STDOUT: %Abstract.ref: type = name_ref Abstract, file.%Abstract.decl [concrete = constants.%Abstract] -// CHECK:STDOUT: %p: %Abstract = value_binding p, %p.param +// CHECK:STDOUT: %p: %Abstract = wrapper_binding p, %p.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -702,7 +702,7 @@ fn Assign(ref a: Abstract) { // CHECK:STDOUT: %.loc19: Core.Form = init_form %Abstract.ref.loc19_27 [concrete = constants.%.749] // CHECK:STDOUT: %a.param: %Abstract = value_param call_param0 // CHECK:STDOUT: %Abstract.ref.loc19_14: type = name_ref Abstract, file.%Abstract.decl [concrete = constants.%Abstract] -// CHECK:STDOUT: %a: %Abstract = value_binding a, %a.param +// CHECK:STDOUT: %a: %Abstract = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref %Abstract = out_param call_param1 // CHECK:STDOUT: %return: ref %Abstract = return_slot %return.param // CHECK:STDOUT: } @@ -793,7 +793,7 @@ fn Assign(ref a: Abstract) { // CHECK:STDOUT: %.loc13_34.3: Core.Form = init_form %.loc13_34.2 [concrete = constants.%.469] // CHECK:STDOUT: %d.param: %Derived = value_param call_param0 // CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl [concrete = constants.%Derived] -// CHECK:STDOUT: %d: %Derived = value_binding d, %d.param +// CHECK:STDOUT: %d: %Derived = wrapper_binding d, %d.param // CHECK:STDOUT: %return.param: ref %empty_struct_type = out_param call_param1 // CHECK:STDOUT: %return: ref %empty_struct_type = return_slot %return.param // CHECK:STDOUT: } @@ -808,7 +808,7 @@ fn Assign(ref a: Abstract) { // CHECK:STDOUT: %.loc17_27.3: Core.Form = init_form %.loc17_27.2 [concrete = constants.%.469] // CHECK:STDOUT: %d.param: %Derived = value_param call_param0 // CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl [concrete = constants.%Derived] -// CHECK:STDOUT: %d: %Derived = value_binding d, %d.param +// CHECK:STDOUT: %d: %Derived = wrapper_binding d, %d.param // CHECK:STDOUT: %return.param: ref %empty_struct_type = out_param call_param1 // CHECK:STDOUT: %return: ref %empty_struct_type = return_slot %return.param // CHECK:STDOUT: } @@ -924,7 +924,7 @@ fn Assign(ref a: Abstract) { // CHECK:STDOUT: %.loc15_29.5: ref %Abstract = temporary %.loc15_29.2, %.loc15_29.4 [concrete = constants.%.69a] // CHECK:STDOUT: %.loc15_29.6: %Abstract = acquire_value %.loc15_29.5 [concrete = constants.%Abstract.val] // CHECK:STDOUT: %Abstract.ref: type = name_ref Abstract, file.%Abstract.decl [concrete = constants.%Abstract] -// CHECK:STDOUT: %l: %Abstract = value_binding l, %.loc15_29.6 +// CHECK:STDOUT: %l: %Abstract = wrapper_binding l, %.loc15_29.6 // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1019,7 +1019,7 @@ fn Assign(ref a: Abstract) { // CHECK:STDOUT: %.loc17_41.5: ref %Abstract = converted %.loc17_41.1, %.loc17_41.4 [concrete = constants.%.27a] // CHECK:STDOUT: %.loc17_41.6: %Abstract = acquire_value %.loc17_41.5 // CHECK:STDOUT: %Abstract.ref: type = name_ref Abstract, file.%Abstract.decl [concrete = constants.%Abstract] -// CHECK:STDOUT: %l: %Abstract = value_binding l, %.loc17_41.6 +// CHECK:STDOUT: %l: %Abstract = wrapper_binding l, %.loc17_41.6 // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1121,7 +1121,7 @@ fn Assign(ref a: Abstract) { // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: ref %Abstract = ref_param call_param0 // CHECK:STDOUT: %Abstract.ref: type = name_ref Abstract, file.%Abstract.decl [concrete = constants.%Abstract] -// CHECK:STDOUT: %a: ref %Abstract = ref_binding a, %a.param +// CHECK:STDOUT: %a: ref %Abstract = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/abstract/fail_abstract_in_struct.carbon b/toolchain/check/testdata/class/abstract/fail_abstract_in_struct.carbon index 1650d09ba7f1..27a1f885f9eb 100644 --- a/toolchain/check/testdata/class/abstract/fail_abstract_in_struct.carbon +++ b/toolchain/check/testdata/class/abstract/fail_abstract_in_struct.carbon @@ -176,7 +176,7 @@ var v5: {.m: Abstract}; // CHECK:STDOUT: %Abstract2.ref: type = name_ref Abstract2, %Abstract2.decl [concrete = constants.%Abstract2] // CHECK:STDOUT: %struct_type.m2: type = struct_type {.m2: %Abstract2} [concrete = constants.%struct_type.m2.bb3] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: ref = ref_binding v, [concrete = ] +// CHECK:STDOUT: %v: = wrapper_binding v, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Abstract2 { @@ -221,7 +221,7 @@ var v5: {.m: Abstract}; // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %Abstract3 = value_param call_param0 // CHECK:STDOUT: %Abstract3.ref.loc6: type = name_ref Abstract3, file.%Abstract3.decl [concrete = constants.%Abstract3] -// CHECK:STDOUT: %a: %Abstract3 = value_binding a, %a.param +// CHECK:STDOUT: %a: %Abstract3 = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -246,7 +246,7 @@ var v5: {.m: Abstract}; // CHECK:STDOUT: %Abstract3.ref.loc7: type = name_ref Abstract3, file.%Abstract3.decl [concrete = constants.%Abstract3] // CHECK:STDOUT: %struct_type.m3: type = struct_type {.m3: %Abstract3} [concrete = constants.%struct_type.m3.937] // CHECK:STDOUT: } -// CHECK:STDOUT: %l: %struct_type.m3.937 = value_binding l, %.loc7_44.2 +// CHECK:STDOUT: %l: %struct_type.m3.937 = wrapper_binding l, %.loc7_44.2 // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: @@ -278,7 +278,7 @@ var v5: {.m: Abstract}; // CHECK:STDOUT: %Abstract5.ref: type = name_ref Abstract5, %Abstract5.decl [concrete = constants.%Abstract5] // CHECK:STDOUT: %struct_type.m4.m5: type = struct_type {.m4: %Abstract4, .m5: %Abstract5} [concrete = constants.%struct_type.m4.m5.5e1] // CHECK:STDOUT: } -// CHECK:STDOUT: %v2: ref = ref_binding v2, [concrete = ] +// CHECK:STDOUT: %v2: = wrapper_binding v2, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Abstract4 { @@ -331,7 +331,7 @@ var v5: {.m: Abstract}; // CHECK:STDOUT: %.loc12_32.2: type = converted %.loc12_32.1, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: %struct_type.m6.c1: type = struct_type {.m6: %Abstract6, .c1: %empty_tuple.type} [concrete = constants.%struct_type.m6.c1.a63] // CHECK:STDOUT: } -// CHECK:STDOUT: %v3: ref = ref_binding v3, [concrete = ] +// CHECK:STDOUT: %v3: = wrapper_binding v3, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Abstract6 { @@ -376,7 +376,7 @@ var v5: {.m: Abstract}; // CHECK:STDOUT: %Abstract7.ref: type = name_ref Abstract7, %Abstract7.decl [concrete = constants.%Abstract7] // CHECK:STDOUT: %struct_type.c2.m7: type = struct_type {.c2: %empty_tuple.type, .m7: %Abstract7} [concrete = constants.%struct_type.c2.m7.518] // CHECK:STDOUT: } -// CHECK:STDOUT: %v4: ref = ref_binding v4, [concrete = ] +// CHECK:STDOUT: %v4: = wrapper_binding v4, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Abstract7 { @@ -446,7 +446,7 @@ var v5: {.m: Abstract}; // CHECK:STDOUT: %Abstract.ref: type = name_ref Abstract, imports.%Main.Abstract [concrete = constants.%Abstract] // CHECK:STDOUT: %struct_type.m: type = struct_type {.m: %Abstract} [concrete = constants.%struct_type.m.b92] // CHECK:STDOUT: } -// CHECK:STDOUT: %v5: ref = ref_binding v5, [concrete = ] +// CHECK:STDOUT: %v5: = wrapper_binding v5, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Abstract [from "lib.carbon"] { diff --git a/toolchain/check/testdata/class/abstract/fail_abstract_in_tuple.carbon b/toolchain/check/testdata/class/abstract/fail_abstract_in_tuple.carbon index 5955a8de3314..214cb20c9108 100644 --- a/toolchain/check/testdata/class/abstract/fail_abstract_in_tuple.carbon +++ b/toolchain/check/testdata/class/abstract/fail_abstract_in_tuple.carbon @@ -226,7 +226,7 @@ fn Var5() { // CHECK:STDOUT: %.loc13_28.2: %tuple.type.85c = tuple_literal (%Abstract2.ref) [concrete = constants.%tuple] // CHECK:STDOUT: %.loc13_28.3: type = converted %.loc13_28.2, constants.%tuple.type.ea9 [concrete = constants.%tuple.type.ea9] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: ref = ref_binding v, [concrete = ] +// CHECK:STDOUT: %v: = wrapper_binding v, [concrete = ] // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: @@ -269,7 +269,7 @@ fn Var5() { // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %Abstract3 = value_param call_param0 // CHECK:STDOUT: %Abstract3.ref.loc6: type = name_ref Abstract3, file.%Abstract3.decl [concrete = constants.%Abstract3] -// CHECK:STDOUT: %a: %Abstract3 = value_binding a, %a.param +// CHECK:STDOUT: %a: %Abstract3 = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -295,7 +295,7 @@ fn Var5() { // CHECK:STDOUT: %.loc7_28.2: %tuple.type.85c = tuple_literal (%Abstract3.ref.loc7) [concrete = constants.%tuple] // CHECK:STDOUT: %.loc7_28.3: type = converted %.loc7_28.2, constants.%tuple.type.4cc [concrete = constants.%tuple.type.4cc] // CHECK:STDOUT: } -// CHECK:STDOUT: %l: %tuple.type.4cc = value_binding l, %.loc7_35.2 +// CHECK:STDOUT: %l: %tuple.type.4cc = wrapper_binding l, %.loc7_35.2 // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: @@ -366,7 +366,7 @@ fn Var5() { // CHECK:STDOUT: %.loc14_39.2: %tuple.type.24b = tuple_literal (%Abstract4.ref, %Abstract5.ref) [concrete = constants.%tuple] // CHECK:STDOUT: %.loc14_39.3: type = converted %.loc14_39.2, constants.%tuple.type.417 [concrete = constants.%tuple.type.417] // CHECK:STDOUT: } -// CHECK:STDOUT: %v2: ref = ref_binding v2, [concrete = ] +// CHECK:STDOUT: %v2: = wrapper_binding v2, [concrete = ] // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: @@ -428,7 +428,7 @@ fn Var5() { // CHECK:STDOUT: %.loc13_32.3: type = converted constants.%empty_struct, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: %.loc13_32.4: type = converted %.loc13_32.2, constants.%tuple.type.427 [concrete = constants.%tuple.type.427] // CHECK:STDOUT: } -// CHECK:STDOUT: %v3: ref = ref_binding v3, [concrete = ] +// CHECK:STDOUT: %v3: = wrapper_binding v3, [concrete = ] // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: @@ -490,7 +490,7 @@ fn Var5() { // CHECK:STDOUT: %.loc13_32.3: type = converted constants.%empty_struct, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: %.loc13_32.4: type = converted %.loc13_32.2, constants.%tuple.type.9db [concrete = constants.%tuple.type.9db] // CHECK:STDOUT: } -// CHECK:STDOUT: %v4: ref = ref_binding v4, [concrete = ] +// CHECK:STDOUT: %v4: = wrapper_binding v4, [concrete = ] // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: @@ -583,7 +583,7 @@ fn Var5() { // CHECK:STDOUT: %.loc14_28.2: %tuple.type.85c = tuple_literal (%Abstract.ref) [concrete = constants.%tuple] // CHECK:STDOUT: %.loc14_28.3: type = converted %.loc14_28.2, constants.%tuple.type.763 [concrete = constants.%tuple.type.763] // CHECK:STDOUT: } -// CHECK:STDOUT: %v5: ref = ref_binding v5, [concrete = ] +// CHECK:STDOUT: %v5: = wrapper_binding v5, [concrete = ] // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/access/access_modifers.carbon b/toolchain/check/testdata/class/access/access_modifers.carbon index a08926616e9b..2416c2527b9d 100644 --- a/toolchain/check/testdata/class/access/access_modifers.carbon +++ b/toolchain/check/testdata/class/access/access_modifers.carbon @@ -249,7 +249,7 @@ class A { // CHECK:STDOUT: %.loc6_45.1: %i32 = value_of_initializer %Core.IntLiteral.as.ImplicitAs.impl.Convert.call [concrete = constants.%int_5.eef] // CHECK:STDOUT: %.loc6_45.2: %i32 = converted %int_5, %.loc6_45.1 [concrete = constants.%int_5.eef] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %SOME_INTERNAL_CONSTANT: %i32 = value_binding SOME_INTERNAL_CONSTANT, %.loc6_45.2 +// CHECK:STDOUT: %SOME_INTERNAL_CONSTANT: %i32 = wrapper_binding SOME_INTERNAL_CONSTANT, %.loc6_45.2 // CHECK:STDOUT: %Circle.SomeInternalFunction.decl: %Circle.SomeInternalFunction.type = fn_decl @Circle.SomeInternalFunction [concrete = constants.%Circle.SomeInternalFunction] { // CHECK:STDOUT: %return.param_patt: %pattern_type.6b6 = out_param_pattern [concrete = constants.%return.param_patt.a9a] // CHECK:STDOUT: %return.patt: %pattern_type.6b6 = return_slot_pattern %return.param_patt, %i32 [concrete = constants.%return.patt.e1b] @@ -320,14 +320,14 @@ class A { // CHECK:STDOUT: %.loc18_36.2: ref %Circle = temporary %.loc18_36.1, %Circle.Make.call // CHECK:STDOUT: %.loc18_36.3: %Circle = acquire_value %.loc18_36.2 // CHECK:STDOUT: %Circle.ref.loc18_15: type = name_ref Circle, file.%Circle.decl [concrete = constants.%Circle] -// CHECK:STDOUT: %circle: %Circle = value_binding circle, %.loc18_36.3 +// CHECK:STDOUT: %circle: %Circle = wrapper_binding circle, %.loc18_36.3 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %radius.patt: %pattern_type.6b6 = value_binding_pattern radius [concrete = constants.%radius.patt.a1f] // CHECK:STDOUT: } // CHECK:STDOUT: %circle.ref.loc26: %Circle = name_ref circle, %circle // CHECK:STDOUT: %radius.ref.loc26: = name_ref radius, [concrete = ] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %radius: %i32 = value_binding radius, [concrete = ] +// CHECK:STDOUT: %radius: %i32 = wrapper_binding radius, [concrete = ] // CHECK:STDOUT: %circle.ref.loc34: %Circle = name_ref circle, %circle // CHECK:STDOUT: %radius.ref.loc34: = name_ref radius, [concrete = ] // CHECK:STDOUT: %int_5: Core.IntLiteral = int_value 5 [concrete = constants.%int_5.64b] @@ -413,7 +413,7 @@ class A { // CHECK:STDOUT: %A.ref: type = name_ref A, file.%A.decl [concrete = constants.%A] // CHECK:STDOUT: %x.ref: = name_ref x, [concrete = ] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %x: %i32 = value_binding x, [concrete = ] +// CHECK:STDOUT: %x: %i32 = wrapper_binding x, [concrete = ] // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: @@ -509,7 +509,7 @@ class A { // CHECK:STDOUT: %.loc7: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %self.param: %Circle = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Circle [concrete = constants.%Circle] -// CHECK:STDOUT: %self: %Circle = value_binding self, %self.param +// CHECK:STDOUT: %self: %Circle = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -532,7 +532,7 @@ class A { // CHECK:STDOUT: %.loc15: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %self.param: %Circle = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Circle [concrete = constants.%Circle] -// CHECK:STDOUT: %self: %Circle = value_binding self, %self.param +// CHECK:STDOUT: %self: %Circle = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -638,7 +638,7 @@ class A { // CHECK:STDOUT: %x.patt: %pattern_type.6b6 = value_binding_pattern x [concrete = constants.%x.patt.d88] // CHECK:STDOUT: } // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %x: %i32 = value_binding x, @__global_init.%x.ref +// CHECK:STDOUT: %x: %i32 = wrapper_binding x, @__global_init.%x.ref // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @A { @@ -654,7 +654,7 @@ class A { // CHECK:STDOUT: %.loc5_16.1: %i32 = value_of_initializer %Core.IntLiteral.as.ImplicitAs.impl.Convert.call [concrete = constants.%int_5.eef] // CHECK:STDOUT: %.loc5_16.2: %i32 = converted %int_5, %.loc5_16.1 [concrete = constants.%int_5.eef] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %x: %i32 = value_binding x, %.loc5_16.2 +// CHECK:STDOUT: %x: %i32 = wrapper_binding x, %.loc5_16.2 // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%empty_struct_type [concrete = constants.%complete_type.357] // CHECK:STDOUT: complete_type_witness = %complete_type // CHECK:STDOUT: @@ -730,12 +730,12 @@ class A { // CHECK:STDOUT: %x.patt: %pattern_type.6b6 = value_binding_pattern x [concrete = constants.%x.patt.d88] // CHECK:STDOUT: } // CHECK:STDOUT: %i32.loc16: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %x: %i32 = value_binding x, [concrete = ] +// CHECK:STDOUT: %x: %i32 = wrapper_binding x, [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %y.patt: %pattern_type.6b6 = value_binding_pattern y [concrete = constants.%y.patt.f4d] // CHECK:STDOUT: } // CHECK:STDOUT: %i32.loc24: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %y: %i32 = value_binding y, [concrete = ] +// CHECK:STDOUT: %y: %i32 = wrapper_binding y, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @A { @@ -751,7 +751,7 @@ class A { // CHECK:STDOUT: %.loc5_26.1: %i32 = value_of_initializer %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc5 [concrete = constants.%int_5.eef] // CHECK:STDOUT: %.loc5_26.2: %i32 = converted %int_5.loc5, %.loc5_26.1 [concrete = constants.%int_5.eef] // CHECK:STDOUT: %i32.loc5: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %x: %i32 = value_binding x, %.loc5_26.2 +// CHECK:STDOUT: %x: %i32 = wrapper_binding x, %.loc5_26.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %y.patt: %pattern_type.6b6 = value_binding_pattern y [concrete = constants.%y.patt.e0b] // CHECK:STDOUT: } @@ -764,7 +764,7 @@ class A { // CHECK:STDOUT: %.loc6_24.1: %i32 = value_of_initializer %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc6 [concrete = constants.%int_5.eef] // CHECK:STDOUT: %.loc6_24.2: %i32 = converted %int_5.loc6, %.loc6_24.1 [concrete = constants.%int_5.eef] // CHECK:STDOUT: %i32.loc6: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %y: %i32 = value_binding y, %.loc6_24.2 +// CHECK:STDOUT: %y: %i32 = wrapper_binding y, %.loc6_24.2 // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%empty_struct_type [concrete = constants.%complete_type.357] // CHECK:STDOUT: complete_type_witness = %complete_type // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/access/import_access.carbon b/toolchain/check/testdata/class/access/import_access.carbon index 5df5c789aae2..0079649ab87a 100644 --- a/toolchain/check/testdata/class/access/import_access.carbon +++ b/toolchain/check/testdata/class/access/import_access.carbon @@ -234,7 +234,7 @@ private class Redecl {} // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %Def = var %c.var_patt [concrete] // CHECK:STDOUT: %Def.ref: type = name_ref Def, imports.%Test.Def [concrete = constants.%Def] -// CHECK:STDOUT: %c: ref %Def = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %Def = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Def [from "def.carbon"] { @@ -272,7 +272,7 @@ private class Redecl {} // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref = var %c.var_patt [concrete = ] // CHECK:STDOUT: %Def.ref: = name_ref Def, [concrete = ] -// CHECK:STDOUT: %c: ref = ref_binding c, [concrete = ] +// CHECK:STDOUT: %c: = wrapper_binding c, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -311,7 +311,7 @@ private class Redecl {} // CHECK:STDOUT: %Test.ref: = name_ref Test, imports.%Test [concrete = imports.%Test] // CHECK:STDOUT: %Def.ref: = name_ref Def, [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref = ref_binding c, [concrete = ] +// CHECK:STDOUT: %c: = wrapper_binding c, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -353,7 +353,7 @@ private class Redecl {} // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %ForwardWithDef = var %c.var_patt [concrete] // CHECK:STDOUT: %ForwardWithDef.ref: type = name_ref ForwardWithDef, imports.%Test.ForwardWithDef [concrete = constants.%ForwardWithDef] -// CHECK:STDOUT: %c: ref %ForwardWithDef = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %ForwardWithDef = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @ForwardWithDef [from "forward_with_def.carbon"] { @@ -391,7 +391,7 @@ private class Redecl {} // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref = var %c.var_patt [concrete = ] // CHECK:STDOUT: %ForwardWithDef.ref: = name_ref ForwardWithDef, [concrete = ] -// CHECK:STDOUT: %c: ref = ref_binding c, [concrete = ] +// CHECK:STDOUT: %c: = wrapper_binding c, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -430,7 +430,7 @@ private class Redecl {} // CHECK:STDOUT: %Test.ref: = name_ref Test, imports.%Test [concrete = imports.%Test] // CHECK:STDOUT: %ForwardWithDef.ref: = name_ref ForwardWithDef, [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref = ref_binding c, [concrete = ] +// CHECK:STDOUT: %c: = wrapper_binding c, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -474,7 +474,7 @@ private class Redecl {} // CHECK:STDOUT: %Forward.ref: type = name_ref Forward, imports.%Test.Forward [concrete = constants.%Forward] // CHECK:STDOUT: %ptr: type = ptr_type %Forward.ref [concrete = constants.%ptr] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %ptr = value_binding c, %c.param +// CHECK:STDOUT: %c: %ptr = wrapper_binding c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: %Forward.decl: type = class_decl @Forward [concrete = constants.%Forward] {} {} // CHECK:STDOUT: } @@ -514,7 +514,7 @@ private class Redecl {} // CHECK:STDOUT: %Forward.ref: = name_ref Forward, [concrete = ] // CHECK:STDOUT: %ptr: type = ptr_type [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: = value_binding c, [concrete = ] +// CHECK:STDOUT: %c: = wrapper_binding c, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -553,7 +553,7 @@ private class Redecl {} // CHECK:STDOUT: %Forward.ref: = name_ref Forward, [concrete = ] // CHECK:STDOUT: %ptr: type = ptr_type [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: = value_binding c, [concrete = ] +// CHECK:STDOUT: %c: = wrapper_binding c, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/access/inheritance_access.carbon b/toolchain/check/testdata/class/access/inheritance_access.carbon index c1082ad0bdf6..4ed77610bce3 100644 --- a/toolchain/check/testdata/class/access/inheritance_access.carbon +++ b/toolchain/check/testdata/class/access/inheritance_access.carbon @@ -376,7 +376,7 @@ class B { // CHECK:STDOUT: %.loc12_36.3: Core.Form = init_form %.loc12_36.2 [concrete = constants.%.c11] // CHECK:STDOUT: %self.param: %Circle = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Circle [concrete = constants.%Circle] -// CHECK:STDOUT: %self: %Circle = value_binding self, %self.param +// CHECK:STDOUT: %self: %Circle = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref %tuple.type.e55 = out_param call_param1 // CHECK:STDOUT: %return: ref %tuple.type.e55 = return_slot %return.param // CHECK:STDOUT: } @@ -537,7 +537,7 @@ class B { // CHECK:STDOUT: %.loc15_18.3: Core.Form = init_form %.loc15_18.2 [concrete = constants.%.262] // CHECK:STDOUT: %self.param: %C = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%C [concrete = constants.%C] -// CHECK:STDOUT: %self: %C = value_binding self, %self.param +// CHECK:STDOUT: %self: %C = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref %empty_tuple.type = out_param call_param1 // CHECK:STDOUT: %return: ref %empty_tuple.type = return_slot %return.param // CHECK:STDOUT: } @@ -661,7 +661,7 @@ class B { // CHECK:STDOUT: %.loc5_38.1: %i32 = value_of_initializer %Core.IntLiteral.as.ImplicitAs.impl.Convert.call [concrete = constants.%int_5.eef] // CHECK:STDOUT: %.loc5_38.2: %i32 = converted %int_5, %.loc5_38.1 [concrete = constants.%int_5.eef] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %SOME_CONSTANT: %i32 = value_binding SOME_CONSTANT, %.loc5_38.2 +// CHECK:STDOUT: %SOME_CONSTANT: %i32 = wrapper_binding SOME_CONSTANT, %.loc5_38.2 // CHECK:STDOUT: %A.SomeProtectedFunction.decl: %A.SomeProtectedFunction.type = fn_decl @A.SomeProtectedFunction [concrete = constants.%A.SomeProtectedFunction] { // CHECK:STDOUT: %return.param_patt: %pattern_type.6b6 = out_param_pattern [concrete = constants.%return.param_patt.a9a] // CHECK:STDOUT: %return.patt: %pattern_type.6b6 = return_slot_pattern %return.param_patt, %i32 [concrete = constants.%return.patt.e1b] @@ -815,7 +815,7 @@ class B { // CHECK:STDOUT: %.loc11: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %self.param: %Square = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Square [concrete = constants.%Square] -// CHECK:STDOUT: %self: %Square = value_binding self, %self.param +// CHECK:STDOUT: %self: %Square = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -1127,7 +1127,7 @@ class B { // CHECK:STDOUT: %.loc11_44.1: %i32 = value_of_initializer %Core.IntLiteral.as.ImplicitAs.impl.Convert.call [concrete = constants.%int_86.81c] // CHECK:STDOUT: %.loc11_44.2: %i32 = converted %int_86, %.loc11_44.1 [concrete = constants.%int_86.81c] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %SOME_PRIVATE_CONSTANT: %i32 = value_binding SOME_PRIVATE_CONSTANT, %.loc11_44.2 +// CHECK:STDOUT: %SOME_PRIVATE_CONSTANT: %i32 = wrapper_binding SOME_PRIVATE_CONSTANT, %.loc11_44.2 // CHECK:STDOUT: %B.Fb.decl: %B.Fb.type = fn_decl @B.Fb [concrete = constants.%B.Fb] {} {} // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%struct_type.base.cb7 [concrete = constants.%complete_type.d5e] // CHECK:STDOUT: complete_type_witness = %complete_type @@ -1361,7 +1361,7 @@ class B { // CHECK:STDOUT: %.loc5_48.1: %i32 = value_of_initializer %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc5 [concrete = constants.%int_5.eef] // CHECK:STDOUT: %.loc5_48.2: %i32 = converted %int_5.loc5, %.loc5_48.1 [concrete = constants.%int_5.eef] // CHECK:STDOUT: %i32.loc5: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %SOME_PROTECTED_CONSTANT: %i32 = value_binding SOME_PROTECTED_CONSTANT, %.loc5_48.2 +// CHECK:STDOUT: %SOME_PROTECTED_CONSTANT: %i32 = wrapper_binding SOME_PROTECTED_CONSTANT, %.loc5_48.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %SOME_PRIVATE_CONSTANT.patt: %pattern_type.6b6 = value_binding_pattern SOME_PRIVATE_CONSTANT [concrete = constants.%SOME_PRIVATE_CONSTANT.patt] // CHECK:STDOUT: } @@ -1374,7 +1374,7 @@ class B { // CHECK:STDOUT: %.loc6_44.1: %i32 = value_of_initializer %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc6 [concrete = constants.%int_5.eef] // CHECK:STDOUT: %.loc6_44.2: %i32 = converted %int_5.loc6, %.loc6_44.1 [concrete = constants.%int_5.eef] // CHECK:STDOUT: %i32.loc6: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %SOME_PRIVATE_CONSTANT: %i32 = value_binding SOME_PRIVATE_CONSTANT, %.loc6_44.2 +// CHECK:STDOUT: %SOME_PRIVATE_CONSTANT: %i32 = wrapper_binding SOME_PRIVATE_CONSTANT, %.loc6_44.2 // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%empty_struct_type [concrete = constants.%complete_type.357] // CHECK:STDOUT: complete_type_witness = %complete_type // CHECK:STDOUT: @@ -1397,7 +1397,7 @@ class B { // CHECK:STDOUT: %.loc10_42.1: %i32 = value_of_initializer %Core.IntLiteral.as.ImplicitAs.impl.Convert.call [concrete = constants.%int_5.eef] // CHECK:STDOUT: %.loc10_42.2: %i32 = converted %int_5, %.loc10_42.1 [concrete = constants.%int_5.eef] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %INTERNAL_CONSTANT: %i32 = value_binding INTERNAL_CONSTANT, %.loc10_42.2 +// CHECK:STDOUT: %INTERNAL_CONSTANT: %i32 = wrapper_binding INTERNAL_CONSTANT, %.loc10_42.2 // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%empty_struct_type [concrete = constants.%complete_type.357] // CHECK:STDOUT: complete_type_witness = %complete_type // CHECK:STDOUT: @@ -1427,7 +1427,7 @@ class B { // CHECK:STDOUT: %.loc36: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %self.param: %B = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%B [concrete = constants.%B] -// CHECK:STDOUT: %self: %B = value_binding self, %self.param +// CHECK:STDOUT: %self: %B = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -1524,7 +1524,7 @@ class B { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %B = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%B [concrete = constants.%B] -// CHECK:STDOUT: %self: %B = value_binding self, %self.param +// CHECK:STDOUT: %self: %B = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%struct_type.base.cb7 [concrete = constants.%complete_type.d5e] // CHECK:STDOUT: complete_type_witness = %complete_type @@ -1607,7 +1607,7 @@ class B { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %B = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%B [concrete = constants.%B] -// CHECK:STDOUT: %self: %B = value_binding self, %self.param +// CHECK:STDOUT: %self: %B = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%struct_type.base.cb7 [concrete = constants.%complete_type.d5e] // CHECK:STDOUT: complete_type_witness = %complete_type diff --git a/toolchain/check/testdata/class/access/method_access.carbon b/toolchain/check/testdata/class/access/method_access.carbon index e5ed733940b7..4ac0f696e66b 100644 --- a/toolchain/check/testdata/class/access/method_access.carbon +++ b/toolchain/check/testdata/class/access/method_access.carbon @@ -57,7 +57,7 @@ fn G(x: X) { // CHECK:STDOUT: } { // CHECK:STDOUT: %x.param: %X = value_param call_param0 // CHECK:STDOUT: %X.ref: type = name_ref X, file.%X.decl [concrete = constants.%X] -// CHECK:STDOUT: %x: %X = value_binding x, %x.param +// CHECK:STDOUT: %x: %X = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -68,7 +68,7 @@ fn G(x: X) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %X = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%X [concrete = constants.%X] -// CHECK:STDOUT: %self: %X = value_binding self, %self.param +// CHECK:STDOUT: %self: %X = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%empty_struct_type [concrete = constants.%complete_type] // CHECK:STDOUT: complete_type_witness = %complete_type diff --git a/toolchain/check/testdata/class/adapter/adapt.carbon b/toolchain/check/testdata/class/adapter/adapt.carbon index 0b6fae4977a2..78a304e8ce81 100644 --- a/toolchain/check/testdata/class/adapter/adapt.carbon +++ b/toolchain/check/testdata/class/adapter/adapt.carbon @@ -181,7 +181,7 @@ interface I { // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %AdaptNotExtend = value_param call_param0 // CHECK:STDOUT: %AdaptNotExtend.ref: type = name_ref AdaptNotExtend, file.%AdaptNotExtend.decl [concrete = constants.%AdaptNotExtend] -// CHECK:STDOUT: %a: %AdaptNotExtend = value_binding a, %a.param +// CHECK:STDOUT: %a: %AdaptNotExtend = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/adapter/adapt_copy.carbon b/toolchain/check/testdata/class/adapter/adapt_copy.carbon index 41cecb9452e9..10c0d8c42edd 100644 --- a/toolchain/check/testdata/class/adapter/adapt_copy.carbon +++ b/toolchain/check/testdata/class/adapter/adapt_copy.carbon @@ -245,7 +245,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: %.loc8: Core.Form = init_form %AdaptCopyable.ref.loc8_27 [concrete = constants.%.748] // CHECK:STDOUT: %c.param: %AdaptCopyable = value_param call_param0 // CHECK:STDOUT: %AdaptCopyable.ref.loc8_9: type = name_ref AdaptCopyable, file.%AdaptCopyable.decl [concrete = constants.%AdaptCopyable] -// CHECK:STDOUT: %c: %AdaptCopyable = value_binding c, %c.param +// CHECK:STDOUT: %c: %AdaptCopyable = wrapper_binding c, %c.param // CHECK:STDOUT: %return.param: ref %AdaptCopyable = out_param call_param1 // CHECK:STDOUT: %return: ref %AdaptCopyable = return_slot %return.param // CHECK:STDOUT: } @@ -267,7 +267,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: %.loc27_34.2: %tuple.type.24b = tuple_literal (%AdaptCopyable.ref.loc27_16, %u32.loc27_31) [concrete = constants.%tuple.ca7] // CHECK:STDOUT: %.loc27_34.3: type = converted %.loc27_34.2, constants.%tuple.type.28f [concrete = constants.%tuple.type.28f] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %tuple.type.28f = value_binding c, %c.param +// CHECK:STDOUT: %c: %tuple.type.28f = wrapper_binding c, %c.param // CHECK:STDOUT: %return.param: ref %tuple.type.28f = out_param call_param1 // CHECK:STDOUT: %return: ref %tuple.type.28f = return_slot %return.param // CHECK:STDOUT: } @@ -293,7 +293,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: %c.ref: %AdaptCopyable = name_ref c, %c // CHECK:STDOUT: assign %d.var, // CHECK:STDOUT: %AdaptCopyable.ref.loc16: type = name_ref AdaptCopyable, file.%AdaptCopyable.decl [concrete = constants.%AdaptCopyable] -// CHECK:STDOUT: %d: ref %AdaptCopyable = ref_binding d, %d.var +// CHECK:STDOUT: %d: ref %AdaptCopyable = wrapper_binding d, %d.var // CHECK:STDOUT: %d.ref: ref %AdaptCopyable = name_ref d, %d // CHECK:STDOUT: %.loc24: %AdaptCopyable = acquire_value %d.ref // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %d.var, constants.%Destroy.Op.1a2547.3 @@ -329,7 +329,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: %.loc35_29.2: %tuple.type.24b = tuple_literal (%AdaptCopyable.ref.loc35, %u32.loc35) [concrete = constants.%tuple.ca7] // CHECK:STDOUT: %.loc35_29.3: type = converted %.loc35_29.2, constants.%tuple.type.28f [concrete = constants.%tuple.type.28f] // CHECK:STDOUT: } -// CHECK:STDOUT: %d: ref %tuple.type.28f = ref_binding d, %d.var +// CHECK:STDOUT: %d: ref %tuple.type.28f = wrapper_binding d, %d.var // CHECK:STDOUT: %d.ref: ref %tuple.type.28f = name_ref d, %d // CHECK:STDOUT: %tuple.elem0.loc43: ref %AdaptCopyable = tuple_access %d.ref, element0 // CHECK:STDOUT: %.loc43: %AdaptCopyable = acquire_value %tuple.elem0.loc43 @@ -455,7 +455,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: %.loc8: Core.Form = init_form %AdaptTuple.ref.loc8_24 [concrete = constants.%.6bf] // CHECK:STDOUT: %c.param: %AdaptTuple = value_param call_param0 // CHECK:STDOUT: %AdaptTuple.ref.loc8_9: type = name_ref AdaptTuple, file.%AdaptTuple.decl [concrete = constants.%AdaptTuple] -// CHECK:STDOUT: %c: %AdaptTuple = value_binding c, %c.param +// CHECK:STDOUT: %c: %AdaptTuple = wrapper_binding c, %c.param // CHECK:STDOUT: %return.param: ref %AdaptTuple = out_param call_param1 // CHECK:STDOUT: %return: ref %AdaptTuple = return_slot %return.param // CHECK:STDOUT: } @@ -477,7 +477,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: %.loc13_31.2: %tuple.type.24b = tuple_literal (%AdaptTuple.ref.loc13_16, %u32.loc13_28) [concrete = constants.%tuple.9ca] // CHECK:STDOUT: %.loc13_31.3: type = converted %.loc13_31.2, constants.%tuple.type.e88 [concrete = constants.%tuple.type.e88] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %tuple.type.e88 = value_binding c, %c.param +// CHECK:STDOUT: %c: %tuple.type.e88 = wrapper_binding c, %c.param // CHECK:STDOUT: %return.param: ref %tuple.type.e88 = out_param call_param1 // CHECK:STDOUT: %return: ref %tuple.type.e88 = return_slot %return.param // CHECK:STDOUT: } @@ -527,7 +527,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: %.loc9_3.7: init %AdaptTuple = converted %c.ref, %.loc9_3.6 // CHECK:STDOUT: assign %d.var, %.loc9_3.7 // CHECK:STDOUT: %AdaptTuple.ref.loc9: type = name_ref AdaptTuple, file.%AdaptTuple.decl [concrete = constants.%AdaptTuple] -// CHECK:STDOUT: %d: ref %AdaptTuple = ref_binding d, %d.var +// CHECK:STDOUT: %d: ref %AdaptTuple = wrapper_binding d, %d.var // CHECK:STDOUT: %d.ref: ref %AdaptTuple = name_ref d, %d // CHECK:STDOUT: %.loc10_11.1: ref %tuple.type.e55 = as_compatible %d.ref // CHECK:STDOUT: %tuple.elem0.loc10_11.1: ref %i32 = tuple_access %.loc10_11.1, element0 @@ -622,7 +622,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: %.loc14_26.2: %tuple.type.24b = tuple_literal (%AdaptTuple.ref.loc14, %u32.loc14) [concrete = constants.%tuple.9ca] // CHECK:STDOUT: %.loc14_26.3: type = converted %.loc14_26.2, constants.%tuple.type.e88 [concrete = constants.%tuple.type.e88] // CHECK:STDOUT: } -// CHECK:STDOUT: %d: ref %tuple.type.e88 = ref_binding d, %d.var +// CHECK:STDOUT: %d: ref %tuple.type.e88 = wrapper_binding d, %d.var // CHECK:STDOUT: %d.ref: ref %tuple.type.e88 = name_ref d, %d // CHECK:STDOUT: %tuple.elem0.loc15_10.1: ref %AdaptTuple = tuple_access %d.ref, element0 // CHECK:STDOUT: %.loc15_10.1: ref %tuple.type.e55 = as_compatible %tuple.elem0.loc15_10.1 @@ -732,7 +732,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: %.loc12: Core.Form = init_form %AdaptNoncopyable.ref.loc12_30 [concrete = constants.%.a97] // CHECK:STDOUT: %a.param: %AdaptNoncopyable = value_param call_param0 // CHECK:STDOUT: %AdaptNoncopyable.ref.loc12_9: type = name_ref AdaptNoncopyable, file.%AdaptNoncopyable.decl [concrete = constants.%AdaptNoncopyable] -// CHECK:STDOUT: %a: %AdaptNoncopyable = value_binding a, %a.param +// CHECK:STDOUT: %a: %AdaptNoncopyable = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref %AdaptNoncopyable = out_param call_param1 // CHECK:STDOUT: %return: ref %AdaptNoncopyable = return_slot %return.param // CHECK:STDOUT: } @@ -767,7 +767,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: %a.ref: %AdaptNoncopyable = name_ref a, %a // CHECK:STDOUT: assign %b.var, // CHECK:STDOUT: %AdaptNoncopyable.ref.loc20: type = name_ref AdaptNoncopyable, file.%AdaptNoncopyable.decl [concrete = constants.%AdaptNoncopyable] -// CHECK:STDOUT: %b: ref %AdaptNoncopyable = ref_binding b, %b.var +// CHECK:STDOUT: %b: ref %AdaptNoncopyable = wrapper_binding b, %b.var // CHECK:STDOUT: %b.ref: ref %AdaptNoncopyable = name_ref b, %b // CHECK:STDOUT: %.loc28: %AdaptNoncopyable = acquire_value %b.ref // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %b.var, constants.%Destroy.Op.1a2547.3 @@ -865,7 +865,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: %.loc12: Core.Form = init_form %AdaptNoncopyableIndirect.ref.loc12_38 [concrete = constants.%.284] // CHECK:STDOUT: %a.param: %AdaptNoncopyableIndirect = value_param call_param0 // CHECK:STDOUT: %AdaptNoncopyableIndirect.ref.loc12_9: type = name_ref AdaptNoncopyableIndirect, file.%AdaptNoncopyableIndirect.decl [concrete = constants.%AdaptNoncopyableIndirect] -// CHECK:STDOUT: %a: %AdaptNoncopyableIndirect = value_binding a, %a.param +// CHECK:STDOUT: %a: %AdaptNoncopyableIndirect = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref %AdaptNoncopyableIndirect = out_param call_param1 // CHECK:STDOUT: %return: ref %AdaptNoncopyableIndirect = return_slot %return.param // CHECK:STDOUT: } @@ -915,7 +915,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: %tuple.elem1.loc23: %Noncopyable = tuple_access %.loc23_3.1, element1 // CHECK:STDOUT: assign %b.var, // CHECK:STDOUT: %AdaptNoncopyableIndirect.ref.loc23: type = name_ref AdaptNoncopyableIndirect, file.%AdaptNoncopyableIndirect.decl [concrete = constants.%AdaptNoncopyableIndirect] -// CHECK:STDOUT: %b: ref %AdaptNoncopyableIndirect = ref_binding b, %b.var +// CHECK:STDOUT: %b: ref %AdaptNoncopyableIndirect = wrapper_binding b, %b.var // CHECK:STDOUT: %b.ref: ref %AdaptNoncopyableIndirect = name_ref b, %b // CHECK:STDOUT: %.loc34_11.1: ref %tuple.type.227 = as_compatible %b.ref // CHECK:STDOUT: %tuple.elem0.loc34_11.1: ref %i32 = tuple_access %.loc34_11.1, element0 @@ -1063,7 +1063,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: %.loc8: Core.Form = init_form %AdaptStruct.ref.loc8_25 [concrete = constants.%.ae3] // CHECK:STDOUT: %g.param: %AdaptStruct = value_param call_param0 // CHECK:STDOUT: %AdaptStruct.ref.loc8_9: type = name_ref AdaptStruct, file.%AdaptStruct.decl [concrete = constants.%AdaptStruct] -// CHECK:STDOUT: %g: %AdaptStruct = value_binding g, %g.param +// CHECK:STDOUT: %g: %AdaptStruct = wrapper_binding g, %g.param // CHECK:STDOUT: %return.param: ref %AdaptStruct = out_param call_param1 // CHECK:STDOUT: %return: ref %AdaptStruct = return_slot %return.param // CHECK:STDOUT: } @@ -1085,7 +1085,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: %.loc13_32.2: %tuple.type.24b = tuple_literal (%AdaptStruct.ref.loc13_16, %u32.loc13_29) [concrete = constants.%tuple.f52] // CHECK:STDOUT: %.loc13_32.3: type = converted %.loc13_32.2, constants.%tuple.type.e00 [concrete = constants.%tuple.type.e00] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %tuple.type.e00 = value_binding c, %c.param +// CHECK:STDOUT: %c: %tuple.type.e00 = wrapper_binding c, %c.param // CHECK:STDOUT: %return.param: ref %tuple.type.e00 = out_param call_param1 // CHECK:STDOUT: %return: ref %tuple.type.e00 = return_slot %return.param // CHECK:STDOUT: } @@ -1134,7 +1134,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: %.loc9_3.11: init %AdaptStruct = converted %g.ref, %.loc9_3.10 // CHECK:STDOUT: assign %h.var, %.loc9_3.11 // CHECK:STDOUT: %AdaptStruct.ref.loc9: type = name_ref AdaptStruct, file.%AdaptStruct.decl [concrete = constants.%AdaptStruct] -// CHECK:STDOUT: %h: ref %AdaptStruct = ref_binding h, %h.var +// CHECK:STDOUT: %h: ref %AdaptStruct = wrapper_binding h, %h.var // CHECK:STDOUT: %h.ref: ref %AdaptStruct = name_ref h, %h // CHECK:STDOUT: %.loc10_11.1: ref %struct_type.e.f = as_compatible %h.ref // CHECK:STDOUT: %.loc10_11.2: ref %i32 = struct_access %.loc10_11.1, element0 @@ -1229,7 +1229,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: %.loc14_27.2: %tuple.type.24b = tuple_literal (%AdaptStruct.ref.loc14, %u32.loc14) [concrete = constants.%tuple.f52] // CHECK:STDOUT: %.loc14_27.3: type = converted %.loc14_27.2, constants.%tuple.type.e00 [concrete = constants.%tuple.type.e00] // CHECK:STDOUT: } -// CHECK:STDOUT: %d: ref %tuple.type.e00 = ref_binding d, %d.var +// CHECK:STDOUT: %d: ref %tuple.type.e00 = wrapper_binding d, %d.var // CHECK:STDOUT: %d.ref: ref %tuple.type.e00 = name_ref d, %d // CHECK:STDOUT: %tuple.elem0.loc15_10.1: ref %AdaptStruct = tuple_access %d.ref, element0 // CHECK:STDOUT: %.loc15_10.1: ref %struct_type.e.f = as_compatible %tuple.elem0.loc15_10.1 diff --git a/toolchain/check/testdata/class/adapter/extend_adapt.carbon b/toolchain/check/testdata/class/adapter/extend_adapt.carbon index a390debb912a..1bc214eb85a5 100644 --- a/toolchain/check/testdata/class/adapter/extend_adapt.carbon +++ b/toolchain/check/testdata/class/adapter/extend_adapt.carbon @@ -197,7 +197,7 @@ fn F(a: IntAdapter) -> i32 { // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %SomeClassAdapter = value_param call_param0 // CHECK:STDOUT: %SomeClassAdapter.ref: type = name_ref SomeClassAdapter, file.%SomeClassAdapter.decl.loc4 [concrete = constants.%SomeClassAdapter] -// CHECK:STDOUT: %a: %SomeClassAdapter = value_binding a, %a.param +// CHECK:STDOUT: %a: %SomeClassAdapter = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %TestAdapterMethod.decl: %TestAdapterMethod.type = fn_decl @TestAdapterMethod [concrete = constants.%TestAdapterMethod] { // CHECK:STDOUT: %a.param_patt: %pattern_type.54b = value_param_pattern [concrete = constants.%a.param_patt] @@ -205,7 +205,7 @@ fn F(a: IntAdapter) -> i32 { // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %SomeClassAdapter = value_param call_param0 // CHECK:STDOUT: %SomeClassAdapter.ref: type = name_ref SomeClassAdapter, file.%SomeClassAdapter.decl.loc4 [concrete = constants.%SomeClassAdapter] -// CHECK:STDOUT: %a: %SomeClassAdapter = value_binding a, %a.param +// CHECK:STDOUT: %a: %SomeClassAdapter = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -233,7 +233,7 @@ fn F(a: IntAdapter) -> i32 { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %SomeClassAdapter = value_param call_param0 // CHECK:STDOUT: %SomeClassAdapter.ref: type = name_ref SomeClassAdapter, file.%SomeClassAdapter.decl.loc4 [concrete = constants.%SomeClassAdapter] -// CHECK:STDOUT: %self: %SomeClassAdapter = value_binding self, %self.param +// CHECK:STDOUT: %self: %SomeClassAdapter = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%struct_type.a.b [concrete = constants.%complete_type.7b9] // CHECK:STDOUT: complete_type_witness = %complete_type @@ -315,7 +315,7 @@ fn F(a: IntAdapter) -> i32 { // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %SomeClassAdapter = value_param call_param0 // CHECK:STDOUT: %SomeClassAdapter.ref: type = name_ref SomeClassAdapter, file.%SomeClassAdapter.decl [concrete = constants.%SomeClassAdapter] -// CHECK:STDOUT: %a: %SomeClassAdapter = value_binding a, %a.param +// CHECK:STDOUT: %a: %SomeClassAdapter = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -326,7 +326,7 @@ fn F(a: IntAdapter) -> i32 { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %SomeClass = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%SomeClass [concrete = constants.%SomeClass] -// CHECK:STDOUT: %self: %SomeClass = value_binding self, %self.param +// CHECK:STDOUT: %self: %SomeClass = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%empty_struct_type [concrete = constants.%complete_type] // CHECK:STDOUT: complete_type_witness = %complete_type @@ -417,7 +417,7 @@ fn F(a: IntAdapter) -> i32 { // CHECK:STDOUT: %.loc13: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %a.param: %SomeClassAdapter = value_param call_param0 // CHECK:STDOUT: %SomeClassAdapter.ref: type = name_ref SomeClassAdapter, file.%SomeClassAdapter.decl [concrete = constants.%SomeClassAdapter] -// CHECK:STDOUT: %a: %SomeClassAdapter = value_binding a, %a.param +// CHECK:STDOUT: %a: %SomeClassAdapter = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -505,7 +505,7 @@ fn F(a: IntAdapter) -> i32 { // CHECK:STDOUT: %.loc8: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %a.param: %StructAdapter = value_param call_param0 // CHECK:STDOUT: %StructAdapter.ref: type = name_ref StructAdapter, file.%StructAdapter.decl [concrete = constants.%StructAdapter] -// CHECK:STDOUT: %a: %StructAdapter = value_binding a, %a.param +// CHECK:STDOUT: %a: %StructAdapter = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -583,7 +583,7 @@ fn F(a: IntAdapter) -> i32 { // CHECK:STDOUT: %.loc8: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %a.param: %TupleAdapter = value_param call_param0 // CHECK:STDOUT: %TupleAdapter.ref: type = name_ref TupleAdapter, file.%TupleAdapter.decl [concrete = constants.%TupleAdapter] -// CHECK:STDOUT: %a: %TupleAdapter = value_binding a, %a.param +// CHECK:STDOUT: %a: %TupleAdapter = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -672,7 +672,7 @@ fn F(a: IntAdapter) -> i32 { // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [concrete = imports.%Core] // CHECK:STDOUT: %IntLiteral.ref: type = name_ref IntLiteral, imports.%Core.IntLiteral [concrete = Core.IntLiteral] // CHECK:STDOUT: } -// CHECK:STDOUT: %N: Core.IntLiteral = value_binding N, %N.param +// CHECK:STDOUT: %N: Core.IntLiteral = wrapper_binding N, %N.param // CHECK:STDOUT: %return.param: ref type = out_param call_param1 // CHECK:STDOUT: %return: ref type = return_slot %return.param // CHECK:STDOUT: } @@ -687,7 +687,7 @@ fn F(a: IntAdapter) -> i32 { // CHECK:STDOUT: %.loc10: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %a.param: %IntAdapter = value_param call_param0 // CHECK:STDOUT: %IntAdapter.ref: type = name_ref IntAdapter, file.%IntAdapter.decl [concrete = constants.%IntAdapter] -// CHECK:STDOUT: %a: %IntAdapter = value_binding a, %a.param +// CHECK:STDOUT: %a: %IntAdapter = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/adapter/init_adapt.carbon b/toolchain/check/testdata/class/adapter/init_adapt.carbon index be75016f13fe..2d1b76ee2508 100644 --- a/toolchain/check/testdata/class/adapter/init_adapt.carbon +++ b/toolchain/check/testdata/class/adapter/init_adapt.carbon @@ -208,17 +208,17 @@ var e: C = MakeAdaptC(); // CHECK:STDOUT: %.loc13_27.10: ref %C = temporary %.loc13_27.2, %.loc13_27.9 [concrete = constants.%.c76] // CHECK:STDOUT: %.loc13_27.11: %C = acquire_value %.loc13_27.10 [concrete = constants.%C.val] // CHECK:STDOUT: %C.ref.loc13: type = name_ref C, %C.decl [concrete = constants.%C] -// CHECK:STDOUT: %a: %C = value_binding a, %.loc13_27.11 +// CHECK:STDOUT: %a: %C = wrapper_binding a, %.loc13_27.11 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.720 = value_binding_pattern b [concrete = constants.%b.patt.658] // CHECK:STDOUT: } // CHECK:STDOUT: %AdaptC.ref.loc15: type = name_ref AdaptC, %AdaptC.decl [concrete = constants.%AdaptC] -// CHECK:STDOUT: %b: %AdaptC = value_binding b, @__global_init.%.loc15_19.2 +// CHECK:STDOUT: %b: %AdaptC = wrapper_binding b, @__global_init.%.loc15_19.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.98b = value_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %C.ref.loc17: type = name_ref C, %C.decl [concrete = constants.%C] -// CHECK:STDOUT: %c: %C = value_binding c, @__global_init.%.loc17_14.2 +// CHECK:STDOUT: %c: %C = wrapper_binding c, @__global_init.%.loc17_14.2 // CHECK:STDOUT: %MakeC.decl: %MakeC.type = fn_decl @MakeC [concrete = constants.%MakeC] { // CHECK:STDOUT: %return.param_patt: %pattern_type.98b = out_param_pattern [concrete = constants.%return.param_patt.89a] // CHECK:STDOUT: %return.patt: %pattern_type.98b = return_slot_pattern %return.param_patt, %C.ref [concrete = constants.%return.patt.e4a] @@ -243,14 +243,14 @@ var e: C = MakeAdaptC(); // CHECK:STDOUT: } // CHECK:STDOUT: %d.var: ref %AdaptC = var %d.var_patt [concrete] // CHECK:STDOUT: %AdaptC.ref.loc23: type = name_ref AdaptC, %AdaptC.decl [concrete = constants.%AdaptC] -// CHECK:STDOUT: %d: ref %AdaptC = ref_binding d, %d.var [concrete = %d.var] +// CHECK:STDOUT: %d: ref %AdaptC = wrapper_binding d, %d.var [concrete = %d.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %e.patt: %pattern_type.98b = ref_binding_pattern e [concrete = constants.%e.patt] // CHECK:STDOUT: %e.var_patt: %pattern_type.98b = var_pattern %e.patt [concrete = constants.%e.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %e.var: ref %C = var %e.var_patt [concrete] // CHECK:STDOUT: %C.ref.loc25: type = name_ref C, %C.decl [concrete = constants.%C] -// CHECK:STDOUT: %e: ref %C = ref_binding e, %e.var [concrete = %e.var] +// CHECK:STDOUT: %e: ref %C = wrapper_binding e, %e.var [concrete = %e.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C { @@ -422,19 +422,19 @@ var e: C = MakeAdaptC(); // CHECK:STDOUT: %.loc13_27.10: ref %C = temporary %.loc13_27.2, %.loc13_27.9 [concrete = constants.%.c76] // CHECK:STDOUT: %.loc13_27.11: %C = acquire_value %.loc13_27.10 [concrete = constants.%C.val] // CHECK:STDOUT: %C.ref.loc13: type = name_ref C, %C.decl [concrete = constants.%C] -// CHECK:STDOUT: %a: %C = value_binding a, %.loc13_27.11 +// CHECK:STDOUT: %a: %C = wrapper_binding a, %.loc13_27.11 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.720 = value_binding_pattern b [concrete = constants.%b.patt.658] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc24: %AdaptC = converted @__global_init.%a.ref, [concrete = ] // CHECK:STDOUT: %AdaptC.ref.loc24: type = name_ref AdaptC, %AdaptC.decl [concrete = constants.%AdaptC] -// CHECK:STDOUT: %b: %AdaptC = value_binding b, [concrete = ] +// CHECK:STDOUT: %b: %AdaptC = wrapper_binding b, [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.98b = value_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc33: %C = converted @__global_init.%b.ref, [concrete = ] // CHECK:STDOUT: %C.ref.loc33: type = name_ref C, %C.decl [concrete = constants.%C] -// CHECK:STDOUT: %c: %C = value_binding c, [concrete = ] +// CHECK:STDOUT: %c: %C = wrapper_binding c, [concrete = ] // CHECK:STDOUT: %MakeC.decl: %MakeC.type = fn_decl @MakeC [concrete = constants.%MakeC] { // CHECK:STDOUT: %return.param_patt: %pattern_type.98b = out_param_pattern [concrete = constants.%return.param_patt.89a] // CHECK:STDOUT: %return.patt: %pattern_type.98b = return_slot_pattern %return.param_patt, %C.ref [concrete = constants.%return.patt.e4a] @@ -459,14 +459,14 @@ var e: C = MakeAdaptC(); // CHECK:STDOUT: } // CHECK:STDOUT: %d.var: ref %AdaptC = var %d.var_patt [concrete] // CHECK:STDOUT: %AdaptC.ref.loc46: type = name_ref AdaptC, %AdaptC.decl [concrete = constants.%AdaptC] -// CHECK:STDOUT: %d: ref %AdaptC = ref_binding d, %d.var [concrete = %d.var] +// CHECK:STDOUT: %d: ref %AdaptC = wrapper_binding d, %d.var [concrete = %d.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %e.patt: %pattern_type.98b = ref_binding_pattern e [concrete = constants.%e.patt] // CHECK:STDOUT: %e.var_patt: %pattern_type.98b = var_pattern %e.patt [concrete = constants.%e.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %e.var: ref %C = var %e.var_patt [concrete] // CHECK:STDOUT: %C.ref.loc55: type = name_ref C, %C.decl [concrete = constants.%C] -// CHECK:STDOUT: %e: ref %C = ref_binding e, %e.var [concrete = %e.var] +// CHECK:STDOUT: %e: ref %C = wrapper_binding e, %e.var [concrete = %e.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C { diff --git a/toolchain/check/testdata/class/basic.carbon b/toolchain/check/testdata/class/basic.carbon index 7020f1922c8c..875d4cc13e54 100644 --- a/toolchain/check/testdata/class/basic.carbon +++ b/toolchain/check/testdata/class/basic.carbon @@ -118,7 +118,7 @@ fn Run() -> i32 { // CHECK:STDOUT: %.loc25: Core.Form = init_form %i32.loc25_23 [concrete = constants.%.795] // CHECK:STDOUT: %n.param.loc25: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc25_15: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n.loc25: %i32 = value_binding n, %n.param.loc25 +// CHECK:STDOUT: %n.loc25: %i32 = wrapper_binding n, %n.param.loc25 // CHECK:STDOUT: %return.param.loc25: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return.loc25: ref %i32 = return_slot %return.param.loc25 // CHECK:STDOUT: } @@ -144,7 +144,7 @@ fn Run() -> i32 { // CHECK:STDOUT: %.loc16: Core.Form = init_form %i32.loc16_19 [concrete = constants.%.795] // CHECK:STDOUT: %n.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc16_11: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: %i32 = value_binding n, %n.param +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, %n.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -158,7 +158,7 @@ fn Run() -> i32 { // CHECK:STDOUT: %.loc20: Core.Form = init_form %i32.loc20_19 [concrete = constants.%.795] // CHECK:STDOUT: %n.param.loc20: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc20_11: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n.loc20: %i32 = value_binding n, %n.param.loc20 +// CHECK:STDOUT: %n.loc20: %i32 = wrapper_binding n, %n.param.loc20 // CHECK:STDOUT: %return.param.loc20: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return.loc20: ref %i32 = return_slot %return.param.loc20 // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/complete_in_member_fn.carbon b/toolchain/check/testdata/class/complete_in_member_fn.carbon index a7906a565e67..63781aaceb4b 100644 --- a/toolchain/check/testdata/class/complete_in_member_fn.carbon +++ b/toolchain/check/testdata/class/complete_in_member_fn.carbon @@ -84,7 +84,7 @@ class C { // CHECK:STDOUT: %.loc16_17: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %c.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %c: %C = value_binding c, %c.param +// CHECK:STDOUT: %c: %C = wrapper_binding c, %c.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/cross_package_import.carbon b/toolchain/check/testdata/class/cross_package_import.carbon index 37c21e048c05..60cefddeda27 100644 --- a/toolchain/check/testdata/class/cross_package_import.carbon +++ b/toolchain/check/testdata/class/cross_package_import.carbon @@ -232,7 +232,7 @@ var c: Other.C = {}; // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [concrete = imports.%Other] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "other_define.carbon"] { @@ -288,7 +288,7 @@ var c: Other.C = {}; // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [concrete = imports.%Other] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref = ref_binding c, [concrete = ] +// CHECK:STDOUT: %c: = wrapper_binding c, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "other_extern.carbon"]; @@ -345,7 +345,7 @@ var c: Other.C = {}; // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [concrete = imports.%Other] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "other_define.carbon"] { @@ -409,7 +409,7 @@ var c: Other.C = {}; // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [concrete = imports.%Other] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "other_define.carbon"] { diff --git a/toolchain/check/testdata/class/destroy_calls.carbon b/toolchain/check/testdata/class/destroy_calls.carbon index 854be331367f..aef9f151ba13 100644 --- a/toolchain/check/testdata/class/destroy_calls.carbon +++ b/toolchain/check/testdata/class/destroy_calls.carbon @@ -136,7 +136,7 @@ fn G() { F({}); } // CHECK:STDOUT: %.loc10_3: init %A = converted %.loc10_22.1, %.loc10_22.2 [concrete = constants.%A.val] // CHECK:STDOUT: assign %a.var, %.loc10_3 // CHECK:STDOUT: %A.ref: type = name_ref A, file.%A.decl [concrete = constants.%A] -// CHECK:STDOUT: %a: ref %A = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %A = wrapper_binding a, %a.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.e39 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.e39 = var_pattern %b.patt [concrete = constants.%b.var_patt] @@ -147,7 +147,7 @@ fn G() { F({}); } // CHECK:STDOUT: %.loc11_3: init %B = converted %.loc11_22.1, %.loc11_22.2 [concrete = constants.%B.val] // CHECK:STDOUT: assign %b.var, %.loc11_3 // CHECK:STDOUT: %B.ref: type = name_ref B, file.%B.decl [concrete = constants.%B] -// CHECK:STDOUT: %b: ref %B = ref_binding b, %b.var +// CHECK:STDOUT: %b: ref %B = wrapper_binding b, %b.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.98b = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.98b = var_pattern %c.patt [concrete = constants.%c.var_patt] @@ -158,7 +158,7 @@ fn G() { F({}); } // CHECK:STDOUT: %.loc12_3: init %C = converted %.loc12_22.1, %.loc12_22.2 [concrete = constants.%C.val] // CHECK:STDOUT: assign %c.var, %.loc12_3 // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var // CHECK:STDOUT: %Destroy.Op.bound.loc12: = bound_method %c.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call.loc12: init %empty_tuple.type = call %Destroy.Op.bound.loc12(%c.var) // CHECK:STDOUT: %Destroy.Op.bound.loc11: = bound_method %b.var, constants.%Destroy.Op.1a2547.3 @@ -233,7 +233,7 @@ fn G() { F({}); } // CHECK:STDOUT: %.loc10_3: init %A = converted %.loc10_22.1, %.loc10_22.2 [concrete = constants.%A.val] // CHECK:STDOUT: assign %a.var, %.loc10_3 // CHECK:STDOUT: %A.ref: type = name_ref A, file.%A.decl [concrete = constants.%A] -// CHECK:STDOUT: %a: ref %A = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %A = wrapper_binding a, %a.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.e39 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.e39 = var_pattern %b.patt [concrete = constants.%b.var_patt] @@ -244,7 +244,7 @@ fn G() { F({}); } // CHECK:STDOUT: %.loc11_3: init %B = converted %.loc11_22.1, %.loc11_22.2 [concrete = constants.%B.val] // CHECK:STDOUT: assign %b.var, %.loc11_3 // CHECK:STDOUT: %B.ref: type = name_ref B, file.%B.decl [concrete = constants.%B] -// CHECK:STDOUT: %b: ref %B = ref_binding b, %b.var +// CHECK:STDOUT: %b: ref %B = wrapper_binding b, %b.var // CHECK:STDOUT: %true: bool = bool_literal true [concrete = constants.%true] // CHECK:STDOUT: if %true br !if.then else br !if.else // CHECK:STDOUT: @@ -259,7 +259,7 @@ fn G() { F({}); } // CHECK:STDOUT: %.loc13_5: init %C = converted %.loc13_24.1, %.loc13_24.2 [concrete = constants.%C.val] // CHECK:STDOUT: assign %c.var, %.loc13_5 // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var // CHECK:STDOUT: br !if.else // CHECK:STDOUT: // CHECK:STDOUT: !if.else: @@ -400,7 +400,7 @@ fn G() { F({}); } // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %D: type = class_type @D, @D(constants.%C) [concrete = constants.%D.dee] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %D.dee = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %D.dee = wrapper_binding a, %a.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %a.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%a.var) // CHECK:STDOUT: return @@ -501,7 +501,7 @@ fn G() { F({}); } // CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc6_16.2 [template = %T.loc6_16.1 (constants.%T)] // CHECK:STDOUT: %C.loc7_20.1: type = class_type @C, @C(constants.%T) [template = %C.loc7_20.2 (constants.%C.1d0)] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: ref @F.%C.loc7_20.2 (%C.1d0) = ref_binding v, %v.var +// CHECK:STDOUT: %v: ref @F.%C.loc7_20.2 (%C.1d0) = wrapper_binding v, %v.var // CHECK:STDOUT: %impl.elem0.loc7_3.1: @F.%.loc7_3.4 (%.cb3) = impl_witness_access constants.%Destroy.lookup_impl_witness, element0 [template = %impl.elem0.loc7_3.2 (constants.%impl.elem0)] // CHECK:STDOUT: %bound_method.loc7_3.1: = bound_method %v.var, %impl.elem0.loc7_3.1 // CHECK:STDOUT: %Destroy.facet.loc7_3.1: %Destroy.type = facet_value constants.%C.1d0, (constants.%Destroy.lookup_impl_witness) [template = %Destroy.facet.loc7_3.3 (constants.%Destroy.facet.19f)] diff --git a/toolchain/check/testdata/class/export_name.carbon b/toolchain/check/testdata/class/export_name.carbon index c3c338546a48..1399d1950d06 100644 --- a/toolchain/check/testdata/class/export_name.carbon +++ b/toolchain/check/testdata/class/export_name.carbon @@ -125,7 +125,7 @@ var c: C = {}; // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export.carbon"] { diff --git a/toolchain/check/testdata/class/field/comp_time_field.carbon b/toolchain/check/testdata/class/field/comp_time_field.carbon index 77250b0c1d14..f5b626df5e36 100644 --- a/toolchain/check/testdata/class/field/comp_time_field.carbon +++ b/toolchain/check/testdata/class/field/comp_time_field.carbon @@ -83,7 +83,7 @@ var x: Class = {}; // CHECK:STDOUT: %.Self.loc9: %type = symbolic_binding .Self [symbolic_self = constants.%.Self] // CHECK:STDOUT: %.loc9_11.2: type = type_literal type [concrete = type] // CHECK:STDOUT: } -// CHECK:STDOUT: %A: type = value_binding A, %Class.ref.loc9 +// CHECK:STDOUT: %A: type = wrapper_binding A, %Class.ref.loc9 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %B.patt: %pattern_type = value_binding_pattern B [concrete = constants.%B.patt] // CHECK:STDOUT: } @@ -92,7 +92,7 @@ var x: Class = {}; // CHECK:STDOUT: %.Self.loc15: %type = symbolic_binding .Self [symbolic_self = constants.%.Self] // CHECK:STDOUT: %.loc15_20.2: type = type_literal type [concrete = type] // CHECK:STDOUT: } -// CHECK:STDOUT: %B: type = value_binding B, %Class.ref.loc15 +// CHECK:STDOUT: %B: type = wrapper_binding B, %Class.ref.loc15 // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%empty_struct_type [concrete = constants.%complete_type] // CHECK:STDOUT: complete_type_witness = %complete_type // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/field/compound_field.carbon b/toolchain/check/testdata/class/field/compound_field.carbon index 659bfa1838db..a6abefc45ea5 100644 --- a/toolchain/check/testdata/class/field/compound_field.carbon +++ b/toolchain/check/testdata/class/field/compound_field.carbon @@ -142,7 +142,7 @@ fn AccessBaseIndirect(p: Derived*) -> i32* { // CHECK:STDOUT: %.loc28: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %d.param: %Derived = value_param call_param0 // CHECK:STDOUT: %Derived.ref.loc28: type = name_ref Derived, file.%Derived.decl [concrete = constants.%Derived] -// CHECK:STDOUT: %d: %Derived = value_binding d, %d.param +// CHECK:STDOUT: %d: %Derived = wrapper_binding d, %d.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -156,7 +156,7 @@ fn AccessBaseIndirect(p: Derived*) -> i32* { // CHECK:STDOUT: %.loc32: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %d.param: %Derived = value_param call_param0 // CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl [concrete = constants.%Derived] -// CHECK:STDOUT: %d: %Derived = value_binding d, %d.param +// CHECK:STDOUT: %d: %Derived = wrapper_binding d, %d.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -174,7 +174,7 @@ fn AccessBaseIndirect(p: Derived*) -> i32* { // CHECK:STDOUT: %Derived.ref.loc36: type = name_ref Derived, file.%Derived.decl [concrete = constants.%Derived] // CHECK:STDOUT: %ptr.loc36_36: type = ptr_type %Derived.ref.loc36 [concrete = constants.%ptr.64c] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.64c = value_binding p, %p.param +// CHECK:STDOUT: %p: %ptr.64c = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref %ptr.d08 = out_param call_param1 // CHECK:STDOUT: %return: ref %ptr.d08 = return_slot %return.param // CHECK:STDOUT: } @@ -192,7 +192,7 @@ fn AccessBaseIndirect(p: Derived*) -> i32* { // CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl [concrete = constants.%Derived] // CHECK:STDOUT: %ptr.loc40_33: type = ptr_type %Derived.ref [concrete = constants.%ptr.64c] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.64c = value_binding p, %p.param +// CHECK:STDOUT: %p: %ptr.64c = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref %ptr.d08 = out_param call_param1 // CHECK:STDOUT: %return: ref %ptr.d08 = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/field/field_access.carbon b/toolchain/check/testdata/class/field/field_access.carbon index f8ac7795fa3e..21938baa08f4 100644 --- a/toolchain/check/testdata/class/field/field_access.carbon +++ b/toolchain/check/testdata/class/field/field_access.carbon @@ -158,7 +158,7 @@ fn Run() { // CHECK:STDOUT: %T.as.DefaultOrUnformed.impl.Op.call: init %Class to %.loc21_3 = call %T.as.DefaultOrUnformed.impl.Op.specific_fn() // CHECK:STDOUT: assign %c.var, %T.as.DefaultOrUnformed.impl.Op.call // CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [concrete = constants.%Class] -// CHECK:STDOUT: %c: ref %Class = ref_binding c, %c.var +// CHECK:STDOUT: %c: ref %Class = wrapper_binding c, %c.var // CHECK:STDOUT: %c.ref.loc22: ref %Class = name_ref c, %c // CHECK:STDOUT: %j.ref.loc22: %Class.elem = name_ref j, @Class.%.loc16 [concrete = @Class.%.loc16] // CHECK:STDOUT: %.loc22_4: ref %i32 = class_element_access %c.ref.loc22, element0 @@ -197,7 +197,7 @@ fn Run() { // CHECK:STDOUT: %Int.as.Copy.impl.Op.call.loc24: init %i32 = call %bound_method.loc24_25.2(%.loc24_25.2) // CHECK:STDOUT: assign %cj.var, %Int.as.Copy.impl.Op.call.loc24 // CHECK:STDOUT: %i32.loc24: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %cj: ref %i32 = ref_binding cj, %cj.var +// CHECK:STDOUT: %cj: ref %i32 = wrapper_binding cj, %cj.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %ck.patt: %pattern_type.6b6 = ref_binding_pattern ck [concrete = constants.%ck.patt] // CHECK:STDOUT: %ck.var_patt: %pattern_type.6b6 = var_pattern %ck.patt [concrete = constants.%ck.var_patt] @@ -214,7 +214,7 @@ fn Run() { // CHECK:STDOUT: %Int.as.Copy.impl.Op.call.loc25: init %i32 = call %bound_method.loc25_25.2(%.loc25_25.2) // CHECK:STDOUT: assign %ck.var, %Int.as.Copy.impl.Op.call.loc25 // CHECK:STDOUT: %i32.loc25: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %ck: ref %i32 = ref_binding ck, %ck.var +// CHECK:STDOUT: %ck: ref %i32 = wrapper_binding ck, %ck.var // CHECK:STDOUT: %Destroy.Op.bound.loc25: = bound_method %ck.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call.loc25: init %empty_tuple.type = call %Destroy.Op.bound.loc25(%ck.var) // CHECK:STDOUT: %Destroy.Op.bound.loc24: = bound_method %cj.var, constants.%Destroy.Op.1a2547.2 diff --git a/toolchain/check/testdata/class/field/field_access_in_value.carbon b/toolchain/check/testdata/class/field/field_access_in_value.carbon index 47a279ccc778..3263c60066f6 100644 --- a/toolchain/check/testdata/class/field/field_access_in_value.carbon +++ b/toolchain/check/testdata/class/field/field_access_in_value.carbon @@ -160,7 +160,7 @@ fn Test() { // CHECK:STDOUT: %T.as.DefaultOrUnformed.impl.Op.call: init %Class to %.loc21_3 = call %T.as.DefaultOrUnformed.impl.Op.specific_fn() // CHECK:STDOUT: assign %cv.var, %T.as.DefaultOrUnformed.impl.Op.call // CHECK:STDOUT: %Class.ref.loc21: type = name_ref Class, file.%Class.decl [concrete = constants.%Class] -// CHECK:STDOUT: %cv: ref %Class = ref_binding cv, %cv.var +// CHECK:STDOUT: %cv: ref %Class = wrapper_binding cv, %cv.var // CHECK:STDOUT: %cv.ref.loc22: ref %Class = name_ref cv, %cv // CHECK:STDOUT: %j.ref.loc22: %Class.elem = name_ref j, @Class.%.loc16 [concrete = @Class.%.loc16] // CHECK:STDOUT: %.loc22_5: ref %i32 = class_element_access %cv.ref.loc22, element0 @@ -189,7 +189,7 @@ fn Test() { // CHECK:STDOUT: %cv.ref.loc24: ref %Class = name_ref cv, %cv // CHECK:STDOUT: %.loc24: %Class = acquire_value %cv.ref.loc24 // CHECK:STDOUT: %Class.ref.loc24: type = name_ref Class, file.%Class.decl [concrete = constants.%Class] -// CHECK:STDOUT: %c: %Class = value_binding c, %.loc24 +// CHECK:STDOUT: %c: %Class = wrapper_binding c, %.loc24 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %cj.patt: %pattern_type.6b6 = ref_binding_pattern cj [concrete = constants.%cj.patt] // CHECK:STDOUT: %cj.var_patt: %pattern_type.6b6 = var_pattern %cj.patt [concrete = constants.%cj.var_patt] @@ -206,7 +206,7 @@ fn Test() { // CHECK:STDOUT: %Int.as.Copy.impl.Op.call.loc25: init %i32 = call %bound_method.loc25_25.2(%.loc25_25.2) // CHECK:STDOUT: assign %cj.var, %Int.as.Copy.impl.Op.call.loc25 // CHECK:STDOUT: %i32.loc25: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %cj: ref %i32 = ref_binding cj, %cj.var +// CHECK:STDOUT: %cj: ref %i32 = wrapper_binding cj, %cj.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %ck.patt: %pattern_type.6b6 = ref_binding_pattern ck [concrete = constants.%ck.patt] // CHECK:STDOUT: %ck.var_patt: %pattern_type.6b6 = var_pattern %ck.patt [concrete = constants.%ck.var_patt] @@ -223,7 +223,7 @@ fn Test() { // CHECK:STDOUT: %Int.as.Copy.impl.Op.call.loc26: init %i32 = call %bound_method.loc26_25.2(%.loc26_25.2) // CHECK:STDOUT: assign %ck.var, %Int.as.Copy.impl.Op.call.loc26 // CHECK:STDOUT: %i32.loc26: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %ck: ref %i32 = ref_binding ck, %ck.var +// CHECK:STDOUT: %ck: ref %i32 = wrapper_binding ck, %ck.var // CHECK:STDOUT: %Destroy.Op.bound.loc26: = bound_method %ck.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call.loc26: init %empty_tuple.type = call %Destroy.Op.bound.loc26(%ck.var) // CHECK:STDOUT: %Destroy.Op.bound.loc25: = bound_method %cj.var, constants.%Destroy.Op.1a2547.2 diff --git a/toolchain/check/testdata/class/field/field_initializer.carbon b/toolchain/check/testdata/class/field/field_initializer.carbon index bec27310a3d8..3708c17a0a7e 100644 --- a/toolchain/check/testdata/class/field/field_initializer.carbon +++ b/toolchain/check/testdata/class/field/field_initializer.carbon @@ -129,7 +129,7 @@ var C: Class = {}; // CHECK:STDOUT: } // CHECK:STDOUT: %C.var: ref %Class = var %C.var_patt [concrete] // CHECK:STDOUT: %Class.ref: type = name_ref Class, %Class.decl [concrete = constants.%Class] -// CHECK:STDOUT: %C: ref %Class = ref_binding C, %C.var [concrete = %C.var] +// CHECK:STDOUT: %C: ref %Class = wrapper_binding C, %C.var [concrete = %C.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { diff --git a/toolchain/check/testdata/class/field/static.carbon b/toolchain/check/testdata/class/field/static.carbon index 1feba5ce694b..f1ab693646c4 100644 --- a/toolchain/check/testdata/class/field/static.carbon +++ b/toolchain/check/testdata/class/field/static.carbon @@ -114,14 +114,14 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: %static_field.var: ref %i32 = var %static_field.var_patt [concrete] // CHECK:STDOUT: %i32.loc5: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %static_field: ref %i32 = ref_binding static_field, %static_field.var [concrete = %static_field.var] +// CHECK:STDOUT: %static_field: ref %i32 = wrapper_binding static_field, %static_field.var [concrete = %static_field.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %static_field_with_init.patt: %pattern_type.6b6 = ref_binding_pattern static_field_with_init [concrete = constants.%static_field_with_init.patt] // CHECK:STDOUT: %static_field_with_init.var_patt: %pattern_type.6b6 = var_pattern %static_field_with_init.patt [concrete = constants.%static_field_with_init.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %static_field_with_init.var: ref %i32 = var %static_field_with_init.var_patt [concrete] // CHECK:STDOUT: %i32.loc6: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %static_field_with_init: ref %i32 = ref_binding static_field_with_init, %static_field_with_init.var [concrete = %static_field_with_init.var] +// CHECK:STDOUT: %static_field_with_init: ref %i32 = wrapper_binding static_field_with_init, %static_field_with_init.var [concrete = %static_field_with_init.var] // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%empty_struct_type [concrete = constants.%complete_type.357] // CHECK:STDOUT: complete_type_witness = %complete_type // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/forward_declared.carbon b/toolchain/check/testdata/class/forward_declared.carbon index 143c76de5f76..c92c0e6bcce0 100644 --- a/toolchain/check/testdata/class/forward_declared.carbon +++ b/toolchain/check/testdata/class/forward_declared.carbon @@ -75,7 +75,7 @@ fn F(p: Class*) -> Class* { return p; } // CHECK:STDOUT: %Class.ref.loc17_9: type = name_ref Class, file.%Class.decl [concrete = constants.%Class] // CHECK:STDOUT: %ptr.loc17_14: type = ptr_type %Class.ref.loc17_9 [concrete = constants.%ptr.7ee] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.7ee = value_binding p, %p.param +// CHECK:STDOUT: %p: %ptr.7ee = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref %ptr.7ee = out_param call_param1 // CHECK:STDOUT: %return: ref %ptr.7ee = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/generic/adapt.carbon b/toolchain/check/testdata/class/generic/adapt.carbon index 68ef0de97f57..80c1179d6294 100644 --- a/toolchain/check/testdata/class/generic/adapt.carbon +++ b/toolchain/check/testdata/class/generic/adapt.carbon @@ -217,7 +217,7 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: %.loc12: Core.Form = init_form %i32.loc12 [concrete = constants.%.795] // CHECK:STDOUT: %a.param: %Adapter = value_param call_param0 // CHECK:STDOUT: %Adapter.ref: type = name_ref Adapter, file.%Adapter.decl [concrete = constants.%Adapter] -// CHECK:STDOUT: %a: %Adapter = value_binding a, %a.param +// CHECK:STDOUT: %a: %Adapter = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -391,7 +391,7 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: %.loc6: Core.Form = init_form %i32.loc6 [concrete = constants.%.795] // CHECK:STDOUT: %a.param: %Adapter = value_param call_param0 // CHECK:STDOUT: %Adapter.ref: type = name_ref Adapter, imports.%Main.Adapter [concrete = constants.%Adapter] -// CHECK:STDOUT: %a: %Adapter = value_binding a, %a.param +// CHECK:STDOUT: %a: %Adapter = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -545,7 +545,7 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: %.loc12: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %a.param: %Adapter = value_param call_param0 // CHECK:STDOUT: %Adapter.ref: type = name_ref Adapter, file.%Adapter.decl [concrete = constants.%Adapter] -// CHECK:STDOUT: %a: %Adapter = value_binding a, %a.param +// CHECK:STDOUT: %a: %Adapter = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -815,7 +815,7 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: %.loc6: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %a.param: %Adapter = value_param call_param0 // CHECK:STDOUT: %Adapter.ref: type = name_ref Adapter, imports.%Main.Adapter [concrete = constants.%Adapter] -// CHECK:STDOUT: %a: %Adapter = value_binding a, %a.param +// CHECK:STDOUT: %a: %Adapter = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -966,7 +966,7 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: %i32.loc8_23: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %Adapter: type = class_type @Adapter, @Adapter(constants.%i32) [concrete = constants.%Adapter.0d1] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %Adapter.0d1 = value_binding a, %a.param +// CHECK:STDOUT: %a: %Adapter.0d1 = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -1114,7 +1114,7 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: %i32.loc6_31: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %Adapter: type = class_type @Adapter, @Adapter(constants.%i32) [concrete = constants.%Adapter.0d1] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %Adapter.0d1 = value_binding a, %a.param +// CHECK:STDOUT: %a: %Adapter.0d1 = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -1133,7 +1133,7 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: %C.ref.loc14: type = name_ref C, file.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %Adapter: type = class_type @Adapter, @Adapter(constants.%C) [concrete = constants.%Adapter.347] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %Adapter.347 = value_binding a, %a.param +// CHECK:STDOUT: %a: %Adapter.347 = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/generic/base_is_generic.carbon b/toolchain/check/testdata/class/generic/base_is_generic.carbon index 202235f3b74e..2b5eebfb828b 100644 --- a/toolchain/check/testdata/class/generic/base_is_generic.carbon +++ b/toolchain/check/testdata/class/generic/base_is_generic.carbon @@ -189,7 +189,7 @@ fn H() { // CHECK:STDOUT: %.loc16: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %d.param: %Derived = value_param call_param0 // CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl [concrete = constants.%Derived] -// CHECK:STDOUT: %d: %Derived = value_binding d, %d.param +// CHECK:STDOUT: %d: %Derived = wrapper_binding d, %d.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -388,7 +388,7 @@ fn H() { // CHECK:STDOUT: %.loc6: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %d.param: %Derived = value_param call_param0 // CHECK:STDOUT: %Derived.ref: type = name_ref Derived, imports.%Main.Derived [concrete = constants.%Derived] -// CHECK:STDOUT: %d: %Derived = value_binding d, %d.param +// CHECK:STDOUT: %d: %Derived = wrapper_binding d, %d.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -772,7 +772,7 @@ fn H() { // CHECK:STDOUT: %.loc13_32.1: %i32 = value_of_initializer %X.G.call // CHECK:STDOUT: %.loc13_32.2: %i32 = converted %X.G.call, %.loc13_32.1 // CHECK:STDOUT: %i32.loc13_17: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %i: %i32 = value_binding i, %.loc13_32.2 +// CHECK:STDOUT: %i: %i32 = wrapper_binding i, %.loc13_32.2 // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: @@ -990,7 +990,7 @@ fn H() { // CHECK:STDOUT: %.loc7_32.1: %i32 = value_of_initializer %X.G.call // CHECK:STDOUT: %.loc7_32.2: %i32 = converted %X.G.call, %.loc7_32.1 // CHECK:STDOUT: %i32.loc7_17: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %j: %i32 = value_binding j, %.loc7_32.2 +// CHECK:STDOUT: %j: %i32 = wrapper_binding j, %.loc7_32.2 // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/generic/basic.carbon b/toolchain/check/testdata/class/generic/basic.carbon index 96df2a23e2fb..05432a1abf66 100644 --- a/toolchain/check/testdata/class/generic/basic.carbon +++ b/toolchain/check/testdata/class/generic/basic.carbon @@ -154,7 +154,7 @@ class Declaration(T:! type); // CHECK:STDOUT: %.loc6_18.2: type = specific_constant constants.%Class, @Class(constants.%T.f84) [symbolic = %Class (constants.%Class)] // CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc6_18.2 [symbolic = %Class (constants.%Class)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: ref @Class.GetAddr.%Class (%Class) = ref_binding self, %self.param +// CHECK:STDOUT: %self: ref @Class.GetAddr.%Class (%Class) = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref @Class.GetAddr.%ptr.loc6_28.1 (%ptr.215) = out_param call_param1 // CHECK:STDOUT: %return: ref @Class.GetAddr.%ptr.loc6_28.1 (%ptr.215) = return_slot %return.param // CHECK:STDOUT: } @@ -173,7 +173,7 @@ class Declaration(T:! type); // CHECK:STDOUT: %.loc10_15.2: type = specific_constant constants.%Class, @Class(constants.%T.f84) [symbolic = %Class (constants.%Class)] // CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc10_15.2 [symbolic = %Class (constants.%Class)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @Class.GetValue.%Class (%Class) = value_binding self, %self.param +// CHECK:STDOUT: %self: @Class.GetValue.%Class (%Class) = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref @Class.GetValue.%T.as_type.loc10_24.1 (%T.as_type) = out_param call_param1 // CHECK:STDOUT: %return: ref @Class.GetValue.%T.as_type.loc10_24.1 (%T.as_type) = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/generic/call.carbon b/toolchain/check/testdata/class/generic/call.carbon index 71a44f514513..1230e7e64760 100644 --- a/toolchain/check/testdata/class/generic/call.carbon +++ b/toolchain/check/testdata/class/generic/call.carbon @@ -216,7 +216,7 @@ class Outer(T:! type) { // CHECK:STDOUT: %.loc6_21.3: %i32 = converted %int_5, %.loc6_21.2 [concrete = constants.%int_5.eef] // CHECK:STDOUT: %Class.loc6: type = class_type @Class, @Class(constants.%ptr.d08, constants.%int_5.eef) [concrete = constants.%Class.4f7] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %Class.4f7 = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %Class.4f7 = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.a95 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.a95 = var_pattern %b.patt [concrete = constants.%b.var_patt] @@ -236,7 +236,7 @@ class Outer(T:! type) { // CHECK:STDOUT: %.loc9_19.4: %i32 = converted %int_0, %.loc9_19.3 [concrete = constants.%int_0.3c0] // CHECK:STDOUT: %Class.loc9: type = class_type @Class, @Class(constants.%empty_tuple.type, constants.%int_0.3c0) [concrete = constants.%Class.958] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: ref %Class.958 = ref_binding b, %b.var [concrete = %b.var] +// CHECK:STDOUT: %b: ref %Class.958 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic class @Class(%T.loc4_14.2: type, %N.loc4_24.2: %i32) { @@ -366,7 +366,7 @@ class Outer(T:! type) { // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %ptr: type = ptr_type %i32 [concrete = constants.%ptr] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref = ref_binding a, [concrete = ] +// CHECK:STDOUT: %a: = wrapper_binding a, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic class @Class(%T.loc4_14.2: type, %N.loc4_24.2: %i32) { @@ -467,7 +467,7 @@ class Outer(T:! type) { // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1] // CHECK:STDOUT: %int_2: Core.IntLiteral = int_value 2 [concrete = constants.%int_2] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref = ref_binding a, [concrete = ] +// CHECK:STDOUT: %a: = wrapper_binding a, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic class @Class(%T.loc4_14.2: type, %N.loc4_24.2: %i32) { @@ -571,7 +571,7 @@ class Outer(T:! type) { // CHECK:STDOUT: %ptr: type = ptr_type %i32 [concrete = constants.%ptr] // CHECK:STDOUT: %.loc16: type = converted %int_5, [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref = ref_binding a, [concrete = ] +// CHECK:STDOUT: %a: = wrapper_binding a, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic class @Class(%T.loc4_14.2: type, %N.loc4_24.2: %i32) { diff --git a/toolchain/check/testdata/class/generic/complete_in_conversion.carbon b/toolchain/check/testdata/class/generic/complete_in_conversion.carbon index 6b2612dbe62e..7a9e2df9494f 100644 --- a/toolchain/check/testdata/class/generic/complete_in_conversion.carbon +++ b/toolchain/check/testdata/class/generic/complete_in_conversion.carbon @@ -145,7 +145,7 @@ fn F(a: A(0)*) { // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [concrete = imports.%Core] // CHECK:STDOUT: %IntLiteral.ref: type = name_ref IntLiteral, imports.%Core.IntLiteral [concrete = Core.IntLiteral] // CHECK:STDOUT: } -// CHECK:STDOUT: %N: Core.IntLiteral = value_binding N, %N.param +// CHECK:STDOUT: %N: Core.IntLiteral = wrapper_binding N, %N.param // CHECK:STDOUT: %return.param: ref type = out_param call_param1 // CHECK:STDOUT: %return: ref type = return_slot %return.param // CHECK:STDOUT: } @@ -177,7 +177,7 @@ fn F(a: A(0)*) { // CHECK:STDOUT: %A: type = class_type @A, @A(constants.%int_0.3c0) [concrete = constants.%A.32a] // CHECK:STDOUT: %ptr.loc12: type = ptr_type %A [concrete = constants.%ptr.4dd] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %ptr.4dd = value_binding a, %a.param +// CHECK:STDOUT: %a: %ptr.4dd = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -243,7 +243,7 @@ fn F(a: A(0)*) { // CHECK:STDOUT: %B.ref: type = name_ref B, file.%B.decl [concrete = constants.%B] // CHECK:STDOUT: %ptr.loc20: type = ptr_type %B.ref [concrete = constants.%ptr.432] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %ptr.432 = value_binding b, %.loc20_22.3 +// CHECK:STDOUT: %b: %ptr.432 = wrapper_binding b, %.loc20_22.3 // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/generic/field.carbon b/toolchain/check/testdata/class/generic/field.carbon index 49def9b988b4..01e5b83a9111 100644 --- a/toolchain/check/testdata/class/generic/field.carbon +++ b/toolchain/check/testdata/class/generic/field.carbon @@ -169,7 +169,7 @@ fn H(U:! Core.Copy, c: Class(U)) -> U { // CHECK:STDOUT: %i32.loc9_15: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %Class: type = class_type @Class, @Class(constants.%i32) [concrete = constants.%Class.1b7] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %Class.1b7 = value_binding c, %c.param +// CHECK:STDOUT: %c: %Class.1b7 = wrapper_binding c, %c.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -198,7 +198,7 @@ fn H(U:! Core.Copy, c: Class(U)) -> U { // CHECK:STDOUT: %.loc13_31.2: type = converted %T.ref.loc13_30, %T.as_type.loc13_31.2 [symbolic = %T.as_type.loc13_31.1 (constants.%T.as_type)] // CHECK:STDOUT: %Class.loc13_31.2: type = class_type @Class, @Class(constants.%T.as_type) [symbolic = %Class.loc13_31.1 (constants.%Class.c74ef3.1)] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: @G.%Class.loc13_31.1 (%Class.c74ef3.1) = value_binding c, %c.param +// CHECK:STDOUT: %c: @G.%Class.loc13_31.1 (%Class.c74ef3.1) = wrapper_binding c, %c.param // CHECK:STDOUT: %return.param: ref @G.%T.as_type.loc13_31.1 (%T.as_type) = out_param call_param1 // CHECK:STDOUT: %return: ref @G.%T.as_type.loc13_31.1 (%T.as_type) = return_slot %return.param // CHECK:STDOUT: } @@ -227,7 +227,7 @@ fn H(U:! Core.Copy, c: Class(U)) -> U { // CHECK:STDOUT: %.loc17_31.2: type = converted %U.ref.loc17_30, %U.as_type.loc17_31.2 [symbolic = %U.as_type.loc17_31.1 (constants.%U.as_type.c1c)] // CHECK:STDOUT: %Class.loc17_31.2: type = class_type @Class, @Class(constants.%U.as_type.c1c) [symbolic = %Class.loc17_31.1 (constants.%Class.c74ef3.2)] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: @H.%Class.loc17_31.1 (%Class.c74ef3.2) = value_binding c, %c.param +// CHECK:STDOUT: %c: @H.%Class.loc17_31.1 (%Class.c74ef3.2) = wrapper_binding c, %c.param // CHECK:STDOUT: %return.param: ref @H.%U.as_type.loc17_31.1 (%U.as_type.c1c) = out_param call_param1 // CHECK:STDOUT: %return: ref @H.%U.as_type.loc17_31.1 (%U.as_type.c1c) = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/generic/generic_vs_params.carbon b/toolchain/check/testdata/class/generic/generic_vs_params.carbon index 2b3149e5aeb6..b8fac4086102 100644 --- a/toolchain/check/testdata/class/generic/generic_vs_params.carbon +++ b/toolchain/check/testdata/class/generic/generic_vs_params.carbon @@ -174,7 +174,7 @@ class Foo[T:! type]; // CHECK:STDOUT: } // CHECK:STDOUT: %a.var: ref %NotGenericNoParams = var %a.var_patt [concrete] // CHECK:STDOUT: %NotGenericNoParams.ref: type = name_ref NotGenericNoParams, %NotGenericNoParams.decl [concrete = constants.%NotGenericNoParams] -// CHECK:STDOUT: %a: ref %NotGenericNoParams = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %NotGenericNoParams = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.8e7 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.8e7 = var_pattern %b.patt [concrete = constants.%b.var_patt] @@ -184,7 +184,7 @@ class Foo[T:! type]; // CHECK:STDOUT: %NotGenericButParams.ref: %NotGenericButParams.type = name_ref NotGenericButParams, %NotGenericButParams.decl [concrete = constants.%NotGenericButParams.generic] // CHECK:STDOUT: %NotGenericButParams: type = class_type @NotGenericButParams [concrete = constants.%NotGenericButParams] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: ref %NotGenericButParams = ref_binding b, %b.var [concrete = %b.var] +// CHECK:STDOUT: %b: ref %NotGenericButParams = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.053 = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.053 = var_pattern %c.patt [concrete = constants.%c.var_patt] @@ -195,7 +195,7 @@ class Foo[T:! type]; // CHECK:STDOUT: %X.ref.loc17: type = name_ref X, %X.decl [concrete = constants.%X] // CHECK:STDOUT: %GenericAndParams.loc17: type = class_type @GenericAndParams.loc6, @GenericAndParams.loc6(constants.%X) [concrete = constants.%GenericAndParams.421] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %GenericAndParams.421 = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %GenericAndParams.421 = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.a4a = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.a4a = var_pattern %d.patt [concrete = constants.%d.var_patt] @@ -208,7 +208,7 @@ class Foo[T:! type]; // CHECK:STDOUT: %.loc18_12.2: type = specific_constant @C.%GenericNoParams.decl, @C(constants.%X) [concrete = constants.%GenericNoParams.ee8] // CHECK:STDOUT: %GenericNoParams.ref: type = name_ref GenericNoParams, %.loc18_12.2 [concrete = constants.%GenericNoParams.ee8] // CHECK:STDOUT: } -// CHECK:STDOUT: %d: ref %GenericNoParams.ee8 = ref_binding d, %d.var [concrete = %d.var] +// CHECK:STDOUT: %d: ref %GenericNoParams.ee8 = wrapper_binding d, %d.var [concrete = %d.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %e.patt: %pattern_type.4e2 = ref_binding_pattern e [concrete = constants.%e.patt] // CHECK:STDOUT: %e.var_patt: %pattern_type.4e2 = var_pattern %e.patt [concrete = constants.%e.var_patt] @@ -223,7 +223,7 @@ class Foo[T:! type]; // CHECK:STDOUT: %X.ref.loc19_30: type = name_ref X, %X.decl [concrete = constants.%X] // CHECK:STDOUT: %GenericAndParams.loc19: type = class_type @GenericAndParams.loc10, @GenericAndParams.loc10(constants.%X, constants.%X) [concrete = constants.%GenericAndParams.353] // CHECK:STDOUT: } -// CHECK:STDOUT: %e: ref %GenericAndParams.353 = ref_binding e, %e.var [concrete = %e.var] +// CHECK:STDOUT: %e: ref %GenericAndParams.353 = wrapper_binding e, %e.var [concrete = %e.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @NotGenericNoParams { diff --git a/toolchain/check/testdata/class/generic/import.carbon b/toolchain/check/testdata/class/generic/import.carbon index a86e50ea9c00..2635c8bc2371 100644 --- a/toolchain/check/testdata/class/generic/import.carbon +++ b/toolchain/check/testdata/class/generic/import.carbon @@ -628,7 +628,7 @@ class Class(U:! type) { // CHECK:STDOUT: %i32.loc6: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %CompleteClass: type = class_type @CompleteClass, @CompleteClass(constants.%i32) [concrete = constants.%CompleteClass.d55] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: ref %CompleteClass.d55 = ref_binding v, %v.var +// CHECK:STDOUT: %v: ref %CompleteClass.d55 = wrapper_binding v, %v.var // CHECK:STDOUT: %v.ref: ref %CompleteClass.d55 = name_ref v, %v // CHECK:STDOUT: %.loc7: %CompleteClass.F.type.dac = specific_constant imports.%Main.import_ref.895, @CompleteClass(constants.%i32) [concrete = constants.%CompleteClass.F.623] // CHECK:STDOUT: %F.ref.loc7: %CompleteClass.F.type.dac = name_ref F, %.loc7 [concrete = constants.%CompleteClass.F.623] @@ -680,7 +680,7 @@ class Class(U:! type) { // CHECK:STDOUT: %i32.loc11: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %CompleteClass: type = class_type @CompleteClass, @CompleteClass(constants.%i32) [concrete = constants.%CompleteClass.d55] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: ref %CompleteClass.d55 = ref_binding v, %v.var +// CHECK:STDOUT: %v: ref %CompleteClass.d55 = wrapper_binding v, %v.var // CHECK:STDOUT: %v.ref: ref %CompleteClass.d55 = name_ref v, %v // CHECK:STDOUT: %n.ref: %CompleteClass.elem.2cc = name_ref n, imports.%Main.import_ref.111 [concrete = imports.%.5a2] // CHECK:STDOUT: %.loc12_11.1: ref %i32 = class_element_access %v.ref, element0 @@ -839,7 +839,7 @@ class Class(U:! type) { // CHECK:STDOUT: %ptr: type = ptr_type %i32 [concrete = constants.%ptr.d08] // CHECK:STDOUT: %CompleteClass: type = class_type @CompleteClass, @CompleteClass(constants.%ptr.d08) [concrete = constants.%CompleteClass.22b] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: ref %CompleteClass.22b = ref_binding v, %v.var +// CHECK:STDOUT: %v: ref %CompleteClass.22b = wrapper_binding v, %v.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %v.var, constants.%Destroy.Op.1a2547.4 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%v.var) // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/class/generic/init.carbon b/toolchain/check/testdata/class/generic/init.carbon index c8b2e99a7327..e40b03711351 100644 --- a/toolchain/check/testdata/class/generic/init.carbon +++ b/toolchain/check/testdata/class/generic/init.carbon @@ -191,7 +191,7 @@ fn InitFromAdaptedSpecific(x: i32) -> i32 { // CHECK:STDOUT: %T.as_type.loc9_59.2: type = facet_access_type %T.ref.loc9_59 [symbolic = %T.as_type.loc9_59.1 (constants.%T.as_type.74b)] // CHECK:STDOUT: %.loc9_59.2: type = converted %T.ref.loc9_59, %T.as_type.loc9_59.2 [symbolic = %T.as_type.loc9_59.1 (constants.%T.as_type.74b)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @InitFromStructGeneric.%T.as_type.loc9_59.1 (%T.as_type.74b) = value_binding x, %x.param +// CHECK:STDOUT: %x: @InitFromStructGeneric.%T.as_type.loc9_59.1 (%T.as_type.74b) = wrapper_binding x, %x.param // CHECK:STDOUT: %return.param: ref @InitFromStructGeneric.%T.as_type.loc9_59.1 (%T.as_type.74b) = out_param call_param1 // CHECK:STDOUT: %return: ref @InitFromStructGeneric.%T.as_type.loc9_59.1 (%T.as_type.74b) = return_slot %return.param // CHECK:STDOUT: } @@ -205,7 +205,7 @@ fn InitFromAdaptedSpecific(x: i32) -> i32 { // CHECK:STDOUT: %.loc14: Core.Form = init_form %i32.loc14_38 [concrete = constants.%.795] // CHECK:STDOUT: %x.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc14_30: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %x: %i32 = value_binding x, %x.param +// CHECK:STDOUT: %x: %i32 = wrapper_binding x, %x.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -277,7 +277,7 @@ fn InitFromAdaptedSpecific(x: i32) -> i32 { // CHECK:STDOUT: %.loc10_17.2: %Destroy.type = converted %T.ref.loc10, %Destroy.facet.loc10_17.1 [symbolic = %Destroy.facet.loc10_17.2 (constants.%Destroy.facet.16e)] // CHECK:STDOUT: %Class.loc10_17.1: type = class_type @Class, @Class(constants.%Destroy.facet.16e) [symbolic = %Class.loc10_17.2 (constants.%Class.55b)] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: ref @InitFromStructGeneric.%Class.loc10_17.2 (%Class.55b) = ref_binding v, %v.var +// CHECK:STDOUT: %v: ref @InitFromStructGeneric.%Class.loc10_17.2 (%Class.55b) = wrapper_binding v, %v.var // CHECK:STDOUT: %v.ref: ref @InitFromStructGeneric.%Class.loc10_17.2 (%Class.55b) = name_ref v, %v // CHECK:STDOUT: %k.ref: @InitFromStructGeneric.%Class.elem (%Class.elem.b97) = name_ref k, @Class.%.loc5 [concrete = @Class.%.loc5] // CHECK:STDOUT: %.loc11_11.1: ref @InitFromStructGeneric.%T.as_type.loc9_59.1 (%T.as_type.74b) = class_element_access %v.ref, element0 @@ -331,7 +331,7 @@ fn InitFromAdaptedSpecific(x: i32) -> i32 { // CHECK:STDOUT: %.loc15_19.2: %Destroy.type = converted %i32.loc15, %Destroy.facet [concrete = constants.%Destroy.facet.d07] // CHECK:STDOUT: %Class: type = class_type @Class, @Class(constants.%Destroy.facet.d07) [concrete = constants.%Class.a32] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: ref %Class.a32 = ref_binding v, %v.var +// CHECK:STDOUT: %v: ref %Class.a32 = wrapper_binding v, %v.var // CHECK:STDOUT: %v.ref: ref %Class.a32 = name_ref v, %v // CHECK:STDOUT: %k.ref: %Class.elem.8f3 = name_ref k, @Class.%.loc5 [concrete = @Class.%.loc5] // CHECK:STDOUT: %.loc16_11.1: ref %i32 = class_element_access %v.ref, element0 @@ -465,7 +465,7 @@ fn InitFromAdaptedSpecific(x: i32) -> i32 { // CHECK:STDOUT: %T.as_type.loc9_45.2: type = facet_access_type %T.ref.loc9_45 [symbolic = %T.as_type.loc9_45.1 (constants.%T.as_type)] // CHECK:STDOUT: %.loc9_45.2: type = converted %T.ref.loc9_45, %T.as_type.loc9_45.2 [symbolic = %T.as_type.loc9_45.1 (constants.%T.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @InitFromAdaptedGeneric.%T.as_type.loc9_45.1 (%T.as_type) = value_binding x, %x.param +// CHECK:STDOUT: %x: @InitFromAdaptedGeneric.%T.as_type.loc9_45.1 (%T.as_type) = wrapper_binding x, %x.param // CHECK:STDOUT: %return.param: ref @InitFromAdaptedGeneric.%T.as_type.loc9_45.1 (%T.as_type) = out_param call_param1 // CHECK:STDOUT: %return: ref @InitFromAdaptedGeneric.%T.as_type.loc9_45.1 (%T.as_type) = return_slot %return.param // CHECK:STDOUT: } @@ -479,7 +479,7 @@ fn InitFromAdaptedSpecific(x: i32) -> i32 { // CHECK:STDOUT: %.loc13: Core.Form = init_form %i32.loc13_39 [concrete = constants.%.795] // CHECK:STDOUT: %x.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc13_31: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %x: %i32 = value_binding x, %x.param +// CHECK:STDOUT: %x: %i32 = wrapper_binding x, %x.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/generic/member_inline.carbon b/toolchain/check/testdata/class/generic/member_inline.carbon index 4f37b5993b01..537eb69ad58d 100644 --- a/toolchain/check/testdata/class/generic/member_inline.carbon +++ b/toolchain/check/testdata/class/generic/member_inline.carbon @@ -142,7 +142,7 @@ class C(T:! Core.Copy) { // CHECK:STDOUT: %T.as_type.loc6_11.2: type = facet_access_type %T.ref.loc6_11 [symbolic = %T.as_type.loc6_11.1 (constants.%T.as_type)] // CHECK:STDOUT: %.loc6_11.2: type = converted %T.ref.loc6_11, %T.as_type.loc6_11.2 [symbolic = %T.as_type.loc6_11.1 (constants.%T.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %n: @Class.F.%T.as_type.loc6_11.1 (%T.as_type) = value_binding n, %n.param +// CHECK:STDOUT: %n: @Class.F.%T.as_type.loc6_11.1 (%T.as_type) = wrapper_binding n, %n.param // CHECK:STDOUT: %return.param: ref @Class.F.%T.as_type.loc6_11.1 (%T.as_type) = out_param call_param1 // CHECK:STDOUT: %return: ref @Class.F.%T.as_type.loc6_11.1 (%T.as_type) = return_slot %return.param // CHECK:STDOUT: } @@ -161,7 +161,7 @@ class C(T:! Core.Copy) { // CHECK:STDOUT: %.loc10_8.2: type = specific_constant constants.%Class, @Class(constants.%T.f84) [symbolic = %Class (constants.%Class)] // CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc10_8.2 [symbolic = %Class (constants.%Class)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @Class.G.%Class (%Class) = value_binding self, %self.param +// CHECK:STDOUT: %self: @Class.G.%Class (%Class) = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref @Class.G.%T.as_type.loc10_17.1 (%T.as_type) = out_param call_param1 // CHECK:STDOUT: %return: ref @Class.G.%T.as_type.loc10_17.1 (%T.as_type) = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/generic/member_out_of_line.carbon b/toolchain/check/testdata/class/generic/member_out_of_line.carbon index fcc1fe57191a..e2be35915fb6 100644 --- a/toolchain/check/testdata/class/generic/member_out_of_line.carbon +++ b/toolchain/check/testdata/class/generic/member_out_of_line.carbon @@ -194,7 +194,7 @@ fn Generic(unused T:! ()).WrongType() {} // CHECK:STDOUT: %T.as_type.loc11_30: type = facet_access_type %T.ref.loc11_30 [symbolic = %T.as_type.loc6_11.1 (constants.%T.as_type)] // CHECK:STDOUT: %.loc11_30.2: type = converted %T.ref.loc11_30, %T.as_type.loc11_30 [symbolic = %T.as_type.loc6_11.1 (constants.%T.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %n.loc11: @Class.F.%T.as_type.loc6_11.1 (%T.as_type) = value_binding n, %n.param.loc11 +// CHECK:STDOUT: %n.loc11: @Class.F.%T.as_type.loc6_11.1 (%T.as_type) = wrapper_binding n, %n.param.loc11 // CHECK:STDOUT: %return.param.loc11: ref @Class.F.%T.as_type.loc6_11.1 (%T.as_type) = out_param call_param1 // CHECK:STDOUT: %return.loc11: ref @Class.F.%T.as_type.loc6_11.1 (%T.as_type) = return_slot %return.param.loc11 // CHECK:STDOUT: } @@ -219,7 +219,7 @@ fn Generic(unused T:! ()).WrongType() {} // CHECK:STDOUT: %.loc15_27.2: type = specific_constant constants.%Class, @Class(constants.%T.f84) [symbolic = %Class (constants.%Class)] // CHECK:STDOUT: %Self.ref.loc15: type = name_ref Self, %.loc15_27.2 [symbolic = %Class (constants.%Class)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self.loc15: @Class.G.%Class (%Class) = value_binding self, %self.param.loc15 +// CHECK:STDOUT: %self.loc15: @Class.G.%Class (%Class) = wrapper_binding self, %self.param.loc15 // CHECK:STDOUT: %return.param.loc15: ref @Class.G.%T.as_type.loc7_17.1 (%T.as_type) = out_param call_param1 // CHECK:STDOUT: %return.loc15: ref @Class.G.%T.as_type.loc7_17.1 (%T.as_type) = return_slot %return.param.loc15 // CHECK:STDOUT: } @@ -260,7 +260,7 @@ fn Generic(unused T:! ()).WrongType() {} // CHECK:STDOUT: %T.as_type.loc6_11.2: type = facet_access_type %T.ref.loc6_11 [symbolic = %T.as_type.loc6_11.1 (constants.%T.as_type)] // CHECK:STDOUT: %.loc6_11.2: type = converted %T.ref.loc6_11, %T.as_type.loc6_11.2 [symbolic = %T.as_type.loc6_11.1 (constants.%T.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %n.loc6: @Class.F.%T.as_type.loc6_11.1 (%T.as_type) = value_binding n, %n.param.loc6 +// CHECK:STDOUT: %n.loc6: @Class.F.%T.as_type.loc6_11.1 (%T.as_type) = wrapper_binding n, %n.param.loc6 // CHECK:STDOUT: %return.param.loc6: ref @Class.F.%T.as_type.loc6_11.1 (%T.as_type) = out_param call_param1 // CHECK:STDOUT: %return.loc6: ref @Class.F.%T.as_type.loc6_11.1 (%T.as_type) = return_slot %return.param.loc6 // CHECK:STDOUT: } @@ -279,7 +279,7 @@ fn Generic(unused T:! ()).WrongType() {} // CHECK:STDOUT: %.loc7_8.2: type = specific_constant constants.%Class, @Class(constants.%T.f84) [symbolic = %Class (constants.%Class)] // CHECK:STDOUT: %Self.ref.loc7: type = name_ref Self, %.loc7_8.2 [symbolic = %Class (constants.%Class)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self.loc7: @Class.G.%Class (%Class) = value_binding self, %self.param.loc7 +// CHECK:STDOUT: %self.loc7: @Class.G.%Class (%Class) = wrapper_binding self, %self.param.loc7 // CHECK:STDOUT: %return.param.loc7: ref @Class.G.%T.as_type.loc7_17.1 (%T.as_type) = out_param call_param1 // CHECK:STDOUT: %return.loc7: ref @Class.G.%T.as_type.loc7_17.1 (%T.as_type) = return_slot %return.param.loc7 // CHECK:STDOUT: } @@ -473,10 +473,10 @@ fn Generic(unused T:! ()).WrongType() {} // CHECK:STDOUT: %.loc11_34.2: type = specific_constant constants.%B, @B(constants.%T, constants.%_) [symbolic = %B (constants.%B)] // CHECK:STDOUT: %Self.ref.loc11: type = name_ref Self, %.loc11_34.2 [symbolic = %B (constants.%B)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self.loc11: @B.F.%B (%B) = value_binding self, %self.param.loc11 +// CHECK:STDOUT: %self.loc11: @B.F.%B (%B) = wrapper_binding self, %self.param.loc11 // CHECK:STDOUT: %a.param.loc11: @B.F.%T.loc7 (%T) = value_param call_param1 // CHECK:STDOUT: %T.ref.loc11_50: type = name_ref T, %T.loc11 [symbolic = %T.loc7 (constants.%T)] -// CHECK:STDOUT: %a.loc11: @B.F.%T.loc7 (%T) = value_binding a, %a.param.loc11 +// CHECK:STDOUT: %a.loc11: @B.F.%T.loc7 (%T) = wrapper_binding a, %a.param.loc11 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -530,10 +530,10 @@ fn Generic(unused T:! ()).WrongType() {} // CHECK:STDOUT: %.loc7_10.2: type = specific_constant constants.%B, @B(constants.%T, constants.%_) [symbolic = %B (constants.%B)] // CHECK:STDOUT: %Self.ref.loc7: type = name_ref Self, %.loc7_10.2 [symbolic = %B (constants.%B)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self.loc7: @B.F.%B (%B) = value_binding self, %self.param.loc7 +// CHECK:STDOUT: %self.loc7: @B.F.%B (%B) = wrapper_binding self, %self.param.loc7 // CHECK:STDOUT: %a.param.loc7: @B.F.%T.loc7 (%T) = value_param call_param1 // CHECK:STDOUT: %T.ref.loc7: type = name_ref T, @A.%T.loc5_10.2 [symbolic = %T.loc7 (constants.%T)] -// CHECK:STDOUT: %a.loc7: @B.F.%T.loc7 (%T) = value_binding a, %a.param.loc7 +// CHECK:STDOUT: %a.loc7: @B.F.%T.loc7 (%T) = wrapper_binding a, %a.param.loc7 // CHECK:STDOUT: } // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%empty_struct_type [concrete = constants.%complete_type] // CHECK:STDOUT: complete_type_witness = %complete_type diff --git a/toolchain/check/testdata/class/generic/member_type.carbon b/toolchain/check/testdata/class/generic/member_type.carbon index c069d362de85..4b492b0136fe 100644 --- a/toolchain/check/testdata/class/generic/member_type.carbon +++ b/toolchain/check/testdata/class/generic/member_type.carbon @@ -232,7 +232,7 @@ fn Test() -> i32 { // CHECK:STDOUT: %T.as_type.loc9_11.2: type = facet_access_type %T.ref [symbolic = %T.as_type.loc9_11.1 (constants.%T.as_type)] // CHECK:STDOUT: %.loc9_11.2: type = converted %T.ref, %T.as_type.loc9_11.2 [symbolic = %T.as_type.loc9_11.1 (constants.%T.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %n: @Outer.F.%T.as_type.loc9_11.1 (%T.as_type) = value_binding n, %n.param +// CHECK:STDOUT: %n: @Outer.F.%T.as_type.loc9_11.1 (%T.as_type) = wrapper_binding n, %n.param // CHECK:STDOUT: %return.param: ref @Outer.F.%Inner (%Inner.06b) = out_param call_param1 // CHECK:STDOUT: %return: ref @Outer.F.%Inner (%Inner.06b) = return_slot %return.param // CHECK:STDOUT: } @@ -351,7 +351,7 @@ fn Test() -> i32 { // CHECK:STDOUT: %.loc13_20.2: type = specific_constant @Outer.%Inner.decl, @Outer(constants.%Copy.facet.987) [concrete = constants.%Inner.096] // CHECK:STDOUT: %Inner.ref: type = name_ref Inner, %.loc13_20.2 [concrete = constants.%Inner.096] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %Inner.096 = ref_binding c, %c.var +// CHECK:STDOUT: %c: ref %Inner.096 = wrapper_binding c, %c.var // CHECK:STDOUT: %c.ref: ref %Inner.096 = name_ref c, %c // CHECK:STDOUT: %n.ref: %Inner.elem.362 = name_ref n, @Inner.%.loc6 [concrete = @Inner.%.loc6] // CHECK:STDOUT: %.loc14_11.1: ref %i32 = class_element_access %c.ref, element0 @@ -632,7 +632,7 @@ fn Test() -> i32 { // CHECK:STDOUT: %Self.as_type.loc6_10.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc6_10.1 (constants.%Self.as_type.abe)] // CHECK:STDOUT: %.loc6_10.3: type = converted %Self.ref, %Self.as_type.loc6_10.2 [symbolic = %Self.as_type.loc6_10.1 (constants.%Self.as_type.abe)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @Inner.WithSelf.F.%Self.as_type.loc6_10.1 (%Self.as_type.abe) = value_binding self, %self.param +// CHECK:STDOUT: %self: @Inner.WithSelf.F.%Self.as_type.loc6_10.1 (%Self.as_type.abe) = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref @Inner.WithSelf.F.%T (%T) = out_param call_param1 // CHECK:STDOUT: %return: ref @Inner.WithSelf.F.%T (%T) = return_slot %return.param // CHECK:STDOUT: } @@ -677,7 +677,7 @@ fn Test() -> i32 { // CHECK:STDOUT: %.loc11_18.2: type = specific_constant @Outer.%C.decl, @Outer(constants.%T) [symbolic = %C (constants.%C.7d7)] // CHECK:STDOUT: %C.ref: type = name_ref C, %.loc11_18.2 [symbolic = %C (constants.%C.7d7)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @C.as.Inner.impl.F.%C (%C.7d7) = value_binding self, %self.param +// CHECK:STDOUT: %self: @C.as.Inner.impl.F.%C (%C.7d7) = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref @C.as.Inner.impl.F.%T (%T) = out_param call_param1 // CHECK:STDOUT: %return: ref @C.as.Inner.impl.F.%T (%T) = return_slot %return.param // CHECK:STDOUT: } @@ -705,7 +705,7 @@ fn Test() -> i32 { // CHECK:STDOUT: %.loc18: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %self.param: %D = value_param call_param0 // CHECK:STDOUT: %D.ref: type = name_ref D, file.%D.decl [concrete = constants.%D] -// CHECK:STDOUT: %self: %D = value_binding self, %self.param +// CHECK:STDOUT: %self: %D = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -858,7 +858,7 @@ fn Test() -> i32 { // CHECK:STDOUT: %.loc23_20.2: type = specific_constant @Outer.%C.decl, @Outer(constants.%i32) [concrete = constants.%C.b7f] // CHECK:STDOUT: %C.ref: type = name_ref C, %.loc23_20.2 [concrete = constants.%C.b7f] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %C.b7f = ref_binding c, %c.var +// CHECK:STDOUT: %c: ref %C.b7f = wrapper_binding c, %c.var // CHECK:STDOUT: %c.ref: ref %C.b7f = name_ref c, %c // CHECK:STDOUT: %Outer.ref.loc24: %Outer.type = name_ref Outer, file.%Outer.decl [concrete = constants.%Outer.generic] // CHECK:STDOUT: %i32.loc24: type = type_literal constants.%i32 [concrete = constants.%i32] diff --git a/toolchain/check/testdata/class/generic/method_deduce.carbon b/toolchain/check/testdata/class/generic/method_deduce.carbon index 7bdb2696c978..beda71e6c07c 100644 --- a/toolchain/check/testdata/class/generic/method_deduce.carbon +++ b/toolchain/check/testdata/class/generic/method_deduce.carbon @@ -179,7 +179,7 @@ fn CallMethodSelfDeduce(c: Class(A)) -> A { // CHECK:STDOUT: %A.ref.loc24_31: type = name_ref A, file.%A.decl [concrete = constants.%A] // CHECK:STDOUT: %Class: type = class_type @Class, @Class(constants.%A) [concrete = constants.%Class.30a] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %Class.30a = value_binding c, %c.param +// CHECK:STDOUT: %c: %Class.30a = wrapper_binding c, %c.param // CHECK:STDOUT: %return.param: ref %tuple.type.1e7 = out_param call_param1 // CHECK:STDOUT: %return: ref %tuple.type.1e7 = return_slot %return.param // CHECK:STDOUT: } @@ -200,7 +200,7 @@ fn CallMethodSelfDeduce(c: Class(A)) -> A { // CHECK:STDOUT: %A.ref.loc28_50: type = name_ref A, file.%A.decl [concrete = constants.%A] // CHECK:STDOUT: %Class: type = class_type @Class, @Class(constants.%A) [concrete = constants.%Class.30a] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %Class.30a = value_binding c, %c.param +// CHECK:STDOUT: %c: %Class.30a = wrapper_binding c, %c.param // CHECK:STDOUT: %return.param: ref %tuple.type.1e7 = out_param call_param1 // CHECK:STDOUT: %return: ref %tuple.type.1e7 = return_slot %return.param // CHECK:STDOUT: } @@ -218,7 +218,7 @@ fn CallMethodSelfDeduce(c: Class(A)) -> A { // CHECK:STDOUT: %A.ref.loc32_34: type = name_ref A, file.%A.decl [concrete = constants.%A] // CHECK:STDOUT: %Class: type = class_type @Class, @Class(constants.%A) [concrete = constants.%Class.30a] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %Class.30a = value_binding c, %c.param +// CHECK:STDOUT: %c: %Class.30a = wrapper_binding c, %c.param // CHECK:STDOUT: %return.param: ref %A = out_param call_param1 // CHECK:STDOUT: %return: ref %A = return_slot %return.param // CHECK:STDOUT: } @@ -285,7 +285,7 @@ fn CallMethodSelfDeduce(c: Class(A)) -> A { // CHECK:STDOUT: %.loc20_42.5: Core.Form = init_form %.loc20_42.4 [symbolic = %.loc20_42.2 (constants.%.f18)] // CHECK:STDOUT: %x.param: @Class.GetNoDeduce.%T (%T) = value_param call_param0 // CHECK:STDOUT: %T.ref.loc20_21: type = name_ref T, @Class.%T.loc18_14.2 [symbolic = %T (constants.%T)] -// CHECK:STDOUT: %x: @Class.GetNoDeduce.%T (%T) = value_binding x, %x.param +// CHECK:STDOUT: %x: @Class.GetNoDeduce.%T (%T) = wrapper_binding x, %x.param // CHECK:STDOUT: %.loc20_28.1: type = splice_block %.loc20_28.2 [concrete = type] { // CHECK:STDOUT: %.Self: %type = symbolic_binding .Self [symbolic_self = constants.%.Self] // CHECK:STDOUT: %.loc20_28.2: type = type_literal type [concrete = type] @@ -314,7 +314,7 @@ fn CallMethodSelfDeduce(c: Class(A)) -> A { // CHECK:STDOUT: %U.ref.loc21_30: type = name_ref U, %U.loc21_9.2 [symbolic = %U.loc21_9.1 (constants.%U)] // CHECK:STDOUT: %Class.loc21_31.2: type = class_type @Class, @Class(constants.%U) [symbolic = %Class.loc21_31.1 (constants.%Class.d74)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @Class.F.%Class.loc21_31.1 (%Class.d74) = value_binding self, %self.param +// CHECK:STDOUT: %self: @Class.F.%Class.loc21_31.1 (%Class.d74) = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref @Class.F.%U.loc21_9.1 (%U) = out_param call_param1 // CHECK:STDOUT: %return: ref @Class.F.%U.loc21_9.1 (%U) = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/generic/self.carbon b/toolchain/check/testdata/class/generic/self.carbon index 03ce919fd695..e2e958f62a99 100644 --- a/toolchain/check/testdata/class/generic/self.carbon +++ b/toolchain/check/testdata/class/generic/self.carbon @@ -223,7 +223,7 @@ class Class(T:! type) { // CHECK:STDOUT: %T.ref: type = name_ref T, @Class.%T.loc15_14.2 [symbolic = %T (constants.%T)] // CHECK:STDOUT: %Class.loc21_26.1: type = class_type @Class, @Class(constants.%T) [symbolic = %Class.loc21_26.2 (constants.%Class)] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref @Class.F.%Class.loc21_26.2 (%Class) = ref_binding c, %c.var +// CHECK:STDOUT: %c: ref @Class.F.%Class.loc21_26.2 (%Class) = wrapper_binding c, %c.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %s.patt.loc22_17.1: @Class.F.%pattern_type (%pattern_type.36e) = ref_binding_pattern s [symbolic = %s.patt.loc22_17.2 (constants.%s.patt)] // CHECK:STDOUT: %s.var_patt.loc22_5.1: @Class.F.%pattern_type (%pattern_type.36e) = var_pattern %s.patt.loc22_17.1 [symbolic = %s.var_patt.loc22_5.2 (constants.%s.var_patt)] @@ -239,7 +239,7 @@ class Class(T:! type) { // CHECK:STDOUT: %.loc22_19.2: type = specific_constant constants.%Class, @Class(constants.%T) [symbolic = %Class.loc21_26.2 (constants.%Class)] // CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc22_19.2 [symbolic = %Class.loc21_26.2 (constants.%Class)] // CHECK:STDOUT: } -// CHECK:STDOUT: %s: ref @Class.F.%Class.loc21_26.2 (%Class) = ref_binding s, %s.var +// CHECK:STDOUT: %s: ref @Class.F.%Class.loc21_26.2 (%Class) = wrapper_binding s, %s.var // CHECK:STDOUT: %impl.elem0.loc22_5.1: @Class.F.%.loc22_5.4 (%.73f) = impl_witness_access constants.%Destroy.lookup_impl_witness, element0 [symbolic = %impl.elem0.loc22_5.2 (constants.%impl.elem0)] // CHECK:STDOUT: %bound_method.loc22_5.1: = bound_method %s.var, %impl.elem0.loc22_5.1 // CHECK:STDOUT: %Destroy.facet.loc22_5.1: %Destroy.type = facet_value constants.%Class, (constants.%Destroy.lookup_impl_witness) [symbolic = %Destroy.facet.loc22_5.3 (constants.%Destroy.facet.86d)] diff --git a/toolchain/check/testdata/class/generic/stringify.carbon b/toolchain/check/testdata/class/generic/stringify.carbon index 0f995796c6b1..332d6bf4c2a8 100644 --- a/toolchain/check/testdata/class/generic/stringify.carbon +++ b/toolchain/check/testdata/class/generic/stringify.carbon @@ -143,7 +143,7 @@ var g: E({.a = 1, .b = 2}) = {} as E({.a = 3, .b = 4} as D); // CHECK:STDOUT: } // CHECK:STDOUT: %v.var: ref %NoParams = var %v.var_patt [concrete] // CHECK:STDOUT: %NoParams.ref: type = name_ref NoParams, %NoParams.decl [concrete = constants.%NoParams] -// CHECK:STDOUT: %v: ref %NoParams = ref_binding v, %v.var [concrete = %v.var] +// CHECK:STDOUT: %v: ref %NoParams = wrapper_binding v, %v.var [concrete = %v.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %w.patt: %pattern_type.c83 = ref_binding_pattern w [concrete = constants.%w.patt] // CHECK:STDOUT: %w.var_patt: %pattern_type.c83 = var_pattern %w.patt [concrete = constants.%w.var_patt] @@ -153,7 +153,7 @@ var g: E({.a = 1, .b = 2}) = {} as E({.a = 3, .b = 4} as D); // CHECK:STDOUT: %EmptyParams.ref: %EmptyParams.type = name_ref EmptyParams, %EmptyParams.decl [concrete = constants.%EmptyParams.generic] // CHECK:STDOUT: %EmptyParams: type = class_type @EmptyParams [concrete = constants.%EmptyParams] // CHECK:STDOUT: } -// CHECK:STDOUT: %w: ref %EmptyParams = ref_binding w, %w.var [concrete = %w.var] +// CHECK:STDOUT: %w: ref %EmptyParams = wrapper_binding w, %w.var [concrete = %w.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @NoParams { @@ -280,7 +280,7 @@ var g: E({.a = 1, .b = 2}) = {} as E({.a = 3, .b = 4} as D); // CHECK:STDOUT: %ptr.loc9: type = ptr_type %.loc9_16 [concrete = constants.%ptr.c28] // CHECK:STDOUT: %Outer.loc9: type = class_type @Outer, @Outer(constants.%ptr.c28) [concrete = constants.%Outer.2d6] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: ref %Outer.2d6 = ref_binding v, %v.var [concrete = %v.var] +// CHECK:STDOUT: %v: ref %Outer.2d6 = wrapper_binding v, %v.var [concrete = %v.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %w.patt: %pattern_type.85f = ref_binding_pattern w [concrete = constants.%w.patt] // CHECK:STDOUT: %w.var_patt: %pattern_type.85f = var_pattern %w.patt [concrete = constants.%w.var_patt] @@ -299,7 +299,7 @@ var g: E({.a = 1, .b = 2}) = {} as E({.a = 3, .b = 4} as D); // CHECK:STDOUT: %ptr.loc19_34: type = ptr_type %struct_type.a [concrete = constants.%ptr.e4c] // CHECK:STDOUT: %Inner: type = class_type @Inner, @Inner(constants.%ptr.c28, constants.%ptr.e4c) [concrete = constants.%Inner.61f] // CHECK:STDOUT: } -// CHECK:STDOUT: %w: ref %Inner.61f = ref_binding w, %w.var [concrete = %w.var] +// CHECK:STDOUT: %w: ref %Inner.61f = wrapper_binding w, %w.var [concrete = %w.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic class @Outer(%T.loc4_14.2: type) { @@ -474,7 +474,7 @@ var g: E({.a = 1, .b = 2}) = {} as E({.a = 3, .b = 4} as D); // CHECK:STDOUT: %.loc13_13.3: %i32 = converted %int_123, %.loc13_13.2 [concrete = constants.%int_123.2bf] // CHECK:STDOUT: %C: type = class_type @C, @C(constants.%int_123.2bf) [concrete = constants.%C.ece] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: ref %C.ece = ref_binding v, %v.var [concrete = %v.var] +// CHECK:STDOUT: %v: ref %C.ece = wrapper_binding v, %v.var [concrete = %v.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic class @C(%N.loc4_10.2: %i32) { @@ -642,7 +642,7 @@ var g: E({.a = 1, .b = 2}) = {} as E({.a = 3, .b = 4} as D); // CHECK:STDOUT: %.loc18_26.4: %D = acquire_value %.loc18_26.3 [concrete = constants.%D.val.b1d] // CHECK:STDOUT: %E: type = class_type @E, @E(constants.%D.val.b1d) [concrete = constants.%E.7b7] // CHECK:STDOUT: } -// CHECK:STDOUT: %g: ref %E.7b7 = ref_binding g, %g.var [concrete = %g.var] +// CHECK:STDOUT: %g: ref %E.7b7 = wrapper_binding g, %g.var [concrete = %g.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @D { diff --git a/toolchain/check/testdata/class/import.carbon b/toolchain/check/testdata/class/import.carbon index 1ac61c3bd91d..3d1db80ddd33 100644 --- a/toolchain/check/testdata/class/import.carbon +++ b/toolchain/check/testdata/class/import.carbon @@ -131,7 +131,7 @@ fn Run() { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %ForwardDeclared = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%ForwardDeclared [concrete = constants.%ForwardDeclared] -// CHECK:STDOUT: %self: %ForwardDeclared = value_binding self, %self.param +// CHECK:STDOUT: %self: %ForwardDeclared = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %ForwardDeclared.G.decl: %ForwardDeclared.G.type = fn_decl @ForwardDeclared.G [concrete = constants.%ForwardDeclared.G] { // CHECK:STDOUT: %self.param_patt: %pattern_type.bdf = ref_param_pattern [concrete = constants.%self.param_patt.a42] @@ -139,7 +139,7 @@ fn Run() { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: ref %ForwardDeclared = ref_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%ForwardDeclared [concrete = constants.%ForwardDeclared] -// CHECK:STDOUT: %self: ref %ForwardDeclared = ref_binding self, %self.param +// CHECK:STDOUT: %self: ref %ForwardDeclared = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%empty_struct_type [concrete = constants.%complete_type.357] // CHECK:STDOUT: complete_type_witness = %complete_type @@ -354,7 +354,7 @@ fn Run() { // CHECK:STDOUT: %.loc7_3: init %Empty = converted %.loc7_26.1, %.loc7_26.2 [concrete = constants.%Empty.val] // CHECK:STDOUT: assign %a.var, %.loc7_3 // CHECK:STDOUT: %Empty.ref: type = name_ref Empty, imports.%Main.Empty [concrete = constants.%Empty] -// CHECK:STDOUT: %a: ref %Empty = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %Empty = wrapper_binding a, %a.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.f17 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.f17 = var_pattern %b.patt [concrete = constants.%b.var_patt] @@ -374,7 +374,7 @@ fn Run() { // CHECK:STDOUT: %.loc9_3: init %Field = converted %.loc9_25.1, %.loc9_25.5 [concrete = constants.%Field.val] // CHECK:STDOUT: assign %b.var, %.loc9_3 // CHECK:STDOUT: %Field.ref: type = name_ref Field, imports.%Main.Field [concrete = constants.%Field] -// CHECK:STDOUT: %b: ref %Field = ref_binding b, %b.var +// CHECK:STDOUT: %b: ref %Field = wrapper_binding b, %b.var // CHECK:STDOUT: %b.ref: ref %Field = name_ref b, %b // CHECK:STDOUT: %x.ref: %Field.elem = name_ref x, imports.%Main.import_ref.5c1 [concrete = imports.%.860] // CHECK:STDOUT: %.loc10_4: ref %i32 = class_element_access %b.ref, element0 @@ -396,7 +396,7 @@ fn Run() { // CHECK:STDOUT: %.loc12_3: init %ForwardDeclared.08bd4c.1 = converted %.loc12_29.1, %.loc12_29.2 [concrete = constants.%ForwardDeclared.val] // CHECK:STDOUT: assign %c.var, %.loc12_3 // CHECK:STDOUT: %ForwardDeclared.ref.loc12: type = name_ref ForwardDeclared, imports.%Main.ForwardDeclared [concrete = constants.%ForwardDeclared.08bd4c.1] -// CHECK:STDOUT: %c: ref %ForwardDeclared.08bd4c.1 = ref_binding c, %c.var +// CHECK:STDOUT: %c: ref %ForwardDeclared.08bd4c.1 = wrapper_binding c, %c.var // CHECK:STDOUT: %c.ref.loc13: ref %ForwardDeclared.08bd4c.1 = name_ref c, %c // CHECK:STDOUT: %F.ref: %ForwardDeclared.F.type = name_ref F, imports.%Main.import_ref.bc9 [concrete = constants.%ForwardDeclared.F] // CHECK:STDOUT: %ForwardDeclared.F.bound: = bound_method %c.ref.loc13, %F.ref @@ -423,7 +423,7 @@ fn Run() { // CHECK:STDOUT: %ForwardDeclared.ref.loc16: type = name_ref ForwardDeclared, imports.%Main.ForwardDeclared [concrete = constants.%ForwardDeclared.08bd4c.1] // CHECK:STDOUT: %ptr.loc16: type = ptr_type %ForwardDeclared.ref.loc16 [concrete = constants.%ptr.11e] // CHECK:STDOUT: } -// CHECK:STDOUT: %d: ref %ptr.11e = ref_binding d, %d.var +// CHECK:STDOUT: %d: ref %ptr.11e = wrapper_binding d, %d.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %e.patt: %pattern_type.bae = ref_binding_pattern e [concrete = constants.%e.patt] // CHECK:STDOUT: %e.var_patt: %pattern_type.bae = var_pattern %e.patt [concrete = constants.%e.var_patt] @@ -440,7 +440,7 @@ fn Run() { // CHECK:STDOUT: %Incomplete.ref: type = name_ref Incomplete, imports.%Main.Incomplete [concrete = constants.%Incomplete] // CHECK:STDOUT: %ptr.loc18: type = ptr_type %Incomplete.ref [concrete = constants.%ptr.06d] // CHECK:STDOUT: } -// CHECK:STDOUT: %e: ref %ptr.06d = ref_binding e, %e.var +// CHECK:STDOUT: %e: ref %ptr.06d = wrapper_binding e, %e.var // CHECK:STDOUT: %Destroy.Op.bound.loc18: = bound_method %e.var, constants.%Destroy.Op.1a2547.1 // CHECK:STDOUT: %Destroy.Op.call.loc18: init %empty_tuple.type = call %Destroy.Op.bound.loc18(%e.var) // CHECK:STDOUT: %Destroy.Op.bound.loc16: = bound_method %d.var, constants.%Destroy.Op.1a2547.2 diff --git a/toolchain/check/testdata/class/import_indirect.carbon b/toolchain/check/testdata/class/import_indirect.carbon index 4780d54e0f81..6e9aa411fbca 100644 --- a/toolchain/check/testdata/class/import_indirect.carbon +++ b/toolchain/check/testdata/class/import_indirect.carbon @@ -199,7 +199,7 @@ var ptr: E* = &value; // CHECK:STDOUT: } // CHECK:STDOUT: %b_val.var: ref %C = var %b_val.var_patt [concrete] // CHECK:STDOUT: %C.ref.loc8: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %b_val: ref %C = ref_binding b_val, %b_val.var [concrete = %b_val.var] +// CHECK:STDOUT: %b_val: ref %C = wrapper_binding b_val, %b_val.var [concrete = %b_val.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b_ptr.patt: %pattern_type.fcb = ref_binding_pattern b_ptr [concrete = constants.%b_ptr.patt] // CHECK:STDOUT: %b_ptr.var_patt: %pattern_type.fcb = var_pattern %b_ptr.patt [concrete = constants.%b_ptr.var_patt] @@ -209,7 +209,7 @@ var ptr: E* = &value; // CHECK:STDOUT: %D.ref: type = name_ref D, %D [concrete = constants.%C] // CHECK:STDOUT: %ptr: type = ptr_type %D.ref [concrete = constants.%ptr.6b6] // CHECK:STDOUT: } -// CHECK:STDOUT: %b_ptr: ref %ptr.6b6 = ref_binding b_ptr, %b_ptr.var [concrete = %b_ptr.var] +// CHECK:STDOUT: %b_ptr: ref %ptr.6b6 = wrapper_binding b_ptr, %b_ptr.var [concrete = %b_ptr.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "a.carbon"] { @@ -299,7 +299,7 @@ var ptr: E* = &value; // CHECK:STDOUT: } // CHECK:STDOUT: %c_val.var: ref %C = var %c_val.var_patt [concrete] // CHECK:STDOUT: %C.ref.loc8: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %c_val: ref %C = ref_binding c_val, %c_val.var [concrete = %c_val.var] +// CHECK:STDOUT: %c_val: ref %C = wrapper_binding c_val, %c_val.var [concrete = %c_val.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c_ptr.patt: %pattern_type.fcb = ref_binding_pattern c_ptr [concrete = constants.%c_ptr.patt] // CHECK:STDOUT: %c_ptr.var_patt: %pattern_type.fcb = var_pattern %c_ptr.patt [concrete = constants.%c_ptr.var_patt] @@ -309,7 +309,7 @@ var ptr: E* = &value; // CHECK:STDOUT: %E.ref: type = name_ref E, %E [concrete = constants.%C] // CHECK:STDOUT: %ptr: type = ptr_type %E.ref [concrete = constants.%ptr.6b6] // CHECK:STDOUT: } -// CHECK:STDOUT: %c_ptr: ref %ptr.6b6 = ref_binding c_ptr, %c_ptr.var [concrete = %c_ptr.var] +// CHECK:STDOUT: %c_ptr: ref %ptr.6b6 = wrapper_binding c_ptr, %c_ptr.var [concrete = %c_ptr.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "a.carbon"] { @@ -402,7 +402,7 @@ var ptr: E* = &value; // CHECK:STDOUT: } // CHECK:STDOUT: %value.var: ref %C = var %value.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %value: ref %C = ref_binding value, %value.var [concrete = %value.var] +// CHECK:STDOUT: %value: ref %C = wrapper_binding value, %value.var [concrete = %value.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %ptr.patt: %pattern_type.fcb = ref_binding_pattern ptr [concrete = constants.%ptr.patt] // CHECK:STDOUT: %ptr.var_patt: %pattern_type.fcb = var_pattern %ptr.patt [concrete = constants.%ptr.var_patt] @@ -412,7 +412,7 @@ var ptr: E* = &value; // CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [concrete = constants.%C] // CHECK:STDOUT: %ptr.loc8_11: type = ptr_type %D.ref [concrete = constants.%ptr.6b6] // CHECK:STDOUT: } -// CHECK:STDOUT: %ptr.loc8_8: ref %ptr.6b6 = ref_binding ptr, %ptr.var [concrete = %ptr.var] +// CHECK:STDOUT: %ptr.loc8_8: ref %ptr.6b6 = wrapper_binding ptr, %ptr.var [concrete = %ptr.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "a.carbon"] { @@ -505,7 +505,7 @@ var ptr: E* = &value; // CHECK:STDOUT: } // CHECK:STDOUT: %value.var: ref %C = var %value.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %value: ref %C = ref_binding value, %value.var [concrete = %value.var] +// CHECK:STDOUT: %value: ref %C = wrapper_binding value, %value.var [concrete = %value.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %ptr.patt: %pattern_type.fcb = ref_binding_pattern ptr [concrete = constants.%ptr.patt] // CHECK:STDOUT: %ptr.var_patt: %pattern_type.fcb = var_pattern %ptr.patt [concrete = constants.%ptr.var_patt] @@ -515,7 +515,7 @@ var ptr: E* = &value; // CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [concrete = constants.%C] // CHECK:STDOUT: %ptr.loc8_11: type = ptr_type %D.ref [concrete = constants.%ptr.6b6] // CHECK:STDOUT: } -// CHECK:STDOUT: %ptr.loc8_8: ref %ptr.6b6 = ref_binding ptr, %ptr.var [concrete = %ptr.var] +// CHECK:STDOUT: %ptr.loc8_8: ref %ptr.6b6 = wrapper_binding ptr, %ptr.var [concrete = %ptr.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "a.carbon"] { @@ -612,7 +612,7 @@ var ptr: E* = &value; // CHECK:STDOUT: } // CHECK:STDOUT: %value.var: ref %C = var %value.var_patt [concrete] // CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [concrete = constants.%C] -// CHECK:STDOUT: %value: ref %C = ref_binding value, %value.var [concrete = %value.var] +// CHECK:STDOUT: %value: ref %C = wrapper_binding value, %value.var [concrete = %value.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %ptr.patt: %pattern_type.fcb = ref_binding_pattern ptr [concrete = constants.%ptr.patt] // CHECK:STDOUT: %ptr.var_patt: %pattern_type.fcb = var_pattern %ptr.patt [concrete = constants.%ptr.var_patt] @@ -622,7 +622,7 @@ var ptr: E* = &value; // CHECK:STDOUT: %E.ref: type = name_ref E, imports.%Main.E [concrete = constants.%C] // CHECK:STDOUT: %ptr.loc8_11: type = ptr_type %E.ref [concrete = constants.%ptr.6b6] // CHECK:STDOUT: } -// CHECK:STDOUT: %ptr.loc8_8: ref %ptr.6b6 = ref_binding ptr, %ptr.var [concrete = %ptr.var] +// CHECK:STDOUT: %ptr.loc8_8: ref %ptr.6b6 = wrapper_binding ptr, %ptr.var [concrete = %ptr.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "b.carbon"] { @@ -719,7 +719,7 @@ var ptr: E* = &value; // CHECK:STDOUT: } // CHECK:STDOUT: %value.var: ref %C = var %value.var_patt [concrete] // CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [concrete = constants.%C] -// CHECK:STDOUT: %value: ref %C = ref_binding value, %value.var [concrete = %value.var] +// CHECK:STDOUT: %value: ref %C = wrapper_binding value, %value.var [concrete = %value.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %ptr.patt: %pattern_type.fcb = ref_binding_pattern ptr [concrete = constants.%ptr.patt] // CHECK:STDOUT: %ptr.var_patt: %pattern_type.fcb = var_pattern %ptr.patt [concrete = constants.%ptr.var_patt] @@ -729,7 +729,7 @@ var ptr: E* = &value; // CHECK:STDOUT: %E.ref: type = name_ref E, imports.%Main.E [concrete = constants.%C] // CHECK:STDOUT: %ptr.loc8_11: type = ptr_type %E.ref [concrete = constants.%ptr.6b6] // CHECK:STDOUT: } -// CHECK:STDOUT: %ptr.loc8_8: ref %ptr.6b6 = ref_binding ptr, %ptr.var [concrete = %ptr.var] +// CHECK:STDOUT: %ptr.loc8_8: ref %ptr.6b6 = wrapper_binding ptr, %ptr.var [concrete = %ptr.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "b.carbon"] { diff --git a/toolchain/check/testdata/class/import_member_cycle.carbon b/toolchain/check/testdata/class/import_member_cycle.carbon index ab5e95553763..4a6fed419872 100644 --- a/toolchain/check/testdata/class/import_member_cycle.carbon +++ b/toolchain/check/testdata/class/import_member_cycle.carbon @@ -148,7 +148,7 @@ fn Run() { // CHECK:STDOUT: %Cycle.ref: type = name_ref Cycle, imports.%Main.Cycle [concrete = constants.%Cycle] // CHECK:STDOUT: %ptr: type = ptr_type %Cycle.ref [concrete = constants.%ptr] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %ptr = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %ptr = wrapper_binding a, %a.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %a.var, constants.%Destroy.Op // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%a.var) // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/class/import_struct_cycle.carbon b/toolchain/check/testdata/class/import_struct_cycle.carbon index 174f34e409b4..6310c80a1885 100644 --- a/toolchain/check/testdata/class/import_struct_cycle.carbon +++ b/toolchain/check/testdata/class/import_struct_cycle.carbon @@ -87,7 +87,7 @@ fn Run() { // CHECK:STDOUT: %ptr: type = ptr_type %Cycle.ref [concrete = constants.%ptr] // CHECK:STDOUT: %struct_type.b: type = struct_type {.b: %ptr} [concrete = constants.%struct_type.b] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %struct_type.b = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %struct_type.b = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: %Cycle.decl.loc8: type = class_decl @Cycle [concrete = constants.%Cycle] {} {} // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/indirect_import_member.carbon b/toolchain/check/testdata/class/indirect_import_member.carbon index a8f6d2f4d6dd..44033d31ffab 100644 --- a/toolchain/check/testdata/class/indirect_import_member.carbon +++ b/toolchain/check/testdata/class/indirect_import_member.carbon @@ -288,7 +288,7 @@ var x: () = D.C.F(); // CHECK:STDOUT: %.loc6_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_9.3: type = converted %.loc6_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %empty_tuple.type = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %empty_tuple.type = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "a.carbon"] { @@ -347,7 +347,7 @@ var x: () = D.C.F(); // CHECK:STDOUT: %.loc6_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_9.3: type = converted %.loc6_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %empty_tuple.type = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %empty_tuple.type = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "c.carbon"] { @@ -406,7 +406,7 @@ var x: () = D.C.F(); // CHECK:STDOUT: %.loc6_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_9.3: type = converted %.loc6_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %empty_tuple.type = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %empty_tuple.type = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "c.carbon"] { @@ -469,7 +469,7 @@ var x: () = D.C.F(); // CHECK:STDOUT: %.loc6_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_9.3: type = converted %.loc6_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %empty_tuple.type = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %empty_tuple.type = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @D [from "e.carbon"] { @@ -541,7 +541,7 @@ var x: () = D.C.F(); // CHECK:STDOUT: %.loc6_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_9.3: type = converted %.loc6_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %empty_tuple.type = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %empty_tuple.type = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @D [from "e.carbon"] { diff --git a/toolchain/check/testdata/class/inheritance/base.carbon b/toolchain/check/testdata/class/inheritance/base.carbon index 190bb257eca3..143fd09a1912 100644 --- a/toolchain/check/testdata/class/inheritance/base.carbon +++ b/toolchain/check/testdata/class/inheritance/base.carbon @@ -174,7 +174,7 @@ class Derived { // CHECK:STDOUT: %.loc17_35.3: Core.Form = init_form %.loc17_35.2 [concrete = constants.%.c11] // CHECK:STDOUT: %d.param: %Derived = value_param call_param0 // CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl [concrete = constants.%Derived] -// CHECK:STDOUT: %d: %Derived = value_binding d, %d.param +// CHECK:STDOUT: %d: %Derived = wrapper_binding d, %d.param // CHECK:STDOUT: %return.param: ref %tuple.type.e55 = out_param call_param1 // CHECK:STDOUT: %return: ref %tuple.type.e55 = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/inheritance/base_field.carbon b/toolchain/check/testdata/class/inheritance/base_field.carbon index 0ce3157cd095..4cf00f298309 100644 --- a/toolchain/check/testdata/class/inheritance/base_field.carbon +++ b/toolchain/check/testdata/class/inheritance/base_field.carbon @@ -106,7 +106,7 @@ fn Access(p: Derived*) -> i32* { // CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl [concrete = constants.%Derived] // CHECK:STDOUT: %ptr.loc28_21: type = ptr_type %Derived.ref [concrete = constants.%ptr.64c] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.64c = value_binding p, %p.param +// CHECK:STDOUT: %p: %ptr.64c = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref %ptr.d08 = out_param call_param1 // CHECK:STDOUT: %return: ref %ptr.d08 = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/inheritance/base_method.carbon b/toolchain/check/testdata/class/inheritance/base_method.carbon index ac699121d77a..73f95b38bb1e 100644 --- a/toolchain/check/testdata/class/inheritance/base_method.carbon +++ b/toolchain/check/testdata/class/inheritance/base_method.carbon @@ -104,7 +104,7 @@ fn Call(p: Derived*) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param.loc21: ref %Base = ref_param call_param0 // CHECK:STDOUT: %Self.ref.loc21: type = name_ref Self, constants.%Base [concrete = constants.%Base] -// CHECK:STDOUT: %self.loc21: ref %Base = ref_binding self, %self.param.loc21 +// CHECK:STDOUT: %self.loc21: ref %Base = wrapper_binding self, %self.param.loc21 // CHECK:STDOUT: } // CHECK:STDOUT: %Derived.decl: type = class_decl @Derived [concrete = constants.%Derived] {} {} // CHECK:STDOUT: %Call.decl: %Call.type = fn_decl @Call [concrete = constants.%Call] { @@ -116,7 +116,7 @@ fn Call(p: Derived*) { // CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl [concrete = constants.%Derived] // CHECK:STDOUT: %ptr: type = ptr_type %Derived.ref [concrete = constants.%ptr.64c] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.64c = value_binding p, %p.param +// CHECK:STDOUT: %p: %ptr.64c = wrapper_binding p, %p.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -128,7 +128,7 @@ fn Call(p: Derived*) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param.loc18: ref %Base = ref_param call_param0 // CHECK:STDOUT: %Self.ref.loc18: type = name_ref Self, constants.%Base [concrete = constants.%Base] -// CHECK:STDOUT: %self.loc18: ref %Base = ref_binding self, %self.param.loc18 +// CHECK:STDOUT: %self.loc18: ref %Base = wrapper_binding self, %self.param.loc18 // CHECK:STDOUT: } // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%struct_type.a [concrete = constants.%complete_type.388] // CHECK:STDOUT: complete_type_witness = %complete_type diff --git a/toolchain/check/testdata/class/inheritance/base_method_qualified.carbon b/toolchain/check/testdata/class/inheritance/base_method_qualified.carbon index a11e6e6a5de7..ccd5d04e797b 100644 --- a/toolchain/check/testdata/class/inheritance/base_method_qualified.carbon +++ b/toolchain/check/testdata/class/inheritance/base_method_qualified.carbon @@ -123,7 +123,7 @@ fn PassDerivedToBaseIndirect(p: Derived*) -> i32 { // CHECK:STDOUT: %.loc29: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %a.param: %Derived = value_param call_param0 // CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl.loc15 [concrete = constants.%Derived] -// CHECK:STDOUT: %a: %Derived = value_binding a, %a.param +// CHECK:STDOUT: %a: %Derived = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -140,7 +140,7 @@ fn PassDerivedToBaseIndirect(p: Derived*) -> i32 { // CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl.loc15 [concrete = constants.%Derived] // CHECK:STDOUT: %ptr: type = ptr_type %Derived.ref [concrete = constants.%ptr.64c] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.64c = value_binding p, %p.param +// CHECK:STDOUT: %p: %ptr.64c = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -154,7 +154,7 @@ fn PassDerivedToBaseIndirect(p: Derived*) -> i32 { // CHECK:STDOUT: %.loc37: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %a.param: %Derived = value_param call_param0 // CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl.loc15 [concrete = constants.%Derived] -// CHECK:STDOUT: %a: %Derived = value_binding a, %a.param +// CHECK:STDOUT: %a: %Derived = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -171,7 +171,7 @@ fn PassDerivedToBaseIndirect(p: Derived*) -> i32 { // CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl.loc15 [concrete = constants.%Derived] // CHECK:STDOUT: %ptr: type = ptr_type %Derived.ref [concrete = constants.%ptr.64c] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.64c = value_binding p, %p.param +// CHECK:STDOUT: %p: %ptr.64c = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -186,7 +186,7 @@ fn PassDerivedToBaseIndirect(p: Derived*) -> i32 { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %Derived = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Derived [concrete = constants.%Derived] -// CHECK:STDOUT: %self: %Derived = value_binding self, %self.param +// CHECK:STDOUT: %self: %Derived = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %Derived.G.decl: %Derived.G.type = fn_decl @Derived.G [concrete = constants.%Derived.G] { // CHECK:STDOUT: %self.param_patt: %pattern_type.746 = value_param_pattern [concrete = constants.%self.param_patt.138] @@ -194,7 +194,7 @@ fn PassDerivedToBaseIndirect(p: Derived*) -> i32 { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %Derived = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Derived [concrete = constants.%Derived] -// CHECK:STDOUT: %self: %Derived = value_binding self, %self.param +// CHECK:STDOUT: %self: %Derived = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%struct_type.base.cae [concrete = constants.%complete_type.c02] // CHECK:STDOUT: complete_type_witness = %complete_type @@ -219,7 +219,7 @@ fn PassDerivedToBaseIndirect(p: Derived*) -> i32 { // CHECK:STDOUT: %.loc18: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %self.param: %Base = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Base [concrete = constants.%Base] -// CHECK:STDOUT: %self: %Base = value_binding self, %self.param +// CHECK:STDOUT: %self: %Base = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -233,7 +233,7 @@ fn PassDerivedToBaseIndirect(p: Derived*) -> i32 { // CHECK:STDOUT: %.loc19: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %self.param: %Derived = value_param call_param0 // CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl.loc15 [concrete = constants.%Derived] -// CHECK:STDOUT: %self: %Derived = value_binding self, %self.param +// CHECK:STDOUT: %self: %Derived = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/inheritance/base_method_shadow.carbon b/toolchain/check/testdata/class/inheritance/base_method_shadow.carbon index 64159f147580..8c0f3c32b91a 100644 --- a/toolchain/check/testdata/class/inheritance/base_method_shadow.carbon +++ b/toolchain/check/testdata/class/inheritance/base_method_shadow.carbon @@ -125,25 +125,25 @@ fn Call(a: A*, b: B*, c: C*, d: D*) { // CHECK:STDOUT: %A.ref: type = name_ref A, file.%A.decl [concrete = constants.%A] // CHECK:STDOUT: %ptr.loc33_13: type = ptr_type %A.ref [concrete = constants.%ptr.d43] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %ptr.d43 = value_binding a, %a.param +// CHECK:STDOUT: %a: %ptr.d43 = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %ptr.432 = value_param call_param1 // CHECK:STDOUT: %.loc33_20: type = splice_block %ptr.loc33_20 [concrete = constants.%ptr.432] { // CHECK:STDOUT: %B.ref: type = name_ref B, file.%B.decl [concrete = constants.%B] // CHECK:STDOUT: %ptr.loc33_20: type = ptr_type %B.ref [concrete = constants.%ptr.432] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %ptr.432 = value_binding b, %b.param +// CHECK:STDOUT: %b: %ptr.432 = wrapper_binding b, %b.param // CHECK:STDOUT: %c.param: %ptr.6b6 = value_param call_param2 // CHECK:STDOUT: %.loc33_27: type = splice_block %ptr.loc33_27 [concrete = constants.%ptr.6b6] { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %ptr.loc33_27: type = ptr_type %C.ref [concrete = constants.%ptr.6b6] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %ptr.6b6 = value_binding c, %c.param +// CHECK:STDOUT: %c: %ptr.6b6 = wrapper_binding c, %c.param // CHECK:STDOUT: %d.param: %ptr.d57 = value_param call_param3 // CHECK:STDOUT: %.loc33_34: type = splice_block %ptr.loc33_34 [concrete = constants.%ptr.d57] { // CHECK:STDOUT: %D.ref: type = name_ref D, file.%D.decl [concrete = constants.%D] // CHECK:STDOUT: %ptr.loc33_34: type = ptr_type %D.ref [concrete = constants.%ptr.d57] // CHECK:STDOUT: } -// CHECK:STDOUT: %d: %ptr.d57 = value_binding d, %d.param +// CHECK:STDOUT: %d: %ptr.d57 = wrapper_binding d, %d.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -154,7 +154,7 @@ fn Call(a: A*, b: B*, c: C*, d: D*) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: ref %A = ref_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%A [concrete = constants.%A] -// CHECK:STDOUT: %self: ref %A = ref_binding self, %self.param +// CHECK:STDOUT: %self: ref %A = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%empty_struct_type [concrete = constants.%complete_type.357] // CHECK:STDOUT: complete_type_witness = %complete_type @@ -173,7 +173,7 @@ fn Call(a: A*, b: B*, c: C*, d: D*) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: ref %B = ref_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%B [concrete = constants.%B] -// CHECK:STDOUT: %self: ref %B = ref_binding self, %self.param +// CHECK:STDOUT: %self: ref %B = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%struct_type.base.cb7 [concrete = constants.%complete_type.d5e] // CHECK:STDOUT: complete_type_witness = %complete_type @@ -195,7 +195,7 @@ fn Call(a: A*, b: B*, c: C*, d: D*) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: ref %C = ref_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%C [concrete = constants.%C] -// CHECK:STDOUT: %self: ref %C = ref_binding self, %self.param +// CHECK:STDOUT: %self: ref %C = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%struct_type.base.e05 [concrete = constants.%complete_type.c77] // CHECK:STDOUT: complete_type_witness = %complete_type diff --git a/toolchain/check/testdata/class/inheritance/derived_to_base.carbon b/toolchain/check/testdata/class/inheritance/derived_to_base.carbon index 38f2bc8917b0..86033c8781cc 100644 --- a/toolchain/check/testdata/class/inheritance/derived_to_base.carbon +++ b/toolchain/check/testdata/class/inheritance/derived_to_base.carbon @@ -253,7 +253,7 @@ fn PassPartialB(b: partial B) { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %ptr.loc19_20: type = ptr_type %C.ref [concrete = constants.%ptr.6b6] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.6b6 = value_binding p, %p.param +// CHECK:STDOUT: %p: %ptr.6b6 = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref %ptr.432 = out_param call_param1 // CHECK:STDOUT: %return: ref %ptr.432 = return_slot %return.param // CHECK:STDOUT: } @@ -271,7 +271,7 @@ fn PassPartialB(b: partial B) { // CHECK:STDOUT: %B.ref: type = name_ref B, file.%B.decl [concrete = constants.%B] // CHECK:STDOUT: %ptr.loc20_20: type = ptr_type %B.ref [concrete = constants.%ptr.432] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.432 = value_binding p, %p.param +// CHECK:STDOUT: %p: %ptr.432 = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref %ptr.d43 = out_param call_param1 // CHECK:STDOUT: %return: ref %ptr.d43 = return_slot %return.param // CHECK:STDOUT: } @@ -289,7 +289,7 @@ fn PassPartialB(b: partial B) { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %ptr.loc21_20: type = ptr_type %C.ref [concrete = constants.%ptr.6b6] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.6b6 = value_binding p, %p.param +// CHECK:STDOUT: %p: %ptr.6b6 = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref %ptr.d43 = out_param call_param1 // CHECK:STDOUT: %return: ref %ptr.d43 = return_slot %return.param // CHECK:STDOUT: } @@ -299,7 +299,7 @@ fn PassPartialB(b: partial B) { // CHECK:STDOUT: } { // CHECK:STDOUT: %c.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %c: %C = value_binding c, %c.param +// CHECK:STDOUT: %c: %C = wrapper_binding c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: %ConvertRef.decl: %ConvertRef.type = fn_decl @ConvertRef [concrete = constants.%ConvertRef] { // CHECK:STDOUT: %c.param_patt: %pattern_type.fcb = value_param_pattern [concrete = constants.%c.param_patt.200] @@ -315,7 +315,7 @@ fn PassPartialB(b: partial B) { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %ptr.loc27_19: type = ptr_type %C.ref [concrete = constants.%ptr.6b6] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %ptr.6b6 = value_binding c, %c.param +// CHECK:STDOUT: %c: %ptr.6b6 = wrapper_binding c, %c.param // CHECK:STDOUT: %return.param: ref %ptr.d43 = out_param call_param1 // CHECK:STDOUT: %return: ref %ptr.d43 = return_slot %return.param // CHECK:STDOUT: } @@ -380,7 +380,7 @@ fn PassPartialB(b: partial B) { // CHECK:STDOUT: %.loc24_21.4: ref %A = converted %c.ref, %.loc24_21.3 // CHECK:STDOUT: %.loc24_21.5: %A = acquire_value %.loc24_21.4 // CHECK:STDOUT: %A.ref: type = name_ref A, file.%A.decl [concrete = constants.%A] -// CHECK:STDOUT: %a: %A = value_binding a, %.loc24_21.5 +// CHECK:STDOUT: %a: %A = wrapper_binding a, %.loc24_21.5 // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: @@ -456,7 +456,7 @@ fn PassPartialB(b: partial B) { // CHECK:STDOUT: %.loc32_66.6: ref %A = converted %.loc32_66.1, %.loc32_66.5 [concrete = constants.%.79d] // CHECK:STDOUT: %.loc32_66.7: %A = acquire_value %.loc32_66.6 // CHECK:STDOUT: %A.ref: type = name_ref A, file.%A.decl [concrete = constants.%A] -// CHECK:STDOUT: %a: %A = value_binding a, %.loc32_66.7 +// CHECK:STDOUT: %a: %A = wrapper_binding a, %.loc32_66.7 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call constants.%Destroy.Op.bound(constants.%.320) // CHECK:STDOUT: return // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/inheritance/import_base.carbon b/toolchain/check/testdata/class/inheritance/import_base.carbon index fb271630c309..36d602173fd6 100644 --- a/toolchain/check/testdata/class/inheritance/import_base.carbon +++ b/toolchain/check/testdata/class/inheritance/import_base.carbon @@ -92,7 +92,7 @@ fn Run() { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %Base = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Base [concrete = constants.%Base] -// CHECK:STDOUT: %self: %Base = value_binding self, %self.param +// CHECK:STDOUT: %self: %Base = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %Base.Unused.decl: %Base.Unused.type = fn_decl @Base.Unused [concrete = constants.%Base.Unused] { // CHECK:STDOUT: %self.param_patt: %pattern_type.912 = value_param_pattern [concrete = constants.%self.param_patt] @@ -100,7 +100,7 @@ fn Run() { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %Base = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Base [concrete = constants.%Base] -// CHECK:STDOUT: %self: %Base = value_binding self, %self.param +// CHECK:STDOUT: %self: %Base = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %.loc8: %Base.elem = field_decl x, element0 [concrete] // CHECK:STDOUT: %.loc9: %Base.elem = field_decl unused_y, element1 [concrete] @@ -286,7 +286,7 @@ fn Run() { // CHECK:STDOUT: %.loc7_3: init %Child = converted %.loc7_50.1, %.loc7_50.5 [concrete = constants.%Child.val] // CHECK:STDOUT: assign %a.var, %.loc7_3 // CHECK:STDOUT: %Child.ref: type = name_ref Child, imports.%Main.Child [concrete = constants.%Child] -// CHECK:STDOUT: %a: ref %Child = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %Child = wrapper_binding a, %a.var // CHECK:STDOUT: %a.ref.loc8: ref %Child = name_ref a, %a // CHECK:STDOUT: %x.ref: %Base.elem = name_ref x, imports.%Main.import_ref.230 [concrete = imports.%.11f] // CHECK:STDOUT: %.loc8_4.1: ref %Base = as_compatible %a.ref.loc8 diff --git a/toolchain/check/testdata/class/inheritance/self_conversion.carbon b/toolchain/check/testdata/class/inheritance/self_conversion.carbon index 58b0659e20b9..017acdb8e62d 100644 --- a/toolchain/check/testdata/class/inheritance/self_conversion.carbon +++ b/toolchain/check/testdata/class/inheritance/self_conversion.carbon @@ -138,7 +138,7 @@ fn Call(p: Derived*) -> i32 { // CHECK:STDOUT: %.loc26: Core.Form = init_form %i32.loc26 [concrete = constants.%.795] // CHECK:STDOUT: %self.param.loc26: %Base = value_param call_param0 // CHECK:STDOUT: %Base.ref.loc26: type = name_ref Base, file.%Base.decl [concrete = constants.%Base] -// CHECK:STDOUT: %self.loc26: %Base = value_binding self, %self.param.loc26 +// CHECK:STDOUT: %self.loc26: %Base = wrapper_binding self, %self.param.loc26 // CHECK:STDOUT: %return.param.loc26: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return.loc26: ref %i32 = return_slot %return.param.loc26 // CHECK:STDOUT: } @@ -148,7 +148,7 @@ fn Call(p: Derived*) -> i32 { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param.loc30: ref %Base = ref_param call_param0 // CHECK:STDOUT: %Base.ref.loc30: type = name_ref Base, file.%Base.decl [concrete = constants.%Base] -// CHECK:STDOUT: %self.loc30: ref %Base = ref_binding self, %self.param.loc30 +// CHECK:STDOUT: %self.loc30: ref %Base = wrapper_binding self, %self.param.loc30 // CHECK:STDOUT: } // CHECK:STDOUT: %Call.decl: %Call.type = fn_decl @Call [concrete = constants.%Call] { // CHECK:STDOUT: %p.param_patt: %pattern_type.56c = value_param_pattern [concrete = constants.%p.param_patt] @@ -163,7 +163,7 @@ fn Call(p: Derived*) -> i32 { // CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl [concrete = constants.%Derived] // CHECK:STDOUT: %ptr: type = ptr_type %Derived.ref [concrete = constants.%ptr.64c] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.64c = value_binding p, %p.param +// CHECK:STDOUT: %p: %ptr.64c = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -193,7 +193,7 @@ fn Call(p: Derived*) -> i32 { // CHECK:STDOUT: %.loc22: Core.Form = init_form %i32.loc22 [concrete = constants.%.795] // CHECK:STDOUT: %self.param.loc22: %Base = value_param call_param0 // CHECK:STDOUT: %Base.ref.loc22: type = name_ref Base, file.%Base.decl [concrete = constants.%Base] -// CHECK:STDOUT: %self.loc22: %Base = value_binding self, %self.param.loc22 +// CHECK:STDOUT: %self.loc22: %Base = wrapper_binding self, %self.param.loc22 // CHECK:STDOUT: %return.param.loc22: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return.loc22: ref %i32 = return_slot %return.param.loc22 // CHECK:STDOUT: } @@ -203,7 +203,7 @@ fn Call(p: Derived*) -> i32 { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param.loc23: ref %Base = ref_param call_param0 // CHECK:STDOUT: %Base.ref.loc23: type = name_ref Base, file.%Base.decl [concrete = constants.%Base] -// CHECK:STDOUT: %self.loc23: ref %Base = ref_binding self, %self.param.loc23 +// CHECK:STDOUT: %self.loc23: ref %Base = wrapper_binding self, %self.param.loc23 // CHECK:STDOUT: } // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%struct_type.base.cae [concrete = constants.%complete_type.c02] // CHECK:STDOUT: complete_type_witness = %complete_type diff --git a/toolchain/check/testdata/class/init.carbon b/toolchain/check/testdata/class/init.carbon index 799546fab42c..6b8adad48daa 100644 --- a/toolchain/check/testdata/class/init.carbon +++ b/toolchain/check/testdata/class/init.carbon @@ -112,13 +112,13 @@ fn MakeReorder(n: i32, next: Class*) -> Class { // CHECK:STDOUT: %.loc20_34: Core.Form = init_form %Class.ref.loc20_34 [concrete = constants.%.d76] // CHECK:STDOUT: %n.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: %i32 = value_binding n, %n.param +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, %n.param // CHECK:STDOUT: %next.param: %ptr.7ee = value_param call_param1 // CHECK:STDOUT: %.loc20_28: type = splice_block %ptr [concrete = constants.%ptr.7ee] { // CHECK:STDOUT: %Class.ref.loc20_23: type = name_ref Class, file.%Class.decl [concrete = constants.%Class] // CHECK:STDOUT: %ptr: type = ptr_type %Class.ref.loc20_23 [concrete = constants.%ptr.7ee] // CHECK:STDOUT: } -// CHECK:STDOUT: %next: %ptr.7ee = value_binding next, %next.param +// CHECK:STDOUT: %next: %ptr.7ee = wrapper_binding next, %next.param // CHECK:STDOUT: %return.param: ref %Class = out_param call_param2 // CHECK:STDOUT: %return: ref %Class = return_slot %return.param // CHECK:STDOUT: } @@ -134,13 +134,13 @@ fn MakeReorder(n: i32, next: Class*) -> Class { // CHECK:STDOUT: %.loc24_41: Core.Form = init_form %Class.ref.loc24_41 [concrete = constants.%.d76] // CHECK:STDOUT: %n.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: %i32 = value_binding n, %n.param +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, %n.param // CHECK:STDOUT: %next.param: %ptr.7ee = value_param call_param1 // CHECK:STDOUT: %.loc24_35: type = splice_block %ptr [concrete = constants.%ptr.7ee] { // CHECK:STDOUT: %Class.ref.loc24_30: type = name_ref Class, file.%Class.decl [concrete = constants.%Class] // CHECK:STDOUT: %ptr: type = ptr_type %Class.ref.loc24_30 [concrete = constants.%ptr.7ee] // CHECK:STDOUT: } -// CHECK:STDOUT: %next: %ptr.7ee = value_binding next, %next.param +// CHECK:STDOUT: %next: %ptr.7ee = wrapper_binding next, %next.param // CHECK:STDOUT: %return.param: ref %Class = out_param call_param2 // CHECK:STDOUT: %return: ref %Class = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/init_as.carbon b/toolchain/check/testdata/class/init_as.carbon index 3c494031d265..9b99fa7d3a92 100644 --- a/toolchain/check/testdata/class/init_as.carbon +++ b/toolchain/check/testdata/class/init_as.carbon @@ -175,7 +175,7 @@ fn G() -> i32 { // CHECK:STDOUT: %.loc26_35: init %Class = converted %.loc26_33.1, %.loc26_33.8 [concrete = constants.%Class.val] // CHECK:STDOUT: assign %v.var, %.loc26_35 // CHECK:STDOUT: %Class.ref.loc26_10: type = name_ref Class, file.%Class.decl [concrete = constants.%Class] -// CHECK:STDOUT: %v: ref %Class = ref_binding v, %v.var +// CHECK:STDOUT: %v: ref %Class = wrapper_binding v, %v.var // CHECK:STDOUT: // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %v.var, constants.%Destroy.Op.1a2547.4 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%v.var) diff --git a/toolchain/check/testdata/class/local.carbon b/toolchain/check/testdata/class/local.carbon index c3f45a89b4c0..8d7c7c1a7aee 100644 --- a/toolchain/check/testdata/class/local.carbon +++ b/toolchain/check/testdata/class/local.carbon @@ -200,7 +200,7 @@ class A { // CHECK:STDOUT: %.loc19_18: init %B = converted %.loc19_39.1, %.loc19_39.5 [concrete = constants.%B.val] // CHECK:STDOUT: assign %return.param, %.loc19_18 // CHECK:STDOUT: %Self.ref.loc19: type = name_ref Self, constants.%B [concrete = constants.%B] -// CHECK:STDOUT: %b: ref %B = ref_binding b, %return.param +// CHECK:STDOUT: %b: ref %B = wrapper_binding b, %return.param // CHECK:STDOUT: %.loc19_23: %B = acquire_value %b // CHECK:STDOUT: return %.loc19_23 to %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/method/call_without_method_syntax.carbon b/toolchain/check/testdata/class/method/call_without_method_syntax.carbon index 2b8ff5425c25..f9c63dd2db26 100644 --- a/toolchain/check/testdata/class/method/call_without_method_syntax.carbon +++ b/toolchain/check/testdata/class/method/call_without_method_syntax.carbon @@ -120,7 +120,7 @@ fn CallViaAlias(p: Point) -> i32 { // CHECK:STDOUT: %.loc13: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %p.param: %Point = value_param call_param0 // CHECK:STDOUT: %Point.ref.loc13: type = name_ref Point, file.%Point.decl [concrete = constants.%Point] -// CHECK:STDOUT: %p: %Point = value_binding p, %p.param +// CHECK:STDOUT: %p: %Point = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -136,10 +136,10 @@ fn CallViaAlias(p: Point) -> i32 { // CHECK:STDOUT: %.loc18: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %p.param: %Point = value_param call_param0 // CHECK:STDOUT: %Point.ref.loc18_17: type = name_ref Point, file.%Point.decl [concrete = constants.%Point] -// CHECK:STDOUT: %p: %Point = value_binding p, %p.param +// CHECK:STDOUT: %p: %Point = wrapper_binding p, %p.param // CHECK:STDOUT: %q.param: %Point = value_param call_param1 // CHECK:STDOUT: %Point.ref.loc18_27: type = name_ref Point, file.%Point.decl [concrete = constants.%Point] -// CHECK:STDOUT: %q: %Point = value_binding q, %q.param +// CHECK:STDOUT: %q: %Point = wrapper_binding q, %q.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param2 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -153,7 +153,7 @@ fn CallViaAlias(p: Point) -> i32 { // CHECK:STDOUT: %.loc23: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %p.param: %Point = value_param call_param0 // CHECK:STDOUT: %Point.ref.loc23: type = name_ref Point, file.%Point.decl [concrete = constants.%Point] -// CHECK:STDOUT: %p: %Point = value_binding p, %p.param +// CHECK:STDOUT: %p: %Point = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -170,7 +170,7 @@ fn CallViaAlias(p: Point) -> i32 { // CHECK:STDOUT: %.loc4_19: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %self.param: %Point = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Point [concrete = constants.%Point] -// CHECK:STDOUT: %self: %Point = value_binding self, %self.param +// CHECK:STDOUT: %self: %Point = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -186,10 +186,10 @@ fn CallViaAlias(p: Point) -> i32 { // CHECK:STDOUT: %.loc5_42: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %self.param: %Point = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Point [concrete = constants.%Point] -// CHECK:STDOUT: %self: %Point = value_binding self, %self.param +// CHECK:STDOUT: %self: %Point = wrapper_binding self, %self.param // CHECK:STDOUT: %other.param: %Point = value_param call_param1 // CHECK:STDOUT: %Point.ref: type = name_ref Point, file.%Point.decl [concrete = constants.%Point] -// CHECK:STDOUT: %other: %Point = value_binding other, %other.param +// CHECK:STDOUT: %other: %Point = wrapper_binding other, %other.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param2 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/method/generic_method.carbon b/toolchain/check/testdata/class/method/generic_method.carbon index 4cb2084bbd2e..3215aa7ae367 100644 --- a/toolchain/check/testdata/class/method/generic_method.carbon +++ b/toolchain/check/testdata/class/method/generic_method.carbon @@ -85,10 +85,10 @@ fn Class(T:! type).F(unused self, unused n: T) {} // CHECK:STDOUT: %.loc20_29.2: type = specific_constant constants.%Class, @Class(constants.%T) [symbolic = %Class (constants.%Class)] // CHECK:STDOUT: %Self.ref.loc20: type = name_ref Self, %.loc20_29.2 [symbolic = %Class (constants.%Class)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self.loc20: @Class.F.%Class (%Class) = value_binding self, %self.param.loc20 +// CHECK:STDOUT: %self.loc20: @Class.F.%Class (%Class) = wrapper_binding self, %self.param.loc20 // CHECK:STDOUT: %n.param.loc20: @Class.F.%T.loc17 (%T) = value_param call_param1 // CHECK:STDOUT: %T.ref.loc20: type = name_ref T, %T.loc20 [symbolic = %T.loc17 (constants.%T)] -// CHECK:STDOUT: %n.loc20: @Class.F.%T.loc17 (%T) = value_binding n, %n.param.loc20 +// CHECK:STDOUT: %n.loc20: @Class.F.%T.loc17 (%T) = wrapper_binding n, %n.param.loc20 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -120,10 +120,10 @@ fn Class(T:! type).F(unused self, unused n: T) {} // CHECK:STDOUT: %.loc17_8.2: type = specific_constant constants.%Class, @Class(constants.%T) [symbolic = %Class (constants.%Class)] // CHECK:STDOUT: %Self.ref.loc17: type = name_ref Self, %.loc17_8.2 [symbolic = %Class (constants.%Class)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self.loc17: @Class.F.%Class (%Class) = value_binding self, %self.param.loc17 +// CHECK:STDOUT: %self.loc17: @Class.F.%Class (%Class) = wrapper_binding self, %self.param.loc17 // CHECK:STDOUT: %n.param.loc17: @Class.F.%T.loc17 (%T) = value_param call_param1 // CHECK:STDOUT: %T.ref.loc17: type = name_ref T, @Class.%T.loc15_14.2 [symbolic = %T.loc17 (constants.%T)] -// CHECK:STDOUT: %n.loc17: @Class.F.%T.loc17 (%T) = value_binding n, %n.param.loc17 +// CHECK:STDOUT: %n.loc17: @Class.F.%T.loc17 (%T) = wrapper_binding n, %n.param.loc17 // CHECK:STDOUT: } // CHECK:STDOUT: %complete_type.loc18_1.1: = complete_type_witness constants.%struct_type.a [symbolic = %complete_type.loc18_1.2 (constants.%complete_type)] // CHECK:STDOUT: complete_type_witness = %complete_type.loc18_1.1 diff --git a/toolchain/check/testdata/class/method/method.carbon b/toolchain/check/testdata/class/method/method.carbon index 5c79a8b5b071..c63dc874c89d 100644 --- a/toolchain/check/testdata/class/method/method.carbon +++ b/toolchain/check/testdata/class/method/method.carbon @@ -214,7 +214,7 @@ fn CallGOnInitializingExpr() -> i32 { // CHECK:STDOUT: %.loc24: Core.Form = init_form %i32.loc24 [concrete = constants.%.795] // CHECK:STDOUT: %self.param.loc24: %Class = value_param call_param0 // CHECK:STDOUT: %Self.ref.loc24: type = name_ref Self, constants.%Class [concrete = constants.%Class] -// CHECK:STDOUT: %self.loc24: %Class = value_binding self, %self.param.loc24 +// CHECK:STDOUT: %self.loc24: %Class = wrapper_binding self, %self.param.loc24 // CHECK:STDOUT: %return.param.loc24: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return.loc24: ref %i32 = return_slot %return.param.loc24 // CHECK:STDOUT: } @@ -228,7 +228,7 @@ fn CallGOnInitializingExpr() -> i32 { // CHECK:STDOUT: %.loc28: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %c.param: %Class = value_param call_param0 // CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [concrete = constants.%Class] -// CHECK:STDOUT: %c: %Class = value_binding c, %c.param +// CHECK:STDOUT: %c: %Class = wrapper_binding c, %c.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -242,7 +242,7 @@ fn CallGOnInitializingExpr() -> i32 { // CHECK:STDOUT: %.loc34: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %c.param: %Class = value_param call_param0 // CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [concrete = constants.%Class] -// CHECK:STDOUT: %c: %Class = value_binding c, %c.param +// CHECK:STDOUT: %c: %Class = wrapper_binding c, %c.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -277,7 +277,7 @@ fn CallGOnInitializingExpr() -> i32 { // CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [concrete = constants.%Class] // CHECK:STDOUT: %ptr: type = ptr_type %Class.ref [concrete = constants.%ptr.7ee] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.7ee = value_binding p, %p.param +// CHECK:STDOUT: %p: %ptr.7ee = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -294,7 +294,7 @@ fn CallGOnInitializingExpr() -> i32 { // CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [concrete = constants.%Class] // CHECK:STDOUT: %ptr: type = ptr_type %Class.ref [concrete = constants.%ptr.7ee] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.7ee = value_binding p, %p.param +// CHECK:STDOUT: %p: %ptr.7ee = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -338,7 +338,7 @@ fn CallGOnInitializingExpr() -> i32 { // CHECK:STDOUT: %.loc16: Core.Form = init_form %i32.loc16 [concrete = constants.%.795] // CHECK:STDOUT: %self.param.loc16: %Class = value_param call_param0 // CHECK:STDOUT: %Self.ref.loc16: type = name_ref Self, constants.%Class [concrete = constants.%Class] -// CHECK:STDOUT: %self.loc16: %Class = value_binding self, %self.param.loc16 +// CHECK:STDOUT: %self.loc16: %Class = wrapper_binding self, %self.param.loc16 // CHECK:STDOUT: %return.param.loc16: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return.loc16: ref %i32 = return_slot %return.param.loc16 // CHECK:STDOUT: } @@ -352,7 +352,7 @@ fn CallGOnInitializingExpr() -> i32 { // CHECK:STDOUT: %.loc17: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %self.param: ref %Class = ref_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Class [concrete = constants.%Class] -// CHECK:STDOUT: %self: ref %Class = ref_binding self, %self.param +// CHECK:STDOUT: %self: ref %Class = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -462,7 +462,7 @@ fn CallGOnInitializingExpr() -> i32 { // CHECK:STDOUT: %T.as.DefaultOrUnformed.impl.Op.call: init %Class to %.loc43_3 = call %T.as.DefaultOrUnformed.impl.Op.specific_fn() // CHECK:STDOUT: assign %c.var, %T.as.DefaultOrUnformed.impl.Op.call // CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [concrete = constants.%Class] -// CHECK:STDOUT: %c: ref %Class = ref_binding c, %c.var +// CHECK:STDOUT: %c: ref %Class = wrapper_binding c, %c.var // CHECK:STDOUT: %c.ref: ref %Class = name_ref c, %c // CHECK:STDOUT: %G.ref: %Class.G.type = name_ref G, @Class.%Class.G.decl [concrete = constants.%Class.G] // CHECK:STDOUT: %Class.G.bound: = bound_method %c.ref, %G.ref diff --git a/toolchain/check/testdata/class/method/static_method.carbon b/toolchain/check/testdata/class/method/static_method.carbon index 0b9eb1dbffdd..e3aac78dbc00 100644 --- a/toolchain/check/testdata/class/method/static_method.carbon +++ b/toolchain/check/testdata/class/method/static_method.carbon @@ -127,7 +127,7 @@ fn Run() -> i32 { // CHECK:STDOUT: %T.as.DefaultOrUnformed.impl.Op.call: init %Class to %.loc20_3 = call %T.as.DefaultOrUnformed.impl.Op.specific_fn() // CHECK:STDOUT: assign %c.var, %T.as.DefaultOrUnformed.impl.Op.call // CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [concrete = constants.%Class] -// CHECK:STDOUT: %c: ref %Class = ref_binding c, %c.var +// CHECK:STDOUT: %c: ref %Class = wrapper_binding c, %c.var // CHECK:STDOUT: %c.ref: ref %Class = name_ref c, %c // CHECK:STDOUT: %F.ref: %Class.F.type = name_ref F, @Class.%Class.F.decl [concrete = constants.%Class.F] // CHECK:STDOUT: %Class.F.call: init %i32 = call %F.ref() diff --git a/toolchain/check/testdata/class/method/virtual.carbon b/toolchain/check/testdata/class/method/virtual.carbon index 47f7dad8c8b4..0a4ab3683088 100644 --- a/toolchain/check/testdata/class/method/virtual.carbon +++ b/toolchain/check/testdata/class/method/virtual.carbon @@ -581,7 +581,7 @@ class T2(G2:! type) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %Base = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Base [concrete = constants.%Base] -// CHECK:STDOUT: %self: %Base = value_binding self, %self.param +// CHECK:STDOUT: %self: %Base = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %vtable_decl: ref %ptr = vtable_decl @Base.vtable [concrete = constants.%Base.vtable_decl] // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%struct_type.vptr [concrete = constants.%complete_type] @@ -600,7 +600,7 @@ class T2(G2:! type) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %Abstract = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Abstract [concrete = constants.%Abstract] -// CHECK:STDOUT: %self: %Abstract = value_binding self, %self.param +// CHECK:STDOUT: %self: %Abstract = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %Abstract.K.decl: %Abstract.K.type = fn_decl @Abstract.K [concrete = constants.%Abstract.K] { // CHECK:STDOUT: %self.param_patt: %pattern_type.0e2 = value_param_pattern [concrete = constants.%self.param_patt.950] @@ -608,7 +608,7 @@ class T2(G2:! type) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %Abstract = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Abstract [concrete = constants.%Abstract] -// CHECK:STDOUT: %self: %Abstract = value_binding self, %self.param +// CHECK:STDOUT: %self: %Abstract = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %vtable_decl: ref %ptr = vtable_decl @Abstract.vtable [concrete = constants.%Abstract.vtable_decl] // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%struct_type.vptr [concrete = constants.%complete_type] @@ -696,7 +696,7 @@ class T2(G2:! type) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %Derived = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Derived [concrete = constants.%Derived] -// CHECK:STDOUT: %self: %Derived = value_binding self, %self.param +// CHECK:STDOUT: %self: %Derived = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %Derived.H.decl.loc9_22.2: %Derived.H.type.1f42d4.2 = fn_decl @Derived.H.loc9_22.2 [concrete = constants.%Derived.H.a6796b.2] { // CHECK:STDOUT: @@ -762,7 +762,7 @@ class T2(G2:! type) { // CHECK:STDOUT: %.loc15_3: init %Derived = converted %.loc15_38.1, %.loc15_38.9 // CHECK:STDOUT: assign %d.var, %.loc15_3 // CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl [concrete = constants.%Derived] -// CHECK:STDOUT: %d: ref %Derived = ref_binding d, %d.var +// CHECK:STDOUT: %d: ref %Derived = wrapper_binding d, %d.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %d.var, constants.%Destroy.Op.1a2547.5 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%d.var) // CHECK:STDOUT: @@ -840,7 +840,7 @@ class T2(G2:! type) { // CHECK:STDOUT: %Modifiers.ref: = name_ref Modifiers, imports.%Modifiers [concrete = imports.%Modifiers] // CHECK:STDOUT: %Base.ref: type = name_ref Base, imports.%Modifiers.Base [concrete = constants.%Base] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: ref %Base = ref_binding v, %v.var +// CHECK:STDOUT: %v: ref %Base = wrapper_binding v, %v.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %v.var, constants.%Destroy.Op.1a2547.3 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%v.var) // CHECK:STDOUT: @@ -957,7 +957,7 @@ class T2(G2:! type) { // CHECK:STDOUT: %.loc14_3: init %Base = converted %.loc14_35.1, %.loc14_35.8 // CHECK:STDOUT: assign %b1.var, %.loc14_3 // CHECK:STDOUT: %Base.ref.loc14: type = name_ref Base, file.%Base.decl [concrete = constants.%Base] -// CHECK:STDOUT: %b1: ref %Base = ref_binding b1, %b1.var +// CHECK:STDOUT: %b1: ref %Base = wrapper_binding b1, %b1.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b2.patt: %pattern_type.912 = ref_binding_pattern b2 [concrete = constants.%b2.patt] // CHECK:STDOUT: %b2.var_patt: %pattern_type.912 = var_pattern %b2.patt [concrete = constants.%b2.var_patt] @@ -989,7 +989,7 @@ class T2(G2:! type) { // CHECK:STDOUT: %.loc15_3: init %Base = converted %.loc15_42.1, %.loc15_42.10 [concrete = constants.%Base.val] // CHECK:STDOUT: assign %b2.var, %.loc15_3 // CHECK:STDOUT: %Base.ref.loc15: type = name_ref Base, file.%Base.decl [concrete = constants.%Base] -// CHECK:STDOUT: %b2: ref %Base = ref_binding b2, %b2.var +// CHECK:STDOUT: %b2: ref %Base = wrapper_binding b2, %b2.var // CHECK:STDOUT: // CHECK:STDOUT: %Destroy.Op.bound.loc15: = bound_method %b2.var, constants.%Destroy.Op.1a2547.5 // CHECK:STDOUT: %Destroy.Op.call.loc15: init %empty_tuple.type = call %Destroy.Op.bound.loc15(%b2.var) @@ -1043,7 +1043,7 @@ class T2(G2:! type) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %Derived = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Derived [concrete = constants.%Derived] -// CHECK:STDOUT: %self: %Derived = value_binding self, %self.param +// CHECK:STDOUT: %self: %Derived = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %Derived.F.decl.loc15_22.2: %Derived.F.type.48cdab.2 = fn_decl @Derived.F.loc15_22.2 [concrete = constants.%Derived.F.bd5be1.2] { // CHECK:STDOUT: @@ -1114,7 +1114,7 @@ class T2(G2:! type) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %Derived = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Derived [concrete = constants.%Derived] -// CHECK:STDOUT: %self: %Derived = value_binding self, %self.param +// CHECK:STDOUT: %self: %Derived = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %Derived.F.decl.loc15_22.2: %Derived.F.type.48cdab.2 = fn_decl @Derived.F.loc15_22.2 [concrete = constants.%Derived.F.bd5be1.2] { // CHECK:STDOUT: @@ -1193,7 +1193,7 @@ class T2(G2:! type) { // CHECK:STDOUT: %.loc23: Core.Form = init_form %T2.ref.loc23 [concrete = constants.%.617] // CHECK:STDOUT: %self.param.loc23: %Derived = value_param call_param0 // CHECK:STDOUT: %Self.ref.loc23: type = name_ref Self, constants.%Derived [concrete = constants.%Derived] -// CHECK:STDOUT: %self.loc23: %Derived = value_binding self, %self.param.loc23 +// CHECK:STDOUT: %self.loc23: %Derived = wrapper_binding self, %self.param.loc23 // CHECK:STDOUT: %return.param.loc23: ref %T2 = out_param call_param1 // CHECK:STDOUT: %return.loc23: ref %T2 = return_slot %return.param.loc23 // CHECK:STDOUT: } @@ -1286,7 +1286,7 @@ class T2(G2:! type) { // CHECK:STDOUT: %.loc6_23.2: type = specific_constant constants.%T1, @T1(constants.%T) [symbolic = %T1 (constants.%T1)] // CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc6_23.2 [symbolic = %T1 (constants.%T1)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @T1.F.%T1 (%T1) = value_binding self, %self.param +// CHECK:STDOUT: %self: @T1.F.%T1 (%T1) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: complete_type_witness = %complete_type @@ -1379,10 +1379,10 @@ class T2(G2:! type) { // CHECK:STDOUT: %.loc6_23.2: type = specific_constant constants.%T1, @T1(constants.%T) [symbolic = %T1 (constants.%T1)] // CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc6_23.2 [symbolic = %T1 (constants.%T1)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @T1.F.%T1 (%T1) = value_binding self, %self.param +// CHECK:STDOUT: %self: @T1.F.%T1 (%T1) = wrapper_binding self, %self.param // CHECK:STDOUT: %t.param: @T1.F.%T (%T) = value_param call_param1 // CHECK:STDOUT: %T.ref: type = name_ref T, @T1.%T.loc4_16.2 [symbolic = %T (constants.%T)] -// CHECK:STDOUT: %t: @T1.F.%T (%T) = value_binding t, %t.param +// CHECK:STDOUT: %t: @T1.F.%T (%T) = wrapper_binding t, %t.param // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: complete_type_witness = %complete_type @@ -1476,7 +1476,7 @@ class T2(G2:! type) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %D1 = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%D1 [concrete = constants.%D1] -// CHECK:STDOUT: %self: %D1 = value_binding self, %self.param +// CHECK:STDOUT: %self: %D1 = wrapper_binding self, %self.param // CHECK:STDOUT: %t.param: %ptr.2ee = value_param call_param1 // CHECK:STDOUT: %.loc11: type = splice_block %ptr [concrete = constants.%ptr.2ee] { // CHECK:STDOUT: %Base.ref: %Base.type = name_ref Base, file.%Base.decl [concrete = constants.%Base.generic] @@ -1484,7 +1484,7 @@ class T2(G2:! type) { // CHECK:STDOUT: %Base: type = class_type @Base, @Base(constants.%T1) [concrete = constants.%Base.5b2] // CHECK:STDOUT: %ptr: type = ptr_type %Base [concrete = constants.%ptr.2ee] // CHECK:STDOUT: } -// CHECK:STDOUT: %t: %ptr.2ee = value_binding t, %t.param +// CHECK:STDOUT: %t: %ptr.2ee = wrapper_binding t, %t.param // CHECK:STDOUT: } // CHECK:STDOUT: %D1.F.decl.loc11_51.2: %D1.F.type.48cdab.2 = fn_decl @D1.F.loc11_51.2 [concrete = constants.%D1.F.bd5be1.2] { // CHECK:STDOUT: @@ -1587,13 +1587,13 @@ class T2(G2:! type) { // CHECK:STDOUT: %.loc10_24.2: type = specific_constant constants.%Derived, @Derived(constants.%T) [symbolic = %Derived (constants.%Derived)] // CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc10_24.2 [symbolic = %Derived (constants.%Derived)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @Derived.F.loc10_44.1.%Derived (%Derived) = value_binding self, %self.param +// CHECK:STDOUT: %self: @Derived.F.loc10_44.1.%Derived (%Derived) = wrapper_binding self, %self.param // CHECK:STDOUT: %t.param: @Derived.F.loc10_44.1.%ptr.loc10_41.1 (%ptr.e8f) = value_param call_param1 // CHECK:STDOUT: %.loc10_41: type = splice_block %ptr.loc10_41.2 [symbolic = %ptr.loc10_41.1 (constants.%ptr.e8f)] { // CHECK:STDOUT: %T.ref: type = name_ref T, @Derived.%T.loc7_16.2 [symbolic = %T (constants.%T)] // CHECK:STDOUT: %ptr.loc10_41.2: type = ptr_type %T.ref [symbolic = %ptr.loc10_41.1 (constants.%ptr.e8f)] // CHECK:STDOUT: } -// CHECK:STDOUT: %t: @Derived.F.loc10_44.1.%ptr.loc10_41.1 (%ptr.e8f) = value_binding t, %t.param +// CHECK:STDOUT: %t: @Derived.F.loc10_44.1.%ptr.loc10_41.1 (%ptr.e8f) = wrapper_binding t, %t.param // CHECK:STDOUT: } // CHECK:STDOUT: %Derived.F.decl.loc10_44.2: @Derived.%Derived.F.type.loc10_44.2 (%Derived.F.type.77405e.2) = fn_decl @Derived.F.loc10_44.2 [symbolic = @Derived.%Derived.F.loc10_44.2 (constants.%Derived.F.d85493.2)] { // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/nested.carbon b/toolchain/check/testdata/class/nested.carbon index bcf3ac89f944..f33eec5b13f2 100644 --- a/toolchain/check/testdata/class/nested.carbon +++ b/toolchain/check/testdata/class/nested.carbon @@ -168,7 +168,7 @@ fn F(a: Outer*) { // CHECK:STDOUT: %Outer.ref.loc45: type = name_ref Outer, file.%Outer.decl [concrete = constants.%Outer] // CHECK:STDOUT: %ptr.loc45: type = ptr_type %Outer.ref.loc45 [concrete = constants.%ptr.286] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %ptr.286 = value_binding a, %a.param +// CHECK:STDOUT: %a: %ptr.286 = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -227,7 +227,7 @@ fn F(a: Outer*) { // CHECK:STDOUT: %T.as.DefaultOrUnformed.impl.Op.call.loc18: init %Outer to %.loc18_5 = call %T.as.DefaultOrUnformed.impl.Op.specific_fn.1() // CHECK:STDOUT: assign %o.var, %T.as.DefaultOrUnformed.impl.Op.call.loc18 // CHECK:STDOUT: %Outer.ref: type = name_ref Outer, file.%Outer.decl [concrete = constants.%Outer] -// CHECK:STDOUT: %o: ref %Outer = ref_binding o, %o.var +// CHECK:STDOUT: %o: ref %Outer = wrapper_binding o, %o.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %i.patt: %pattern_type.dc4 = ref_binding_pattern i [concrete = constants.%i.patt.539460.1] // CHECK:STDOUT: %i.var_patt: %pattern_type.dc4 = var_pattern %i.patt [concrete = constants.%i.var_patt.15311d.1] @@ -242,7 +242,7 @@ fn F(a: Outer*) { // CHECK:STDOUT: %T.as.DefaultOrUnformed.impl.Op.call.loc19: init %Inner to %.loc19_5 = call %T.as.DefaultOrUnformed.impl.Op.specific_fn.2() // CHECK:STDOUT: assign %i.var, %T.as.DefaultOrUnformed.impl.Op.call.loc19 // CHECK:STDOUT: %Inner.ref: type = name_ref Inner, @Outer.%Inner.decl [concrete = constants.%Inner] -// CHECK:STDOUT: %i: ref %Inner = ref_binding i, %i.var +// CHECK:STDOUT: %i: ref %Inner = wrapper_binding i, %i.var // CHECK:STDOUT: %Destroy.Op.bound.loc19: = bound_method %i.var, constants.%Destroy.Op.1a2547.4 // CHECK:STDOUT: %Destroy.Op.call.loc19: init %empty_tuple.type = call %Destroy.Op.bound.loc19(%i.var) // CHECK:STDOUT: %Destroy.Op.bound.loc18: = bound_method %o.var, constants.%Destroy.Op.1a2547.6 @@ -266,7 +266,7 @@ fn F(a: Outer*) { // CHECK:STDOUT: %T.as.DefaultOrUnformed.impl.Op.call.loc29: init %Outer to %.loc29_7 = call %T.as.DefaultOrUnformed.impl.Op.specific_fn.1() // CHECK:STDOUT: assign %o.var, %T.as.DefaultOrUnformed.impl.Op.call.loc29 // CHECK:STDOUT: %Outer.ref: type = name_ref Outer, file.%Outer.decl [concrete = constants.%Outer] -// CHECK:STDOUT: %o: ref %Outer = ref_binding o, %o.var +// CHECK:STDOUT: %o: ref %Outer = wrapper_binding o, %o.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %i.patt: %pattern_type.dc4 = ref_binding_pattern i [concrete = constants.%i.patt.539460.2] // CHECK:STDOUT: %i.var_patt: %pattern_type.dc4 = var_pattern %i.patt [concrete = constants.%i.var_patt.15311d.2] @@ -281,7 +281,7 @@ fn F(a: Outer*) { // CHECK:STDOUT: %T.as.DefaultOrUnformed.impl.Op.call.loc30: init %Inner to %.loc30_7 = call %T.as.DefaultOrUnformed.impl.Op.specific_fn.2() // CHECK:STDOUT: assign %i.var, %T.as.DefaultOrUnformed.impl.Op.call.loc30 // CHECK:STDOUT: %Inner.ref: type = name_ref Inner, @Outer.%Inner.decl [concrete = constants.%Inner] -// CHECK:STDOUT: %i: ref %Inner = ref_binding i, %i.var +// CHECK:STDOUT: %i: ref %Inner = wrapper_binding i, %i.var // CHECK:STDOUT: %Destroy.Op.bound.loc30: = bound_method %i.var, constants.%Destroy.Op.1a2547.4 // CHECK:STDOUT: %Destroy.Op.call.loc30: init %empty_tuple.type = call %Destroy.Op.bound.loc30(%i.var) // CHECK:STDOUT: %Destroy.Op.bound.loc29: = bound_method %o.var, constants.%Destroy.Op.1a2547.6 @@ -305,7 +305,7 @@ fn F(a: Outer*) { // CHECK:STDOUT: %T.as.DefaultOrUnformed.impl.Op.call.loc36: init %Outer to %.loc36_5 = call %T.as.DefaultOrUnformed.impl.Op.specific_fn.1() // CHECK:STDOUT: assign %o.var, %T.as.DefaultOrUnformed.impl.Op.call.loc36 // CHECK:STDOUT: %Outer.ref: type = name_ref Outer, file.%Outer.decl [concrete = constants.%Outer] -// CHECK:STDOUT: %o: ref %Outer = ref_binding o, %o.var +// CHECK:STDOUT: %o: ref %Outer = wrapper_binding o, %o.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %i.patt: %pattern_type.dc4 = ref_binding_pattern i [concrete = constants.%i.patt.539460.3] // CHECK:STDOUT: %i.var_patt: %pattern_type.dc4 = var_pattern %i.patt [concrete = constants.%i.var_patt.15311d.3] @@ -320,7 +320,7 @@ fn F(a: Outer*) { // CHECK:STDOUT: %T.as.DefaultOrUnformed.impl.Op.call.loc37: init %Inner to %.loc37_5 = call %T.as.DefaultOrUnformed.impl.Op.specific_fn.2() // CHECK:STDOUT: assign %i.var, %T.as.DefaultOrUnformed.impl.Op.call.loc37 // CHECK:STDOUT: %Inner.ref: type = name_ref Inner, @Outer.%Inner.decl [concrete = constants.%Inner] -// CHECK:STDOUT: %i: ref %Inner = ref_binding i, %i.var +// CHECK:STDOUT: %i: ref %Inner = wrapper_binding i, %i.var // CHECK:STDOUT: %Destroy.Op.bound.loc37: = bound_method %i.var, constants.%Destroy.Op.1a2547.4 // CHECK:STDOUT: %Destroy.Op.call.loc37: init %empty_tuple.type = call %Destroy.Op.bound.loc37(%i.var) // CHECK:STDOUT: %Destroy.Op.bound.loc36: = bound_method %o.var, constants.%Destroy.Op.1a2547.6 @@ -367,7 +367,7 @@ fn F(a: Outer*) { // CHECK:STDOUT: %Inner.ref: type = name_ref Inner, @Outer.%Inner.decl [concrete = constants.%Inner] // CHECK:STDOUT: %ptr.loc46: type = ptr_type %Inner.ref [concrete = constants.%ptr.001] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %ptr.001 = value_binding b, %.loc46_29.2 +// CHECK:STDOUT: %b: %ptr.001 = wrapper_binding b, %.loc46_29.2 // CHECK:STDOUT: %a.ref.loc48_3: %ptr.286 = name_ref a, %a // CHECK:STDOUT: %.loc48_4.1: ref %Outer = deref %a.ref.loc48_3 // CHECK:STDOUT: %po.ref.loc48: %Outer.elem.3ef = name_ref po, @Outer.%.loc40 [concrete = @Outer.%.loc40] diff --git a/toolchain/check/testdata/class/nested_name.carbon b/toolchain/check/testdata/class/nested_name.carbon index bd3e3b06843b..c83bb1d47d66 100644 --- a/toolchain/check/testdata/class/nested_name.carbon +++ b/toolchain/check/testdata/class/nested_name.carbon @@ -124,7 +124,7 @@ fn G(o: Outer) { // CHECK:STDOUT: %Outer.ref: type = name_ref Outer, file.%Outer.decl [concrete = constants.%Outer] // CHECK:STDOUT: %Inner.ref: type = name_ref Inner, @Outer.%Inner.decl [concrete = constants.%Inner] // CHECK:STDOUT: } -// CHECK:STDOUT: %oi: %Inner = value_binding oi, %oi.param +// CHECK:STDOUT: %oi: %Inner = wrapper_binding oi, %oi.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -134,7 +134,7 @@ fn G(o: Outer) { // CHECK:STDOUT: } { // CHECK:STDOUT: %o.param: %Outer = value_param call_param0 // CHECK:STDOUT: %Outer.ref: type = name_ref Outer, file.%Outer.decl [concrete = constants.%Outer] -// CHECK:STDOUT: %o: %Outer = value_binding o, %o.param +// CHECK:STDOUT: %o: %Outer = wrapper_binding o, %o.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -191,7 +191,7 @@ fn G(o: Outer) { // CHECK:STDOUT: %o.ref: %Outer = name_ref o, %o // CHECK:STDOUT: %Inner.ref: type = name_ref Inner, @Outer.%Inner.decl [concrete = constants.%Inner] // CHECK:STDOUT: } -// CHECK:STDOUT: %i: ref %Inner = ref_binding i, %i.var +// CHECK:STDOUT: %i: ref %Inner = wrapper_binding i, %i.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %i.var, constants.%Destroy.Op.1a2547.4 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%i.var) // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/class/partial/qualifier.carbon b/toolchain/check/testdata/class/partial/qualifier.carbon index 684c26dfb1f5..98d5a5043536 100644 --- a/toolchain/check/testdata/class/partial/qualifier.carbon +++ b/toolchain/check/testdata/class/partial/qualifier.carbon @@ -197,7 +197,7 @@ fn F[T:! type](p: partial T*); // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %.loc6_9.2: type = partial_type %C.ref [concrete = constants.%.331] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %.331 = value_binding p, %p.param +// CHECK:STDOUT: %p: %.331 = wrapper_binding p, %p.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -225,7 +225,7 @@ fn F[T:! type](p: partial T*); // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %.loc6_9.2: type = partial_type %C.ref [concrete = constants.%.331] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %.331 = value_binding p, %p.param +// CHECK:STDOUT: %p: %.331 = wrapper_binding p, %p.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -253,7 +253,7 @@ fn F[T:! type](p: partial T*); // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %.loc6_13.2: type = partial_type %C.ref [concrete = constants.%.331] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: ref %.331 = ref_binding p, %p.param +// CHECK:STDOUT: %p: ref %.331 = wrapper_binding p, %p.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -281,7 +281,7 @@ fn F[T:! type](p: partial T*); // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %.loc10_9.2: type = partial_type %C.ref [concrete = constants.%.331] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %.331 = value_binding p, %p.param +// CHECK:STDOUT: %p: %.331 = wrapper_binding p, %p.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -309,7 +309,7 @@ fn F[T:! type](p: partial T*); // CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl [concrete = constants.%Derived] // CHECK:STDOUT: %.loc13_9.2: type = partial_type %Derived.ref [concrete = constants.%.546] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %.546 = value_binding p, %p.param +// CHECK:STDOUT: %p: %.546 = wrapper_binding p, %p.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -337,7 +337,7 @@ fn F[T:! type](p: partial T*); // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %.loc13_9.2: type = partial_type %C.ref [concrete = constants.%.331] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %.331 = value_binding p, %p.param +// CHECK:STDOUT: %p: %.331 = wrapper_binding p, %p.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -371,7 +371,7 @@ fn F[T:! type](p: partial T*); // CHECK:STDOUT: %.loc10_9.2: type = converted %.loc10_22, constants.%tuple.type.748 [concrete = constants.%tuple.type.748] // CHECK:STDOUT: %.loc10_9.3: type = partial_type %.loc10_9.2 [concrete = constants.%.8dc] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %.8dc = value_binding p, %p.param +// CHECK:STDOUT: %p: %.8dc = wrapper_binding p, %p.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -401,7 +401,7 @@ fn F[T:! type](p: partial T*); // CHECK:STDOUT: %struct_type.x: type = struct_type {.x: %C} [concrete = constants.%struct_type.x] // CHECK:STDOUT: %.loc10_9.2: type = partial_type %struct_type.x [concrete = constants.%.91f] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %.91f = value_binding p, %p.param +// CHECK:STDOUT: %p: %.91f = wrapper_binding p, %p.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -431,7 +431,7 @@ fn F[T:! type](p: partial T*); // CHECK:STDOUT: %.loc10_18: type = partial_type %C.ref [concrete = constants.%.331] // CHECK:STDOUT: %.loc10_9.2: type = partial_type %.loc10_18 [concrete = constants.%.d52] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %.d52 = value_binding p, %p.param +// CHECK:STDOUT: %p: %.d52 = wrapper_binding p, %p.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/redeclaration.carbon b/toolchain/check/testdata/class/redeclaration.carbon index 5e55eb87c689..021c67711942 100644 --- a/toolchain/check/testdata/class/redeclaration.carbon +++ b/toolchain/check/testdata/class/redeclaration.carbon @@ -61,13 +61,13 @@ fn Class.F(unused self, unused b: ()) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param.loc21: %Class = value_param call_param0 // CHECK:STDOUT: %Self.ref.loc21: type = name_ref Self, constants.%Class [concrete = constants.%Class] -// CHECK:STDOUT: %self.loc21: %Class = value_binding self, %self.param.loc21 +// CHECK:STDOUT: %self.loc21: %Class = wrapper_binding self, %self.param.loc21 // CHECK:STDOUT: %b.param.loc21: %empty_tuple.type = value_param call_param1 // CHECK:STDOUT: %.loc21_36.1: type = splice_block %.loc21_36.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc21_36.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc21_36.3: type = converted %.loc21_36.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.loc21: %empty_tuple.type = value_binding b, %b.param.loc21 +// CHECK:STDOUT: %b.loc21: %empty_tuple.type = wrapper_binding b, %b.param.loc21 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -80,13 +80,13 @@ fn Class.F(unused self, unused b: ()) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param.loc18: %Class = value_param call_param0 // CHECK:STDOUT: %Self.ref.loc18: type = name_ref Self, constants.%Class [concrete = constants.%Class] -// CHECK:STDOUT: %self.loc18: %Class = value_binding self, %self.param.loc18 +// CHECK:STDOUT: %self.loc18: %Class = wrapper_binding self, %self.param.loc18 // CHECK:STDOUT: %b.param.loc18: %empty_tuple.type = value_param call_param1 // CHECK:STDOUT: %.loc18_18.1: type = splice_block %.loc18_18.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc18_18.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc18_18.3: type = converted %.loc18_18.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.loc18: %empty_tuple.type = value_binding b, %b.param.loc18 +// CHECK:STDOUT: %b.loc18: %empty_tuple.type = wrapper_binding b, %b.param.loc18 // CHECK:STDOUT: } // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%empty_struct_type [concrete = constants.%complete_type] // CHECK:STDOUT: complete_type_witness = %complete_type diff --git a/toolchain/check/testdata/class/reorder_qualified.carbon b/toolchain/check/testdata/class/reorder_qualified.carbon index b5e5575804ac..35a983ac510f 100644 --- a/toolchain/check/testdata/class/reorder_qualified.carbon +++ b/toolchain/check/testdata/class/reorder_qualified.carbon @@ -272,7 +272,7 @@ class A { // CHECK:STDOUT: %.loc33_7: init %A = converted %.loc33_32.1, %.loc33_32.5 [concrete = constants.%A.val] // CHECK:STDOUT: assign %a.var, %.loc33_7 // CHECK:STDOUT: %A.ref: type = name_ref A, file.%A.decl [concrete = constants.%A] -// CHECK:STDOUT: %a: ref %A = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %A = wrapper_binding a, %a.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.e78 = ref_binding_pattern b [concrete = constants.%b.patt.245] // CHECK:STDOUT: %b.var_patt: %pattern_type.e78 = var_pattern %b.patt [concrete = constants.%b.var_patt] @@ -292,7 +292,7 @@ class A { // CHECK:STDOUT: %.loc34_7: init %B = converted %.loc34_32.1, %.loc34_32.5 [concrete = constants.%B.val] // CHECK:STDOUT: assign %b.var, %.loc34_7 // CHECK:STDOUT: %B.ref: type = name_ref B, @A.%B.decl [concrete = constants.%B] -// CHECK:STDOUT: %b: ref %B = ref_binding b, %b.var +// CHECK:STDOUT: %b: ref %B = wrapper_binding b, %b.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.ca8 = ref_binding_pattern c [concrete = constants.%c.patt.a75] // CHECK:STDOUT: %c.var_patt: %pattern_type.ca8 = var_pattern %c.patt [concrete = constants.%c.var_patt] @@ -312,7 +312,7 @@ class A { // CHECK:STDOUT: %.loc35_7: init %C = converted %.loc35_32.1, %.loc35_32.5 [concrete = constants.%C.val] // CHECK:STDOUT: assign %c.var, %.loc35_7 // CHECK:STDOUT: %C.ref: type = name_ref C, @B.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.a0b = ref_binding_pattern d [concrete = constants.%d.patt.60f] // CHECK:STDOUT: %d.var_patt: %pattern_type.a0b = var_pattern %d.patt [concrete = constants.%d.var_patt] @@ -332,7 +332,7 @@ class A { // CHECK:STDOUT: %.loc36_7: init %D = converted %.loc36_32.1, %.loc36_32.5 [concrete = constants.%D.val] // CHECK:STDOUT: assign %d.var, %.loc36_7 // CHECK:STDOUT: %D.ref: type = name_ref D, @C.%D.decl [concrete = constants.%D] -// CHECK:STDOUT: %d: ref %D = ref_binding d, %d.var +// CHECK:STDOUT: %d: ref %D = wrapper_binding d, %d.var // CHECK:STDOUT: %AF.ref: %A.AF.type = name_ref AF, @A.%A.AF.decl [concrete = constants.%A.AF] // CHECK:STDOUT: %A.AF.call: init %empty_tuple.type = call %AF.ref() // CHECK:STDOUT: %BF.ref: %B.BF.type = name_ref BF, @B.%B.BF.decl [concrete = constants.%B.BF] diff --git a/toolchain/check/testdata/class/scope.carbon b/toolchain/check/testdata/class/scope.carbon index aac562fb7cfe..032cdc2aeceb 100644 --- a/toolchain/check/testdata/class/scope.carbon +++ b/toolchain/check/testdata/class/scope.carbon @@ -191,7 +191,7 @@ fn Run() { // CHECK:STDOUT: %F.call: init %i32 = call %F.ref.loc30() // CHECK:STDOUT: assign %a.var, %F.call // CHECK:STDOUT: %i32.loc30: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: ref %i32 = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %i32 = wrapper_binding a, %a.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] @@ -202,7 +202,7 @@ fn Run() { // CHECK:STDOUT: %Class.F.call: init %i32 = call %F.ref.loc31() // CHECK:STDOUT: assign %b.var, %Class.F.call // CHECK:STDOUT: %i32.loc31: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: ref %i32 = ref_binding b, %b.var +// CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var // CHECK:STDOUT: %Destroy.Op.bound.loc31: = bound_method %b.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call.loc31: init %empty_tuple.type = call %Destroy.Op.bound.loc31(%b.var) // CHECK:STDOUT: %Destroy.Op.bound.loc30: = bound_method %a.var, constants.%Destroy.Op.1a2547.2 diff --git a/toolchain/check/testdata/class/self/fail_ref_self.carbon b/toolchain/check/testdata/class/self/fail_ref_self.carbon index f7c21f1bdd80..ffe691c3176a 100644 --- a/toolchain/check/testdata/class/self/fail_ref_self.carbon +++ b/toolchain/check/testdata/class/self/fail_ref_self.carbon @@ -100,13 +100,13 @@ fn F(c: Class, p: Class*) { // CHECK:STDOUT: } { // CHECK:STDOUT: %c.param: %Class = value_param call_param0 // CHECK:STDOUT: %Class.ref.loc21_9: type = name_ref Class, file.%Class.decl [concrete = constants.%Class] -// CHECK:STDOUT: %c: %Class = value_binding c, %c.param +// CHECK:STDOUT: %c: %Class = wrapper_binding c, %c.param // CHECK:STDOUT: %p.param: %ptr.7ee = value_param call_param1 // CHECK:STDOUT: %.loc21: type = splice_block %ptr [concrete = constants.%ptr.7ee] { // CHECK:STDOUT: %Class.ref.loc21_19: type = name_ref Class, file.%Class.decl [concrete = constants.%Class] // CHECK:STDOUT: %ptr: type = ptr_type %Class.ref.loc21_19 [concrete = constants.%ptr.7ee] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.7ee = value_binding p, %p.param +// CHECK:STDOUT: %p: %ptr.7ee = wrapper_binding p, %p.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -117,7 +117,7 @@ fn F(c: Class, p: Class*) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: ref %Class = ref_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Class [concrete = constants.%Class] -// CHECK:STDOUT: %self: ref %Class = ref_binding self, %self.param +// CHECK:STDOUT: %self: ref %Class = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%empty_struct_type [concrete = constants.%complete_type] // CHECK:STDOUT: complete_type_witness = %complete_type diff --git a/toolchain/check/testdata/class/self/raw_self.carbon b/toolchain/check/testdata/class/self/raw_self.carbon index 2afd99107fbe..bc4e212c4f65 100644 --- a/toolchain/check/testdata/class/self/raw_self.carbon +++ b/toolchain/check/testdata/class/self/raw_self.carbon @@ -98,10 +98,10 @@ fn Class.G(self, r#self: i32) -> (i32, i32) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param.loc21_16: ref %Class = ref_param call_param0 // CHECK:STDOUT: %Self.ref.loc21: type = name_ref Self, constants.%Class [concrete = constants.%Class] -// CHECK:STDOUT: %self.loc21_16: ref %Class = ref_binding self, %self.param.loc21_16 +// CHECK:STDOUT: %self.loc21_16: ref %Class = wrapper_binding self, %self.param.loc21_16 // CHECK:STDOUT: %self.param.loc21_28: %i32 = value_param call_param1 // CHECK:STDOUT: %i32.loc21: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %self.loc21_28: %i32 = value_binding r#self, %self.param.loc21_28 +// CHECK:STDOUT: %self.loc21_28: %i32 = wrapper_binding r#self, %self.param.loc21_28 // CHECK:STDOUT: } // CHECK:STDOUT: %Class.G.decl: %Class.G.type = fn_decl @Class.G [concrete = constants.%Class.G] { // CHECK:STDOUT: %self.param_patt.loc25_12: %pattern_type.f15 = value_param_pattern [concrete = constants.%self.param_patt.c01] @@ -118,10 +118,10 @@ fn Class.G(self, r#self: i32) -> (i32, i32) { // CHECK:STDOUT: %.loc25_43.3: Core.Form = init_form %.loc25_43.2 [concrete = constants.%.c11] // CHECK:STDOUT: %self.param.loc25_12: %Class = value_param call_param0 // CHECK:STDOUT: %Self.ref.loc25: type = name_ref Self, constants.%Class [concrete = constants.%Class] -// CHECK:STDOUT: %self.loc25_12: %Class = value_binding self, %self.param.loc25_12 +// CHECK:STDOUT: %self.loc25_12: %Class = wrapper_binding self, %self.param.loc25_12 // CHECK:STDOUT: %self.param.loc25_24: %i32 = value_param call_param1 // CHECK:STDOUT: %i32.loc25_26: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %self.loc25_24: %i32 = value_binding r#self, %self.param.loc25_24 +// CHECK:STDOUT: %self.loc25_24: %i32 = wrapper_binding r#self, %self.param.loc25_24 // CHECK:STDOUT: %return.param.loc25: ref %tuple.type.e55 = out_param call_param2 // CHECK:STDOUT: %return.loc25: ref %tuple.type.e55 = return_slot %return.param.loc25 // CHECK:STDOUT: } @@ -136,10 +136,10 @@ fn Class.G(self, r#self: i32) -> (i32, i32) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param.loc16_12: ref %Class = ref_param call_param0 // CHECK:STDOUT: %Self.ref.loc16: type = name_ref Self, constants.%Class [concrete = constants.%Class] -// CHECK:STDOUT: %self.loc16_12: ref %Class = ref_binding self, %self.param.loc16_12 +// CHECK:STDOUT: %self.loc16_12: ref %Class = wrapper_binding self, %self.param.loc16_12 // CHECK:STDOUT: %self.param.loc16_24: %i32 = value_param call_param1 // CHECK:STDOUT: %i32.loc16: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %self.loc16_24: %i32 = value_binding r#self, %self.param.loc16_24 +// CHECK:STDOUT: %self.loc16_24: %i32 = wrapper_binding r#self, %self.param.loc16_24 // CHECK:STDOUT: } // CHECK:STDOUT: %Class.G.decl: %Class.G.type = fn_decl @Class.G [concrete = constants.%Class.G] { // CHECK:STDOUT: %self.param_patt.loc25_12: %pattern_type.f15 = value_param_pattern [concrete = constants.%self.param_patt.c01] @@ -156,10 +156,10 @@ fn Class.G(self, r#self: i32) -> (i32, i32) { // CHECK:STDOUT: %.loc17_39.3: Core.Form = init_form %.loc17_39.2 [concrete = constants.%.c11] // CHECK:STDOUT: %self.param.loc17_8: %Class = value_param call_param0 // CHECK:STDOUT: %Self.ref.loc17: type = name_ref Self, constants.%Class [concrete = constants.%Class] -// CHECK:STDOUT: %self.loc17_8: %Class = value_binding self, %self.param.loc17_8 +// CHECK:STDOUT: %self.loc17_8: %Class = wrapper_binding self, %self.param.loc17_8 // CHECK:STDOUT: %self.param.loc17_20: %i32 = value_param call_param1 // CHECK:STDOUT: %i32.loc17_22: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %self.loc17_20: %i32 = value_binding r#self, %self.param.loc17_20 +// CHECK:STDOUT: %self.loc17_20: %i32 = wrapper_binding r#self, %self.param.loc17_20 // CHECK:STDOUT: %return.param.loc17: ref %tuple.type.e55 = out_param call_param2 // CHECK:STDOUT: %return.loc17: ref %tuple.type.e55 = return_slot %return.param.loc17 // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/self/raw_self_type.carbon b/toolchain/check/testdata/class/self/raw_self_type.carbon index cb1a475a5bea..5846ad61c842 100644 --- a/toolchain/check/testdata/class/self/raw_self_type.carbon +++ b/toolchain/check/testdata/class/self/raw_self_type.carbon @@ -110,10 +110,10 @@ fn MemberNamedSelf.F(unused x: Self, unused y: r#Self) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %x.param.loc28: %MemberNamedSelf = value_param call_param0 // CHECK:STDOUT: %Self.ref.loc28_32: type = name_ref Self, constants.%MemberNamedSelf [concrete = constants.%MemberNamedSelf] -// CHECK:STDOUT: %x.loc28: %MemberNamedSelf = value_binding x, %x.param.loc28 +// CHECK:STDOUT: %x.loc28: %MemberNamedSelf = wrapper_binding x, %x.param.loc28 // CHECK:STDOUT: %y.param.loc28: %Self.7fc = value_param call_param1 // CHECK:STDOUT: %Self.ref.loc28_48: type = name_ref r#Self, @MemberNamedSelf.%Self.decl [concrete = constants.%Self.7fc] -// CHECK:STDOUT: %y.loc28: %Self.7fc = value_binding y, %y.param.loc28 +// CHECK:STDOUT: %y.loc28: %Self.7fc = wrapper_binding y, %y.param.loc28 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -137,10 +137,10 @@ fn MemberNamedSelf.F(unused x: Self, unused y: r#Self) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %x.param.loc25: %MemberNamedSelf = value_param call_param0 // CHECK:STDOUT: %Self.ref.loc25_11: type = name_ref Self, constants.%MemberNamedSelf [concrete = constants.%MemberNamedSelf] -// CHECK:STDOUT: %x.loc25: %MemberNamedSelf = value_binding x, %x.param.loc25 +// CHECK:STDOUT: %x.loc25: %MemberNamedSelf = wrapper_binding x, %x.param.loc25 // CHECK:STDOUT: %y.param.loc25: %Self.7fc = value_param call_param1 // CHECK:STDOUT: %Self.ref.loc25_20: type = name_ref r#Self, @MemberNamedSelf.%Self.decl [concrete = constants.%Self.7fc] -// CHECK:STDOUT: %y.loc25: %Self.7fc = value_binding y, %y.param.loc25 +// CHECK:STDOUT: %y.loc25: %Self.7fc = wrapper_binding y, %y.param.loc25 // CHECK:STDOUT: } // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%empty_struct_type [concrete = constants.%complete_type.357] // CHECK:STDOUT: complete_type_witness = %complete_type @@ -177,7 +177,7 @@ fn MemberNamedSelf.F(unused x: Self, unused y: r#Self) {} // CHECK:STDOUT: %Self.ref.loc17: type = name_ref Self, constants.%Class [concrete = constants.%Class] // CHECK:STDOUT: %ptr.loc17: type = ptr_type %Self.ref.loc17 [concrete = constants.%ptr.7ee] // CHECK:STDOUT: } -// CHECK:STDOUT: %Self: ref %ptr.7ee = ref_binding r#Self, %Self.var +// CHECK:STDOUT: %Self: ref %ptr.7ee = wrapper_binding r#Self, %Self.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %p.patt: %pattern_type.8c5 = ref_binding_pattern p [concrete = constants.%p.patt] // CHECK:STDOUT: %p.var_patt: %pattern_type.8c5 = var_pattern %p.patt [concrete = constants.%p.var_patt] @@ -195,7 +195,7 @@ fn MemberNamedSelf.F(unused x: Self, unused y: r#Self) {} // CHECK:STDOUT: %Self.ref.loc18_19: type = name_ref Self, constants.%Class [concrete = constants.%Class] // CHECK:STDOUT: %ptr.loc18: type = ptr_type %Self.ref.loc18_19 [concrete = constants.%ptr.7ee] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: ref %ptr.7ee = ref_binding p, %p.var +// CHECK:STDOUT: %p: ref %ptr.7ee = wrapper_binding p, %p.var // CHECK:STDOUT: %Destroy.Op.bound.loc18: = bound_method %p.var, constants.%Destroy.Op // CHECK:STDOUT: %Destroy.Op.call.loc18: init %empty_tuple.type = call %Destroy.Op.bound.loc18(%p.var) // CHECK:STDOUT: %Destroy.Op.bound.loc17: = bound_method %Self.var, constants.%Destroy.Op diff --git a/toolchain/check/testdata/class/self/self.carbon b/toolchain/check/testdata/class/self/self.carbon index a5c8ad69f521..e00d61435bea 100644 --- a/toolchain/check/testdata/class/self/self.carbon +++ b/toolchain/check/testdata/class/self/self.carbon @@ -160,7 +160,7 @@ class Class { // CHECK:STDOUT: %.loc13: Core.Form = init_form %i32.loc13 [concrete = constants.%.795] // CHECK:STDOUT: %self.param.loc13: %Class = value_param call_param0 // CHECK:STDOUT: %Self.ref.loc13: type = name_ref Self, constants.%Class [concrete = constants.%Class] -// CHECK:STDOUT: %self.loc13: %Class = value_binding self, %self.param.loc13 +// CHECK:STDOUT: %self.loc13: %Class = wrapper_binding self, %self.param.loc13 // CHECK:STDOUT: %return.param.loc13: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return.loc13: ref %i32 = return_slot %return.param.loc13 // CHECK:STDOUT: } @@ -174,7 +174,7 @@ class Class { // CHECK:STDOUT: %.loc17: Core.Form = init_form %i32.loc17 [concrete = constants.%.795] // CHECK:STDOUT: %self.param.loc17: ref %Class = ref_param call_param0 // CHECK:STDOUT: %Self.ref.loc17: type = name_ref Self, constants.%Class [concrete = constants.%Class] -// CHECK:STDOUT: %self.loc17: ref %Class = ref_binding self, %self.param.loc17 +// CHECK:STDOUT: %self.loc17: ref %Class = wrapper_binding self, %self.param.loc17 // CHECK:STDOUT: %return.param.loc17: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return.loc17: ref %i32 = return_slot %return.param.loc17 // CHECK:STDOUT: } @@ -191,7 +191,7 @@ class Class { // CHECK:STDOUT: %.loc5: Core.Form = init_form %i32.loc5 [concrete = constants.%.795] // CHECK:STDOUT: %self.param.loc5: %Class = value_param call_param0 // CHECK:STDOUT: %Self.ref.loc5: type = name_ref Self, constants.%Class [concrete = constants.%Class] -// CHECK:STDOUT: %self.loc5: %Class = value_binding self, %self.param.loc5 +// CHECK:STDOUT: %self.loc5: %Class = wrapper_binding self, %self.param.loc5 // CHECK:STDOUT: %return.param.loc5: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return.loc5: ref %i32 = return_slot %return.param.loc5 // CHECK:STDOUT: } @@ -205,7 +205,7 @@ class Class { // CHECK:STDOUT: %.loc7: Core.Form = init_form %i32.loc7 [concrete = constants.%.795] // CHECK:STDOUT: %self.param.loc7: ref %Class = ref_param call_param0 // CHECK:STDOUT: %Self.ref.loc7: type = name_ref Self, constants.%Class [concrete = constants.%Class] -// CHECK:STDOUT: %self.loc7: ref %Class = ref_binding self, %self.param.loc7 +// CHECK:STDOUT: %self.loc7: ref %Class = wrapper_binding self, %self.param.loc7 // CHECK:STDOUT: %return.param.loc7: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return.loc7: ref %i32 = return_slot %return.param.loc7 // CHECK:STDOUT: } @@ -287,7 +287,7 @@ class Class { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %Class = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Class [concrete = constants.%Class] -// CHECK:STDOUT: %self: %Class = value_binding self, %self.param +// CHECK:STDOUT: %self: %Class = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %Class.G.decl: %Class.G.type.321a2c.2 = fn_decl @Class.G.loc25 [concrete = constants.%Class.G.d407b2.2] { // CHECK:STDOUT: %self.param_patt: %pattern_type = value_param_pattern [concrete = constants.%self.param_patt] @@ -295,7 +295,7 @@ class Class { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %Class = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Class [concrete = constants.%Class] -// CHECK:STDOUT: %self: %Class = value_binding self, %self.param +// CHECK:STDOUT: %self: %Class = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -306,7 +306,7 @@ class Class { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %Class = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Class [concrete = constants.%Class] -// CHECK:STDOUT: %self: %Class = value_binding self, %self.param +// CHECK:STDOUT: %self: %Class = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %Class.G.decl: %Class.G.type.321a2c.1 = fn_decl @Class.G.loc5 [concrete = constants.%Class.G.d407b2.1] { // CHECK:STDOUT: %self.param_patt: %pattern_type = value_param_pattern [concrete = constants.%self.param_patt] @@ -314,7 +314,7 @@ class Class { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %Class = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Class [concrete = constants.%Class] -// CHECK:STDOUT: %self: %Class = value_binding self, %self.param +// CHECK:STDOUT: %self: %Class = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%empty_struct_type [concrete = constants.%complete_type] // CHECK:STDOUT: complete_type_witness = %complete_type @@ -374,7 +374,7 @@ class Class { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %Class = value_param call_param0 // CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [concrete = constants.%Class] -// CHECK:STDOUT: %self: %Class = value_binding self, %self.param +// CHECK:STDOUT: %self: %Class = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -385,7 +385,7 @@ class Class { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %Class = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Class [concrete = constants.%Class] -// CHECK:STDOUT: %self: %Class = value_binding self, %self.param +// CHECK:STDOUT: %self: %Class = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%empty_struct_type [concrete = constants.%complete_type] // CHECK:STDOUT: complete_type_witness = %complete_type @@ -446,7 +446,7 @@ class Class { // CHECK:STDOUT: %.loc11: type = converted %self.ref, [concrete = ] // CHECK:STDOUT: %self.param: %Class = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Class [concrete = constants.%Class] -// CHECK:STDOUT: %self: %Class = value_binding self, %self.param +// CHECK:STDOUT: %self: %Class = wrapper_binding self, %self.param // CHECK:STDOUT: %return: = return_slot // CHECK:STDOUT: } // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%empty_struct_type [concrete = constants.%complete_type] diff --git a/toolchain/check/testdata/class/self/self_type.carbon b/toolchain/check/testdata/class/self/self_type.carbon index 2d5bc648090f..05030d37fe9f 100644 --- a/toolchain/check/testdata/class/self/self_type.carbon +++ b/toolchain/check/testdata/class/self/self_type.carbon @@ -109,7 +109,7 @@ fn Class.F(self) -> i32 { // CHECK:STDOUT: %.loc25: Core.Form = init_form %i32.loc25 [concrete = constants.%.795] // CHECK:STDOUT: %self.param.loc25: %Class = value_param call_param0 // CHECK:STDOUT: %Self.ref.loc25: type = name_ref Self, constants.%Class [concrete = constants.%Class] -// CHECK:STDOUT: %self.loc25: %Class = value_binding self, %self.param.loc25 +// CHECK:STDOUT: %self.loc25: %Class = wrapper_binding self, %self.param.loc25 // CHECK:STDOUT: %return.param.loc25: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return.loc25: ref %i32 = return_slot %return.param.loc25 // CHECK:STDOUT: } @@ -126,7 +126,7 @@ fn Class.F(self) -> i32 { // CHECK:STDOUT: %.loc16: Core.Form = init_form %i32.loc16 [concrete = constants.%.795] // CHECK:STDOUT: %self.param.loc16: %Class = value_param call_param0 // CHECK:STDOUT: %Self.ref.loc16: type = name_ref Self, constants.%Class [concrete = constants.%Class] -// CHECK:STDOUT: %self.loc16: %Class = value_binding self, %self.param.loc16 +// CHECK:STDOUT: %self.loc16: %Class = wrapper_binding self, %self.param.loc16 // CHECK:STDOUT: %return.param.loc16: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return.loc16: ref %i32 = return_slot %return.param.loc16 // CHECK:STDOUT: } @@ -179,7 +179,7 @@ fn Class.F(self) -> i32 { // CHECK:STDOUT: %T.as.DefaultOrUnformed.impl.Op.call: init %Class to %.loc17_16.1 = call %T.as.DefaultOrUnformed.impl.Op.specific_fn() // CHECK:STDOUT: assign %return.param, %T.as.DefaultOrUnformed.impl.Op.call // CHECK:STDOUT: %Self.ref.loc18: type = name_ref Self, constants.%Class [concrete = constants.%Class] -// CHECK:STDOUT: %s: ref %Class = ref_binding s, %return.param +// CHECK:STDOUT: %s: ref %Class = wrapper_binding s, %return.param // CHECK:STDOUT: %s.ref.loc19_5: ref %Class = name_ref s, %s // CHECK:STDOUT: %s.ref.loc19_16: ref %Class = name_ref s, %s // CHECK:STDOUT: %addr: %ptr.7ee = addr_of %s.ref.loc19_16 diff --git a/toolchain/check/testdata/class/syntactic_merge.carbon b/toolchain/check/testdata/class/syntactic_merge.carbon index 27fc14703176..5db12d1dff4a 100644 --- a/toolchain/check/testdata/class/syntactic_merge.carbon +++ b/toolchain/check/testdata/class/syntactic_merge.carbon @@ -1230,7 +1230,7 @@ fn Base.F(ref self: Base) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: ref %Base = ref_param call_param0 // CHECK:STDOUT: %Base.ref: type = name_ref Base, file.%Base.decl [concrete = constants.%Base] -// CHECK:STDOUT: %self: ref %Base = ref_binding self, %self.param +// CHECK:STDOUT: %self: ref %Base = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1242,7 +1242,7 @@ fn Base.F(ref self: Base) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: ref %Base = ref_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Base [concrete = constants.%Base] -// CHECK:STDOUT: %self: ref %Base = ref_binding self, %self.param +// CHECK:STDOUT: %self: ref %Base = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%struct_type.a [concrete = constants.%complete_type] // CHECK:STDOUT: complete_type_witness = %complete_type diff --git a/toolchain/check/testdata/const/basics.carbon b/toolchain/check/testdata/const/basics.carbon index 812a962f16a2..449266dc0d3e 100644 --- a/toolchain/check/testdata/const/basics.carbon +++ b/toolchain/check/testdata/const/basics.carbon @@ -204,7 +204,7 @@ fn PassConstReferenceToReference(p: const X*) { // CHECK:STDOUT: %ptr.loc6_16: type = ptr_type %const.loc6_9 [concrete = constants.%ptr.77f] // CHECK:STDOUT: %ptr.loc6_17: type = ptr_type %ptr.loc6_16 [concrete = constants.%ptr.0c8] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.0c8 = value_binding p, %p.param +// CHECK:STDOUT: %p: %ptr.0c8 = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref %ptr.0c8 = out_param call_param1 // CHECK:STDOUT: %return: ref %ptr.0c8 = return_slot %return.param // CHECK:STDOUT: } @@ -224,7 +224,7 @@ fn PassConstReferenceToReference(p: const X*) { // CHECK:STDOUT: %ptr.loc10_17: type = ptr_type %C.ref.loc10_16 [concrete = constants.%ptr.6b6] // CHECK:STDOUT: %const.loc10_9: type = const_type %ptr.loc10_17 [concrete = constants.%const.0f8] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %const.0f8 = value_binding p, %p.param +// CHECK:STDOUT: %p: %const.0f8 = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref %const.0f8 = out_param call_param1 // CHECK:STDOUT: %return: ref %const.0f8 = return_slot %return.param // CHECK:STDOUT: } @@ -309,7 +309,7 @@ fn PassConstReferenceToReference(p: const X*) { // CHECK:STDOUT: %ptr.loc11_16: type = ptr_type %const.loc11_9 [concrete = constants.%ptr.77f] // CHECK:STDOUT: %ptr.loc11_17: type = ptr_type %ptr.loc11_16 [concrete = constants.%ptr.0c8] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.0c8 = value_binding p, %p.param +// CHECK:STDOUT: %p: %ptr.0c8 = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref %ptr.0c8 = out_param call_param1 // CHECK:STDOUT: %return: ref %ptr.0c8 = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/const/import.carbon b/toolchain/check/testdata/const/import.carbon index b5204f949529..64c68dc6cca3 100644 --- a/toolchain/check/testdata/const/import.carbon +++ b/toolchain/check/testdata/const/import.carbon @@ -83,7 +83,7 @@ var a_ptr: const C* = a_ptr_ref; // CHECK:STDOUT: %const.loc6: type = const_type %C.ref.loc6 [concrete = constants.%const.13f] // CHECK:STDOUT: %ptr.loc6: type = ptr_type %const.loc6 [concrete = constants.%ptr.77f] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %ptr.77f = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %ptr.77f = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %a_ptr.patt: %pattern_type.7d2 = ref_binding_pattern a_ptr [concrete = constants.%a_ptr.patt] // CHECK:STDOUT: %a_ptr.var_patt: %pattern_type.7d2 = var_pattern %a_ptr.patt [concrete = constants.%a_ptr.var_patt] @@ -94,7 +94,7 @@ var a_ptr: const C* = a_ptr_ref; // CHECK:STDOUT: %const.loc7: type = const_type %C.ref.loc7 [concrete = constants.%const.13f] // CHECK:STDOUT: %ptr.loc7: type = ptr_type %const.loc7 [concrete = constants.%ptr.77f] // CHECK:STDOUT: } -// CHECK:STDOUT: %a_ptr: ref %ptr.77f = ref_binding a_ptr, %a_ptr.var [concrete = %a_ptr.var] +// CHECK:STDOUT: %a_ptr: ref %ptr.77f = wrapper_binding a_ptr, %a_ptr.var [concrete = %a_ptr.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/deduce/array.carbon b/toolchain/check/testdata/deduce/array.carbon index 7ef02bee984b..8d98fe5bf4cf 100644 --- a/toolchain/check/testdata/deduce/array.carbon +++ b/toolchain/check/testdata/deduce/array.carbon @@ -235,7 +235,7 @@ fn G() { // CHECK:STDOUT: %int_3: Core.IntLiteral = int_value 3 [concrete = constants.%int_3] // CHECK:STDOUT: %array_type.loc6_29.2: type = array_type %int_3, %T.ref.loc6_25 [symbolic = %array_type.loc6_29.1 (constants.%array_type.3ec)] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: @F.%array_type.loc6_29.1 (%array_type.3ec) = value_binding a, %a.param +// CHECK:STDOUT: %a: @F.%array_type.loc6_29.1 (%array_type.3ec) = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref @F.%T.loc6_7.1 (%T) = out_param call_param1 // CHECK:STDOUT: %return: ref @F.%T.loc6_7.1 (%T) = return_slot %return.param // CHECK:STDOUT: } @@ -316,7 +316,7 @@ fn G() { // CHECK:STDOUT: %int_3: Core.IntLiteral = int_value 3 [concrete = constants.%int_3] // CHECK:STDOUT: %array_type: type = array_type %int_3, %C.ref.loc9 [concrete = constants.%array_type.9a3] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %array_type.9a3 = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %array_type.9a3 = wrapper_binding a, %a.var // CHECK:STDOUT: %F.ref: %F.type = name_ref F, file.%F.decl [concrete = constants.%F] // CHECK:STDOUT: %a.ref: ref %array_type.9a3 = name_ref a, %a // CHECK:STDOUT: %F.specific_fn: = specific_function %F.ref, @F(constants.%C) [concrete = constants.%F.specific_fn.e0d] @@ -491,7 +491,7 @@ fn G() { // CHECK:STDOUT: %N.ref.loc6_46: Core.IntLiteral = name_ref N, %N.loc6_7.2 [symbolic = %N.loc6_7.1 (constants.%N)] // CHECK:STDOUT: %array_type.loc6_47.2: type = array_type %N.ref.loc6_46, %C.ref [symbolic = %array_type.loc6_47.1 (constants.%array_type.87f)] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: @F.%array_type.loc6_47.1 (%array_type.87f) = value_binding a, %a.param +// CHECK:STDOUT: %a: @F.%array_type.loc6_47.1 (%array_type.87f) = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -572,7 +572,7 @@ fn G() { // CHECK:STDOUT: %int_3: Core.IntLiteral = int_value 3 [concrete = constants.%int_3.1ba] // CHECK:STDOUT: %array_type: type = array_type %int_3, %C.ref [concrete = constants.%array_type.9a3] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %array_type.9a3 = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %array_type.9a3 = wrapper_binding a, %a.var // CHECK:STDOUT: %F.ref: %F.type = name_ref F, file.%F.decl [concrete = constants.%F] // CHECK:STDOUT: %a.ref: ref %array_type.9a3 = name_ref a, %a // CHECK:STDOUT: %F.specific_fn: = specific_function %F.ref, @F(constants.%int_3.1ba) [concrete = constants.%F.specific_fn] @@ -708,7 +708,7 @@ fn G() { // CHECK:STDOUT: %N.ref: Core.IntLiteral = name_ref N, %N.loc6_17.2 [symbolic = %N.loc6_17.1 (constants.%N)] // CHECK:STDOUT: %array_type.loc6_57.2: type = array_type %N.ref, %T.ref [symbolic = %array_type.loc6_57.1 (constants.%array_type.6d2)] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: @F.%array_type.loc6_57.1 (%array_type.6d2) = value_binding a, %a.param +// CHECK:STDOUT: %a: @F.%array_type.loc6_57.1 (%array_type.6d2) = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [concrete = constants.%G] {} {} // CHECK:STDOUT: } @@ -771,7 +771,7 @@ fn G() { // CHECK:STDOUT: %int_3: Core.IntLiteral = int_value 3 [concrete = constants.%int_3] // CHECK:STDOUT: %array_type: type = array_type %int_3, %C.ref [concrete = constants.%array_type.9a3] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %array_type.9a3 = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %array_type.9a3 = wrapper_binding a, %a.var // CHECK:STDOUT: %F.ref: %F.type = name_ref F, file.%F.decl [concrete = constants.%F] // CHECK:STDOUT: %a.ref: ref %array_type.9a3 = name_ref a, %a // CHECK:STDOUT: %F.specific_fn: = specific_function %F.ref, @F(constants.%C, constants.%int_3) [concrete = constants.%F.specific_fn] @@ -915,7 +915,7 @@ fn G() { // CHECK:STDOUT: %int_2: Core.IntLiteral = int_value 2 [concrete = constants.%int_2] // CHECK:STDOUT: %array_type.loc6_29.2: type = array_type %int_2, %T.ref.loc6_25 [symbolic = %array_type.loc6_29.1 (constants.%array_type.a0b)] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: @F.%array_type.loc6_29.1 (%array_type.a0b) = value_binding a, %a.param +// CHECK:STDOUT: %a: @F.%array_type.loc6_29.1 (%array_type.a0b) = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref @F.%T.loc6_7.1 (%T) = out_param call_param1 // CHECK:STDOUT: %return: ref @F.%T.loc6_7.1 (%T) = return_slot %return.param // CHECK:STDOUT: } @@ -996,7 +996,7 @@ fn G() { // CHECK:STDOUT: %int_3: Core.IntLiteral = int_value 3 [concrete = constants.%int_3] // CHECK:STDOUT: %array_type: type = array_type %int_3, %C.ref.loc10 [concrete = constants.%array_type.9a3] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %array_type.9a3 = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %array_type.9a3 = wrapper_binding a, %a.var // CHECK:STDOUT: %F.ref: %F.type = name_ref F, file.%F.decl [concrete = constants.%F] // CHECK:STDOUT: %a.ref: ref %array_type.9a3 = name_ref a, %a // CHECK:STDOUT: %F.specific_fn: = specific_function %F.ref, @F(constants.%C) [concrete = constants.%F.specific_fn.e0d] @@ -1176,7 +1176,7 @@ fn G() { // CHECK:STDOUT: %N.ref.loc7_46: Core.IntLiteral = name_ref N, %N.loc7_7.2 [symbolic = %N.loc7_7.1 (constants.%N)] // CHECK:STDOUT: %array_type.loc7_47.2: type = array_type %N.ref.loc7_46, %C.ref [symbolic = %array_type.loc7_47.1 (constants.%array_type.87f)] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: @F.%array_type.loc7_47.1 (%array_type.87f) = value_binding a, %a.param +// CHECK:STDOUT: %a: @F.%array_type.loc7_47.1 (%array_type.87f) = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -1265,7 +1265,7 @@ fn G() { // CHECK:STDOUT: %int_3: Core.IntLiteral = int_value 3 [concrete = constants.%int_3.1ba] // CHECK:STDOUT: %array_type: type = array_type %int_3, %D.ref [concrete = constants.%array_type.cec] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %array_type.cec = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %array_type.cec = wrapper_binding a, %a.var // CHECK:STDOUT: %F.ref: %F.type = name_ref F, file.%F.decl [concrete = constants.%F] // CHECK:STDOUT: %a.ref: ref %array_type.cec = name_ref a, %a // CHECK:STDOUT: %F.specific_fn: = specific_function %F.ref, @F(constants.%int_3.1ba) [concrete = constants.%F.specific_fn] @@ -1442,7 +1442,7 @@ fn G() { // CHECK:STDOUT: %.loc6_34.2: Core.IntLiteral = converted %N.ref.loc6_34, %.loc6_34.1 [symbolic = %Int.as.ImplicitAs.impl.Convert.call.loc6_34.1 (constants.%Int.as.ImplicitAs.impl.Convert.call)] // CHECK:STDOUT: %array_type.loc6_35.2: type = array_type %.loc6_34.2, %C.ref [symbolic = %array_type.loc6_35.1 (constants.%array_type.47c)] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: @F.%array_type.loc6_35.1 (%array_type.47c) = value_binding a, %a.param +// CHECK:STDOUT: %a: @F.%array_type.loc6_35.1 (%array_type.47c) = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -1524,7 +1524,7 @@ fn G() { // CHECK:STDOUT: %int_3: Core.IntLiteral = int_value 3 [concrete = constants.%int_3] // CHECK:STDOUT: %array_type: type = array_type %int_3, %C.ref [concrete = constants.%array_type.9a3] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %array_type.9a3 = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %array_type.9a3 = wrapper_binding a, %a.var // CHECK:STDOUT: %F.ref: %F.type = name_ref F, file.%F.decl [concrete = constants.%F] // CHECK:STDOUT: %a.ref: ref %array_type.9a3 = name_ref a, %a // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %a.var, constants.%Destroy.Op.1a2547.3 @@ -1646,7 +1646,7 @@ fn G() { // CHECK:STDOUT: %.loc5_34.2: Core.IntLiteral = converted %N.ref, %.loc5_34.1 [symbolic = %Int.as.ImplicitAs.impl.Convert.call.loc5_34.1 (constants.%Int.as.ImplicitAs.impl.Convert.call)] // CHECK:STDOUT: %array_type.loc5_35.2: type = array_type %.loc5_34.2, %C.ref [symbolic = %array_type.loc5_35.1 (constants.%array_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: @F.%array_type.loc5_35.1 (%array_type) = value_binding a, %a.param +// CHECK:STDOUT: %a: @F.%array_type.loc5_35.1 (%array_type) = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [concrete = constants.%G] {} {} // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/deduce/generic_type.carbon b/toolchain/check/testdata/deduce/generic_type.carbon index 95f039b6288e..8d809eb26153 100644 --- a/toolchain/check/testdata/deduce/generic_type.carbon +++ b/toolchain/check/testdata/deduce/generic_type.carbon @@ -154,7 +154,7 @@ fn G() -> i32 { // CHECK:STDOUT: %T.ref.loc7_21: type = name_ref T, %T.loc7_7.2 [symbolic = %T.loc7_7.1 (constants.%T)] // CHECK:STDOUT: %C.loc7_22.2: type = class_type @C, @C(constants.%T) [symbolic = %C.loc7_22.1 (constants.%C.1d0)] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: @F.%C.loc7_22.1 (%C.1d0) = value_binding p, %p.param +// CHECK:STDOUT: %p: @F.%C.loc7_22.1 (%C.1d0) = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref @F.%T.loc7_7.1 (%T) = out_param call_param1 // CHECK:STDOUT: %return: ref @F.%T.loc7_7.1 (%T) = return_slot %return.param // CHECK:STDOUT: } @@ -172,7 +172,7 @@ fn G() -> i32 { // CHECK:STDOUT: %D.ref.loc9_11: type = name_ref D, file.%D.decl [concrete = constants.%D] // CHECK:STDOUT: %C: type = class_type @C, @C(constants.%D) [concrete = constants.%C.aae] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %C.aae = value_binding p, %p.param +// CHECK:STDOUT: %p: %C.aae = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref %D = out_param call_param1 // CHECK:STDOUT: %return: ref %D = return_slot %return.param // CHECK:STDOUT: } @@ -369,7 +369,7 @@ fn G() -> i32 { // CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc7_7.2 [symbolic = %T.loc7_7.1 (constants.%T)] // CHECK:STDOUT: %I.loc7_22.2: type = class_type @I, @I(constants.%T) [symbolic = %I.loc7_22.1 (constants.%I.76e)] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: @F.%I.loc7_22.1 (%I.76e) = value_binding p, %p.param +// CHECK:STDOUT: %p: @F.%I.loc7_22.1 (%I.76e) = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref %C = out_param call_param1 // CHECK:STDOUT: %return: ref %C = return_slot %return.param // CHECK:STDOUT: } @@ -387,7 +387,7 @@ fn G() -> i32 { // CHECK:STDOUT: %C.ref.loc9_11: type = name_ref C, file.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %I: type = class_type @I, @I(constants.%C) [concrete = constants.%I.d0b] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %I.d0b = value_binding p, %p.param +// CHECK:STDOUT: %p: %I.d0b = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref %C = out_param call_param1 // CHECK:STDOUT: %return: ref %C = return_slot %return.param // CHECK:STDOUT: } @@ -605,7 +605,7 @@ fn G() -> i32 { // CHECK:STDOUT: %U.ref.loc13_44: type = name_ref U, %U.loc13_17.2 [symbolic = %U.loc13_17.1 (constants.%U)] // CHECK:STDOUT: %Inner.loc13_45.2: type = class_type @Inner, @Inner(constants.%T, constants.%U) [symbolic = %Inner.loc13_45.1 (constants.%Inner.34b)] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: @F.%Inner.loc13_45.1 (%Inner.34b) = value_binding p, %p.param +// CHECK:STDOUT: %p: @F.%Inner.loc13_45.1 (%Inner.34b) = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref @F.%tuple.type (%tuple.type.a5e) = out_param call_param1 // CHECK:STDOUT: %return: ref @F.%tuple.type (%tuple.type.a5e) = return_slot %return.param // CHECK:STDOUT: } @@ -630,7 +630,7 @@ fn G() -> i32 { // CHECK:STDOUT: %D.ref.loc15_24: type = name_ref D, file.%D.decl [concrete = constants.%D] // CHECK:STDOUT: %Inner: type = class_type @Inner, @Inner(constants.%C, constants.%D) [concrete = constants.%Inner.3ff] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %Inner.3ff = value_binding p, %p.param +// CHECK:STDOUT: %p: %Inner.3ff = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref %tuple.type.af1 = out_param call_param1 // CHECK:STDOUT: %return: ref %tuple.type.af1 = return_slot %return.param // CHECK:STDOUT: } @@ -955,7 +955,7 @@ fn G() -> i32 { // CHECK:STDOUT: %N.ref.loc6_37: %i32 = name_ref N, %N.loc6_7.2 [symbolic = %N.loc6_7.1 (constants.%N.37f)] // CHECK:STDOUT: %WithNontype.loc6_38.2: type = class_type @WithNontype, @WithNontype(constants.%N.37f) [symbolic = %WithNontype.loc6_38.1 (constants.%WithNontype.40e)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @F.%WithNontype.loc6_38.1 (%WithNontype.40e) = value_binding x, %x.param +// CHECK:STDOUT: %x: @F.%WithNontype.loc6_38.1 (%WithNontype.40e) = wrapper_binding x, %x.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/deduce/int_float.carbon b/toolchain/check/testdata/deduce/int_float.carbon index a5786f424dc7..885311f85569 100644 --- a/toolchain/check/testdata/deduce/int_float.carbon +++ b/toolchain/check/testdata/deduce/int_float.carbon @@ -124,7 +124,7 @@ fn G(a: f64) -> Core.IntLiteral { // CHECK:STDOUT: %N.ref.loc4: Core.IntLiteral = name_ref N, %N.loc4_7.2 [symbolic = %N.loc4_7.1 (constants.%N)] // CHECK:STDOUT: %Int.loc4_47.2: type = class_type @Int, @Int(constants.%N) [symbolic = %Int.loc4_47.1 (constants.%Int)] // CHECK:STDOUT: } -// CHECK:STDOUT: %n: @F.%Int.loc4_47.1 (%Int) = value_binding n, %n.param +// CHECK:STDOUT: %n: @F.%Int.loc4_47.1 (%Int) = wrapper_binding n, %n.param // CHECK:STDOUT: %return.param: ref Core.IntLiteral = out_param call_param1 // CHECK:STDOUT: %return: ref Core.IntLiteral = return_slot %return.param // CHECK:STDOUT: } @@ -139,7 +139,7 @@ fn G(a: f64) -> Core.IntLiteral { // CHECK:STDOUT: %.loc8: Core.Form = init_form %IntLiteral.ref [concrete = constants.%.f7d] // CHECK:STDOUT: %a.param: %i64 = value_param call_param0 // CHECK:STDOUT: %i64: type = type_literal constants.%i64 [concrete = constants.%i64] -// CHECK:STDOUT: %a: %i64 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i64 = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref Core.IntLiteral = out_param call_param1 // CHECK:STDOUT: %return: ref Core.IntLiteral = return_slot %return.param // CHECK:STDOUT: } @@ -286,7 +286,7 @@ fn G(a: f64) -> Core.IntLiteral { // CHECK:STDOUT: %N.ref.loc4: Core.IntLiteral = name_ref N, %N.loc4_7.2 [symbolic = %N.loc4_7.1 (constants.%N)] // CHECK:STDOUT: %Float.loc4_49.2: type = class_type @Float, @Float(constants.%N) [symbolic = %Float.loc4_49.1 (constants.%Float)] // CHECK:STDOUT: } -// CHECK:STDOUT: %n: @F.%Float.loc4_49.1 (%Float) = value_binding n, %n.param +// CHECK:STDOUT: %n: @F.%Float.loc4_49.1 (%Float) = wrapper_binding n, %n.param // CHECK:STDOUT: %return.param: ref Core.IntLiteral = out_param call_param1 // CHECK:STDOUT: %return: ref Core.IntLiteral = return_slot %return.param // CHECK:STDOUT: } @@ -301,7 +301,7 @@ fn G(a: f64) -> Core.IntLiteral { // CHECK:STDOUT: %.loc8: Core.Form = init_form %IntLiteral.ref [concrete = constants.%.f7d] // CHECK:STDOUT: %a.param: %f64.dc1 = value_param call_param0 // CHECK:STDOUT: %f64: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %a: %f64.dc1 = value_binding a, %a.param +// CHECK:STDOUT: %a: %f64.dc1 = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref Core.IntLiteral = out_param call_param1 // CHECK:STDOUT: %return: ref Core.IntLiteral = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/deduce/tuple.carbon b/toolchain/check/testdata/deduce/tuple.carbon index 1f2a71d01a16..a6069ac3c20c 100644 --- a/toolchain/check/testdata/deduce/tuple.carbon +++ b/toolchain/check/testdata/deduce/tuple.carbon @@ -145,7 +145,7 @@ fn G(pair: (C, D)) -> D { // CHECK:STDOUT: %.loc7_37.2: %tuple.type.24b = tuple_literal (%T.ref, %U.ref.loc7_36) [symbolic = %tuple (constants.%tuple.4b9)] // CHECK:STDOUT: %.loc7_37.3: type = converted %.loc7_37.2, constants.%tuple.type.a5e [symbolic = %tuple.type (constants.%tuple.type.a5e)] // CHECK:STDOUT: } -// CHECK:STDOUT: %pair: @F.%tuple.type (%tuple.type.a5e) = value_binding pair, %pair.param +// CHECK:STDOUT: %pair: @F.%tuple.type (%tuple.type.a5e) = wrapper_binding pair, %pair.param // CHECK:STDOUT: %return.param: ref @F.%U.loc7_17.1 (%U) = out_param call_param1 // CHECK:STDOUT: %return: ref @F.%U.loc7_17.1 (%U) = return_slot %return.param // CHECK:STDOUT: } @@ -164,7 +164,7 @@ fn G(pair: (C, D)) -> D { // CHECK:STDOUT: %.loc9_17.2: %tuple.type.24b = tuple_literal (%C.ref, %D.ref.loc9_16) [concrete = constants.%tuple.b04] // CHECK:STDOUT: %.loc9_17.3: type = converted %.loc9_17.2, constants.%tuple.type.af1 [concrete = constants.%tuple.type.af1] // CHECK:STDOUT: } -// CHECK:STDOUT: %pair: %tuple.type.af1 = value_binding pair, %pair.param +// CHECK:STDOUT: %pair: %tuple.type.af1 = wrapper_binding pair, %pair.param // CHECK:STDOUT: %return.param: ref %D = out_param call_param1 // CHECK:STDOUT: %return: ref %D = return_slot %return.param // CHECK:STDOUT: } @@ -418,7 +418,7 @@ fn G(pair: (C, D)) -> D { // CHECK:STDOUT: %.loc6_48.2: %tuple.type.e55 = converted %.loc6_47, %tuple.loc6_47.2 [symbolic = %tuple.loc6_47.1 (constants.%tuple.509)] // CHECK:STDOUT: %HasPair.loc6_48.2: type = class_type @HasPair, @HasPair(constants.%tuple.509) [symbolic = %HasPair.loc6_48.1 (constants.%HasPair.72f)] // CHECK:STDOUT: } -// CHECK:STDOUT: %h: @F.%HasPair.loc6_48.1 (%HasPair.72f) = value_binding h, %h.param +// CHECK:STDOUT: %h: @F.%HasPair.loc6_48.1 (%HasPair.72f) = wrapper_binding h, %h.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -454,7 +454,7 @@ fn G(pair: (C, D)) -> D { // CHECK:STDOUT: %.loc8_23.2: %tuple.type.e55 = converted %.loc8_22.1, %tuple [concrete = constants.%tuple.102] // CHECK:STDOUT: %HasPair: type = class_type @HasPair, @HasPair(constants.%tuple.102) [concrete = constants.%HasPair.69b] // CHECK:STDOUT: } -// CHECK:STDOUT: %h: %HasPair.69b = value_binding h, %h.param +// CHECK:STDOUT: %h: %HasPair.69b = wrapper_binding h, %h.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -636,7 +636,7 @@ fn G(pair: (C, D)) -> D { // CHECK:STDOUT: %.loc7_27.2: %tuple.type.24b = tuple_literal (%T.ref.loc7_23, %T.ref.loc7_26) [symbolic = %tuple (constants.%tuple.11e)] // CHECK:STDOUT: %.loc7_27.3: type = converted %.loc7_27.2, constants.%tuple.type.07a [symbolic = %tuple.type (constants.%tuple.type.07a)] // CHECK:STDOUT: } -// CHECK:STDOUT: %pair: @F.%tuple.type (%tuple.type.07a) = value_binding pair, %pair.param +// CHECK:STDOUT: %pair: @F.%tuple.type (%tuple.type.07a) = wrapper_binding pair, %pair.param // CHECK:STDOUT: %return.param: ref @F.%T.loc7_7.1 (%T) = out_param call_param1 // CHECK:STDOUT: %return: ref @F.%T.loc7_7.1 (%T) = return_slot %return.param // CHECK:STDOUT: } @@ -655,7 +655,7 @@ fn G(pair: (C, D)) -> D { // CHECK:STDOUT: %.loc9_17.2: %tuple.type.24b = tuple_literal (%C.ref, %D.ref.loc9_16) [concrete = constants.%tuple.b04] // CHECK:STDOUT: %.loc9_17.3: type = converted %.loc9_17.2, constants.%tuple.type.af1 [concrete = constants.%tuple.type.af1] // CHECK:STDOUT: } -// CHECK:STDOUT: %pair: %tuple.type.af1 = value_binding pair, %pair.param +// CHECK:STDOUT: %pair: %tuple.type.af1 = wrapper_binding pair, %pair.param // CHECK:STDOUT: %return.param: ref %D = out_param call_param1 // CHECK:STDOUT: %return: ref %D = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/deduce/type_operator.carbon b/toolchain/check/testdata/deduce/type_operator.carbon index 96ac5147c1ca..19b9dd646730 100644 --- a/toolchain/check/testdata/deduce/type_operator.carbon +++ b/toolchain/check/testdata/deduce/type_operator.carbon @@ -140,7 +140,7 @@ fn G(p: C*) -> const C { // CHECK:STDOUT: %T.ref.loc6_19: type = name_ref T, %T.loc6_7.2 [symbolic = %T.loc6_7.1 (constants.%T)] // CHECK:STDOUT: %ptr.loc6_20.2: type = ptr_type %T.ref.loc6_19 [symbolic = %ptr.loc6_20.1 (constants.%ptr.e8f)] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: @F.%ptr.loc6_20.1 (%ptr.e8f) = value_binding p, %p.param +// CHECK:STDOUT: %p: @F.%ptr.loc6_20.1 (%ptr.e8f) = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref @F.%T.loc6_7.1 (%T) = out_param call_param1 // CHECK:STDOUT: %return: ref @F.%T.loc6_7.1 (%T) = return_slot %return.param // CHECK:STDOUT: } @@ -157,7 +157,7 @@ fn G(p: C*) -> const C { // CHECK:STDOUT: %C.ref.loc8_9: type = name_ref C, file.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %ptr: type = ptr_type %C.ref.loc8_9 [concrete = constants.%ptr.6b6] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.6b6 = value_binding p, %p.param +// CHECK:STDOUT: %p: %ptr.6b6 = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref %C = out_param call_param1 // CHECK:STDOUT: %return: ref %C = return_slot %return.param // CHECK:STDOUT: } @@ -321,7 +321,7 @@ fn G(p: C*) -> const C { // CHECK:STDOUT: %const.loc6_19.2: type = const_type %T.ref.loc6_25 [symbolic = %const.loc6_19.1 (constants.%const.4ff)] // CHECK:STDOUT: %ptr.loc6_26.2: type = ptr_type %const.loc6_19.2 [symbolic = %ptr.loc6_26.1 (constants.%ptr.a15)] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: @F.%ptr.loc6_26.1 (%ptr.a15) = value_binding p, %p.param +// CHECK:STDOUT: %p: @F.%ptr.loc6_26.1 (%ptr.a15) = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref @F.%T.loc6_7.1 (%T) = out_param call_param1 // CHECK:STDOUT: %return: ref @F.%T.loc6_7.1 (%T) = return_slot %return.param // CHECK:STDOUT: } @@ -339,7 +339,7 @@ fn G(p: C*) -> const C { // CHECK:STDOUT: %const: type = const_type %C.ref.loc8_15 [concrete = constants.%const.13f] // CHECK:STDOUT: %ptr: type = ptr_type %const [concrete = constants.%ptr.77f] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.77f = value_binding p, %p.param +// CHECK:STDOUT: %p: %ptr.77f = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref %C = out_param call_param1 // CHECK:STDOUT: %return: ref %C = return_slot %return.param // CHECK:STDOUT: } @@ -504,7 +504,7 @@ fn G(p: C*) -> const C { // CHECK:STDOUT: %T.ref.loc6_19: type = name_ref T, %T.loc6_7.2 [symbolic = %T.loc6_7.1 (constants.%T)] // CHECK:STDOUT: %ptr.loc6_20.2: type = ptr_type %T.ref.loc6_19 [symbolic = %ptr.loc6_20.1 (constants.%ptr.e8f)] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: @F.%ptr.loc6_20.1 (%ptr.e8f) = value_binding p, %p.param +// CHECK:STDOUT: %p: @F.%ptr.loc6_20.1 (%ptr.e8f) = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref @F.%T.loc6_7.1 (%T) = out_param call_param1 // CHECK:STDOUT: %return: ref @F.%T.loc6_7.1 (%T) = return_slot %return.param // CHECK:STDOUT: } @@ -523,7 +523,7 @@ fn G(p: C*) -> const C { // CHECK:STDOUT: %const.loc8_9: type = const_type %C.ref.loc8_15 [concrete = constants.%const] // CHECK:STDOUT: %ptr: type = ptr_type %const.loc8_9 [concrete = constants.%ptr.77f] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.77f = value_binding p, %p.param +// CHECK:STDOUT: %p: %ptr.77f = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref %const = out_param call_param1 // CHECK:STDOUT: %return: ref %const = return_slot %return.param // CHECK:STDOUT: } @@ -685,7 +685,7 @@ fn G(p: C*) -> const C { // CHECK:STDOUT: %const.loc6_19.2: type = const_type %T.ref.loc6_25 [symbolic = %const.loc6_19.1 (constants.%const.4ff)] // CHECK:STDOUT: %ptr.loc6_26.2: type = ptr_type %const.loc6_19.2 [symbolic = %ptr.loc6_26.1 (constants.%ptr.a15)] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: @F.%ptr.loc6_26.1 (%ptr.a15) = value_binding p, %p.param +// CHECK:STDOUT: %p: @F.%ptr.loc6_26.1 (%ptr.a15) = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref @F.%T.loc6_7.1 (%T) = out_param call_param1 // CHECK:STDOUT: %return: ref @F.%T.loc6_7.1 (%T) = return_slot %return.param // CHECK:STDOUT: } @@ -703,7 +703,7 @@ fn G(p: C*) -> const C { // CHECK:STDOUT: %C.ref.loc8_9: type = name_ref C, file.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %ptr: type = ptr_type %C.ref.loc8_9 [concrete = constants.%ptr.6b6] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.6b6 = value_binding p, %p.param +// CHECK:STDOUT: %p: %ptr.6b6 = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref %const.13f = out_param call_param1 // CHECK:STDOUT: %return: ref %const.13f = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/deduce/value_with_type_through_access.carbon b/toolchain/check/testdata/deduce/value_with_type_through_access.carbon index 40f98a07a4ca..01ff05c0f55f 100644 --- a/toolchain/check/testdata/deduce/value_with_type_through_access.carbon +++ b/toolchain/check/testdata/deduce/value_with_type_through_access.carbon @@ -202,14 +202,14 @@ fn G() { // CHECK:STDOUT: %T.ref.loc8_40: %tuple.type = name_ref T, %T.loc8_7.2 [symbolic = %T.loc8_7.1 (constants.%T)] // CHECK:STDOUT: %HoldsType.loc8_41.2: type = class_type @HoldsType, @HoldsType(constants.%T) [symbolic = %HoldsType.loc8_41.1 (constants.%HoldsType.a83)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @F.%HoldsType.loc8_41.1 (%HoldsType.a83) = value_binding x, %x.param +// CHECK:STDOUT: %x: @F.%HoldsType.loc8_41.1 (%HoldsType.a83) = wrapper_binding x, %x.param // CHECK:STDOUT: %a.param: @F.%tuple.elem0.loc8_55.1 (%tuple.elem0) = value_param call_param1 // CHECK:STDOUT: %.loc8_55: type = splice_block %tuple.elem0.loc8_55.2 [symbolic = %tuple.elem0.loc8_55.1 (constants.%tuple.elem0)] { // CHECK:STDOUT: %T.ref.loc8_54: %tuple.type = name_ref T, %T.loc8_7.2 [symbolic = %T.loc8_7.1 (constants.%T)] // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [concrete = constants.%int_0] // CHECK:STDOUT: %tuple.elem0.loc8_55.2: type = tuple_access %T.ref.loc8_54, element0 [symbolic = %tuple.elem0.loc8_55.1 (constants.%tuple.elem0)] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: @F.%tuple.elem0.loc8_55.1 (%tuple.elem0) = value_binding a, %a.param +// CHECK:STDOUT: %a: @F.%tuple.elem0.loc8_55.1 (%tuple.elem0) = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [concrete = constants.%C] {} {} // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [concrete = constants.%G] {} {} @@ -443,13 +443,13 @@ fn G() { // CHECK:STDOUT: %T.ref.loc8_42: %struct_type.t = name_ref T, %T.loc8_7.2 [symbolic = %T.loc8_7.1 (constants.%T)] // CHECK:STDOUT: %HoldsType.loc8_43.2: type = class_type @HoldsType, @HoldsType(constants.%T) [symbolic = %HoldsType.loc8_43.1 (constants.%HoldsType.07e)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @F.%HoldsType.loc8_43.1 (%HoldsType.07e) = value_binding x, %x.param +// CHECK:STDOUT: %x: @F.%HoldsType.loc8_43.1 (%HoldsType.07e) = wrapper_binding x, %x.param // CHECK:STDOUT: %a.param: @F.%.loc8_57.1 (%.424) = value_param call_param1 // CHECK:STDOUT: %.loc8_57.2: type = splice_block %.loc8_57.3 [symbolic = %.loc8_57.1 (constants.%.424)] { // CHECK:STDOUT: %T.ref.loc8_56: %struct_type.t = name_ref T, %T.loc8_7.2 [symbolic = %T.loc8_7.1 (constants.%T)] // CHECK:STDOUT: %.loc8_57.3: type = struct_access %T.ref.loc8_56, element0 [symbolic = %.loc8_57.1 (constants.%.424)] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: @F.%.loc8_57.1 (%.424) = value_binding a, %a.param +// CHECK:STDOUT: %a: @F.%.loc8_57.1 (%.424) = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [concrete = constants.%C] {} {} // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [concrete = constants.%G] {} {} @@ -692,7 +692,7 @@ fn G() { // CHECK:STDOUT: %T.ref.loc21_37: %Class = name_ref T, %T.loc21_7.2 [symbolic = %T.loc21_7.1 (constants.%T.f25)] // CHECK:STDOUT: %HoldsType.loc21_38.2: type = class_type @HoldsType, @HoldsType(constants.%T.f25) [symbolic = %HoldsType.loc21_38.1 (constants.%HoldsType.3500da.1)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @F.%HoldsType.loc21_38.1 (%HoldsType.3500da.1) = value_binding x, %x.param +// CHECK:STDOUT: %x: @F.%HoldsType.loc21_38.1 (%HoldsType.3500da.1) = wrapper_binding x, %x.param // CHECK:STDOUT: %a.param: = value_param call_param1 // CHECK:STDOUT: %.1: = splice_block [concrete = ] { // CHECK:STDOUT: %T.ref.loc21_51: %Class = name_ref T, %T.loc21_7.2 [symbolic = %T.loc21_7.1 (constants.%T.f25)] @@ -700,7 +700,7 @@ fn G() { // CHECK:STDOUT: %.loc21_52.2: ref type = class_element_access %T.ref.loc21_51, element0 [symbolic = %.loc21_52.1 (constants.%.9dd)] // CHECK:STDOUT: %.loc21_52.3: type = acquire_value %.loc21_52.2 // CHECK:STDOUT: } -// CHECK:STDOUT: %a: = value_binding a, [concrete = ] +// CHECK:STDOUT: %a: = wrapper_binding a, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [concrete = constants.%C] {} {} // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [concrete = constants.%G] { @@ -995,7 +995,7 @@ fn G() { // CHECK:STDOUT: %T.ref.loc12_46: %array_type = name_ref T, %T.loc12_7.2 [symbolic = %T.loc12_7.1 (constants.%T.9b7)] // CHECK:STDOUT: %HoldsType.loc12_47.2: type = class_type @HoldsType, @HoldsType(constants.%T.9b7) [symbolic = %HoldsType.loc12_47.1 (constants.%HoldsType.881)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @F.%HoldsType.loc12_47.1 (%HoldsType.881) = value_binding x, %x.param +// CHECK:STDOUT: %x: @F.%HoldsType.loc12_47.1 (%HoldsType.881) = wrapper_binding x, %x.param // CHECK:STDOUT: %a.param: = value_param call_param1 // CHECK:STDOUT: %.1: = splice_block [concrete = ] { // CHECK:STDOUT: %T.ref.loc12_60: %array_type = name_ref T, %T.loc12_7.2 [symbolic = %T.loc12_7.1 (constants.%T.9b7)] @@ -1011,7 +1011,7 @@ fn G() { // CHECK:STDOUT: %.loc12_63.2: ref type = array_index %.loc12_63.1, %.loc12_62.2 // CHECK:STDOUT: %.loc12_63.3: type = acquire_value %.loc12_63.2 // CHECK:STDOUT: } -// CHECK:STDOUT: %a: = value_binding a, [concrete = ] +// CHECK:STDOUT: %a: = wrapper_binding a, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [concrete = constants.%C] {} {} // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [concrete = constants.%G] {} {} diff --git a/toolchain/check/testdata/eval/aggregates.carbon b/toolchain/check/testdata/eval/aggregates.carbon index 8445cfeb0bfa..94086a25a728 100644 --- a/toolchain/check/testdata/eval/aggregates.carbon +++ b/toolchain/check/testdata/eval/aggregates.carbon @@ -163,7 +163,7 @@ fn G(N:! i32) { // CHECK:STDOUT: %.loc4_26.2: %tuple.type.24b = tuple_literal (%i32.loc4_18, %i32.loc4_23) [concrete = constants.%tuple.b59] // CHECK:STDOUT: %.loc4_26.3: type = converted %.loc4_26.2, constants.%tuple.type.e55 [concrete = constants.%tuple.type.e55] // CHECK:STDOUT: } -// CHECK:STDOUT: %tuple_copy: ref %tuple.type.e55 = ref_binding tuple_copy, %tuple_copy.var [concrete = %tuple_copy.var] +// CHECK:STDOUT: %tuple_copy: ref %tuple.type.e55 = wrapper_binding tuple_copy, %tuple_copy.var [concrete = %tuple_copy.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %struct_copy.patt: %pattern_type.9c3 = ref_binding_pattern struct_copy [concrete = constants.%struct_copy.patt] // CHECK:STDOUT: %struct_copy.var_patt: %pattern_type.9c3 = var_pattern %struct_copy.patt [concrete = constants.%struct_copy.var_patt] @@ -175,7 +175,7 @@ fn G(N:! i32) { // CHECK:STDOUT: %i32.loc6_41: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a.b.c: type = struct_type {.a: %i32, .b: %i32, .c: %i32} [concrete = constants.%struct_type.a.b.c] // CHECK:STDOUT: } -// CHECK:STDOUT: %struct_copy: ref %struct_type.a.b.c = ref_binding struct_copy, %struct_copy.var [concrete = %struct_copy.var] +// CHECK:STDOUT: %struct_copy: ref %struct_type.a.b.c = wrapper_binding struct_copy, %struct_copy.var [concrete = %struct_copy.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %tuple_index.patt: %pattern_type.97e = ref_binding_pattern tuple_index [concrete = constants.%tuple_index.patt] // CHECK:STDOUT: %tuple_index.var_patt: %pattern_type.97e = var_pattern %tuple_index.patt [concrete = constants.%tuple_index.var_patt] @@ -186,7 +186,7 @@ fn G(N:! i32) { // CHECK:STDOUT: %int_1.loc8: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %array_type.loc8: type = array_type %int_1.loc8, %i32.loc8 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %tuple_index: ref %array_type = ref_binding tuple_index, %tuple_index.var [concrete = %tuple_index.var] +// CHECK:STDOUT: %tuple_index: ref %array_type = wrapper_binding tuple_index, %tuple_index.var [concrete = %tuple_index.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %struct_access.patt: %pattern_type.97e = ref_binding_pattern struct_access [concrete = constants.%struct_access.patt] // CHECK:STDOUT: %struct_access.var_patt: %pattern_type.97e = var_pattern %struct_access.patt [concrete = constants.%struct_access.var_patt] @@ -197,7 +197,7 @@ fn G(N:! i32) { // CHECK:STDOUT: %int_1.loc10: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %array_type.loc10: type = array_type %int_1.loc10, %i32.loc10 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %struct_access: ref %array_type = ref_binding struct_access, %struct_access.var [concrete = %struct_access.var] +// CHECK:STDOUT: %struct_access: ref %array_type = wrapper_binding struct_access, %struct_access.var [concrete = %struct_access.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -422,7 +422,7 @@ fn G(N:! i32) { // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %array_type: type = array_type %int_1, %i32 [concrete = constants.%array_type.d27] // CHECK:STDOUT: } -// CHECK:STDOUT: %array_index: ref %array_type.d27 = ref_binding array_index, %array_index.var [concrete = %array_index.var] +// CHECK:STDOUT: %array_index: ref %array_type.d27 = wrapper_binding array_index, %array_index.var [concrete = %array_index.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -696,7 +696,7 @@ fn G(N:! i32) { // CHECK:STDOUT: %.loc6_29.2: %tuple.type.24b = tuple_literal (%ptr.loc6_19.1, %const.loc6_22.1) [symbolic = %tuple (constants.%tuple)] // CHECK:STDOUT: %.loc6_29.3: type = converted %.loc6_29.2, constants.%tuple.type.cd5 [symbolic = %tuple.type (constants.%tuple.type.cd5)] // CHECK:STDOUT: } -// CHECK:STDOUT: %u: ref @F.%tuple.type (%tuple.type.cd5) = ref_binding u, %u.var +// CHECK:STDOUT: %u: ref @F.%tuple.type (%tuple.type.cd5) = wrapper_binding u, %u.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %v.patt.loc7_15.1: @F.%pattern_type.loc7 (%pattern_type.915) = ref_binding_pattern v [symbolic = %v.patt.loc7_15.2 (constants.%v.patt)] // CHECK:STDOUT: %v.var_patt.loc7_3.1: @F.%pattern_type.loc7 (%pattern_type.915) = var_pattern %v.patt.loc7_15.1 [symbolic = %v.var_patt.loc7_3.2 (constants.%v.var_patt)] @@ -716,7 +716,7 @@ fn G(N:! i32) { // CHECK:STDOUT: %.loc7_22: type = converted %T.ref.loc7, %T.as_type.loc7 [symbolic = %T.as_type.loc6_19.2 (constants.%T.as_type.700)] // CHECK:STDOUT: %struct_type.a.loc7_23.1: type = struct_type {.a: @F.%T.as_type.loc6_19.2 (%T.as_type.700)} [symbolic = %struct_type.a.loc7_23.2 (constants.%struct_type.a)] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: ref @F.%struct_type.a.loc7_23.2 (%struct_type.a) = ref_binding v, %v.var +// CHECK:STDOUT: %v: ref @F.%struct_type.a.loc7_23.2 (%struct_type.a) = wrapper_binding v, %v.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %w.patt.loc8_15.1: @F.%pattern_type.loc8 (%pattern_type.78a) = ref_binding_pattern w [symbolic = %w.patt.loc8_15.2 (constants.%w.patt)] // CHECK:STDOUT: %w.var_patt.loc8_3.1: @F.%pattern_type.loc8 (%pattern_type.78a) = var_pattern %w.patt.loc8_15.1 [symbolic = %w.var_patt.loc8_3.2 (constants.%w.var_patt)] @@ -738,7 +738,7 @@ fn G(N:! i32) { // CHECK:STDOUT: %.loc8_23: type = converted %T.ref.loc8, %T.as_type.loc8 [symbolic = %T.as_type.loc6_19.2 (constants.%T.as_type.700)] // CHECK:STDOUT: %array_type.loc8_27.1: type = array_type %int_5, %.loc8_23 [symbolic = %array_type.loc8_27.2 (constants.%array_type.50f)] // CHECK:STDOUT: } -// CHECK:STDOUT: %w: ref @F.%array_type.loc8_27.2 (%array_type.50f) = ref_binding w, %w.var +// CHECK:STDOUT: %w: ref @F.%array_type.loc8_27.2 (%array_type.50f) = wrapper_binding w, %w.var // CHECK:STDOUT: %impl.elem0.loc8_3.1: @F.%.loc8_3.4 (%.260) = impl_witness_access constants.%Destroy.lookup_impl_witness.1f5, element0 [symbolic = %impl.elem0.loc8_3.2 (constants.%impl.elem0.375)] // CHECK:STDOUT: %bound_method.loc8_3.1: = bound_method %w.var, %impl.elem0.loc8_3.1 // CHECK:STDOUT: %Destroy.facet.loc8_3.1: %Destroy.type = facet_value constants.%array_type.50f, (constants.%Destroy.lookup_impl_witness.1f5) [symbolic = %Destroy.facet.loc8_3.3 (constants.%Destroy.facet.664)] @@ -824,7 +824,7 @@ fn G(N:! i32) { // CHECK:STDOUT: %.loc14_28.2: Core.IntLiteral = converted %N.ref, %.loc14_28.1 [symbolic = %Int.as.ImplicitAs.impl.Convert.call.loc14_28.2 (constants.%Int.as.ImplicitAs.impl.Convert.call)] // CHECK:STDOUT: %array_type.loc14_29.1: type = array_type %.loc14_28.2, %i32.loc14 [symbolic = %array_type.loc14_29.2 (constants.%array_type.359)] // CHECK:STDOUT: } -// CHECK:STDOUT: %k: ref @G.%array_type.loc14_29.2 (%array_type.359) = ref_binding k, %k.var +// CHECK:STDOUT: %k: ref @G.%array_type.loc14_29.2 (%array_type.359) = wrapper_binding k, %k.var // CHECK:STDOUT: %impl.elem0.loc14_3.1: @G.%.loc14_3.4 (%.a73) = impl_witness_access constants.%Destroy.lookup_impl_witness.822, element0 [symbolic = %impl.elem0.loc14_3.2 (constants.%impl.elem0.fa7)] // CHECK:STDOUT: %bound_method.loc14_3.1: = bound_method %k.var, %impl.elem0.loc14_3.1 // CHECK:STDOUT: %Destroy.facet.loc14_3.1: %Destroy.type = facet_value constants.%array_type.359, (constants.%Destroy.lookup_impl_witness.822) [symbolic = %Destroy.facet.loc14_3.3 (constants.%Destroy.facet.a58)] diff --git a/toolchain/check/testdata/eval/binding.carbon b/toolchain/check/testdata/eval/binding.carbon index a365ed7f2123..cbf9d2a70b92 100644 --- a/toolchain/check/testdata/eval/binding.carbon +++ b/toolchain/check/testdata/eval/binding.carbon @@ -185,7 +185,7 @@ let n: array(i32, G()) = (1, 2, 3); // CHECK:STDOUT: %.loc11_22.4: Core.IntLiteral = converted %F.call, %.loc11_22.3 [concrete = constants.%int_3.1ba] // CHECK:STDOUT: %array_type: type = array_type %.loc11_22.4, %i32 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %n: %array_type = value_binding n, %.loc11_35.14 +// CHECK:STDOUT: %n: %array_type = wrapper_binding n, %.loc11_35.14 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/eval/branch.carbon b/toolchain/check/testdata/eval/branch.carbon index a3c0c8c1fb82..cf7f8de140f0 100644 --- a/toolchain/check/testdata/eval/branch.carbon +++ b/toolchain/check/testdata/eval/branch.carbon @@ -103,7 +103,7 @@ var b: if false then A else B = MakeB(); // CHECK:STDOUT: %.loc14_14.2: type = value_of_initializer %F.call.loc14 [concrete = constants.%A] // CHECK:STDOUT: %.loc14_14.3: type = converted %F.call.loc14, %.loc14_14.2 [concrete = constants.%A] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %A = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %A = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.e39 = ref_binding_pattern b [concrete = constants.%b.patt.492] // CHECK:STDOUT: %b.var_patt: %pattern_type.e39 = var_pattern %b.patt [concrete = constants.%b.var_patt] @@ -116,7 +116,7 @@ var b: if false then A else B = MakeB(); // CHECK:STDOUT: %.loc15_15.2: type = value_of_initializer %F.call.loc15 [concrete = constants.%B] // CHECK:STDOUT: %.loc15_15.3: type = converted %F.call.loc15, %.loc15_15.2 [concrete = constants.%B] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: ref %B = ref_binding b, %b.var [concrete = %b.var] +// CHECK:STDOUT: %b: ref %B = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -171,7 +171,7 @@ var b: if false then A else B = MakeB(); // CHECK:STDOUT: %.loc10_14.2: type = value_of_initializer %F.call.loc10 [concrete = constants.%A] // CHECK:STDOUT: %.loc10_14.3: type = converted %F.call.loc10, %.loc10_14.2 [concrete = constants.%A] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %A = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %A = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.e39 = ref_binding_pattern b [concrete = constants.%b.patt.492] // CHECK:STDOUT: %b.var_patt: %pattern_type.e39 = var_pattern %b.patt [concrete = constants.%b.var_patt] @@ -184,7 +184,7 @@ var b: if false then A else B = MakeB(); // CHECK:STDOUT: %.loc11_15.2: type = value_of_initializer %F.call.loc11 [concrete = constants.%B] // CHECK:STDOUT: %.loc11_15.3: type = converted %F.call.loc11, %.loc11_15.2 [concrete = constants.%B] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: ref %B = ref_binding b, %b.var [concrete = %b.var] +// CHECK:STDOUT: %b: ref %B = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/eval/call.carbon b/toolchain/check/testdata/eval/call.carbon index dc8332f61064..a466ee20363c 100644 --- a/toolchain/check/testdata/eval/call.carbon +++ b/toolchain/check/testdata/eval/call.carbon @@ -255,7 +255,7 @@ fn H() { // CHECK:STDOUT: %.loc8_31.2: %tuple.type.ff9 = tuple_literal (%i32.loc8_18, %i32.loc8_23, %i32.loc8_28) [concrete = constants.%tuple.04d] // CHECK:STDOUT: %.loc8_31.3: type = converted %.loc8_31.2, constants.%tuple.type.555 [concrete = constants.%tuple.type.555] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %tuple.type.555 = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %tuple.type.555 = wrapper_binding a, %a.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %a.var, constants.%Destroy.Op.1a2547.3 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%a.var) // CHECK:STDOUT: @@ -391,7 +391,7 @@ fn H() { // CHECK:STDOUT: %.loc17_43: %tuple.type.f94 = tuple_literal (%int_1, %int_2) [concrete = constants.%tuple.ad8] // CHECK:STDOUT: assign %a.var, // CHECK:STDOUT: -// CHECK:STDOUT: %a: ref = ref_binding a, [concrete = ] +// CHECK:STDOUT: %a: = wrapper_binding a, [concrete = ] // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call constants.%Destroy.Op.bound(constants.%.e1e) // CHECK:STDOUT: // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/facet/access.carbon b/toolchain/check/testdata/facet/access.carbon index 074a1d695985..78fe1cd2fca9 100644 --- a/toolchain/check/testdata/facet/access.carbon +++ b/toolchain/check/testdata/facet/access.carbon @@ -628,7 +628,7 @@ fn F(T:! Z where C impls NY(.Self)) -> C.(Y(T).Y1) { // CHECK:STDOUT: %T.as_type.loc9_18.2: type = facet_access_type %T.ref.loc9_18 [symbolic = %T.as_type.loc9_18.1 (constants.%T.as_type)] // CHECK:STDOUT: %.loc9_18.2: type = converted %T.ref.loc9_18, %T.as_type.loc9_18.2 [symbolic = %T.as_type.loc9_18.1 (constants.%T.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @Use.%T.as_type.loc9_18.1 (%T.as_type) = value_binding x, %x.param +// CHECK:STDOUT: %x: @Use.%T.as_type.loc9_18.1 (%T.as_type) = wrapper_binding x, %x.param // CHECK:STDOUT: %return.param: ref @Use.%T.as_type.loc9_18.1 (%T.as_type) = out_param call_param1 // CHECK:STDOUT: %return: ref @Use.%T.as_type.loc9_18.1 (%T.as_type) = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/facet/call_combined_impl_witness.carbon b/toolchain/check/testdata/facet/call_combined_impl_witness.carbon index 8cd4be2b6823..ec31ac6c1997 100644 --- a/toolchain/check/testdata/facet/call_combined_impl_witness.carbon +++ b/toolchain/check/testdata/facet/call_combined_impl_witness.carbon @@ -209,7 +209,7 @@ fn F() { // CHECK:STDOUT: %T.as_type.loc33_28.2: type = facet_access_type %T.ref.loc33 [symbolic = %T.as_type.loc33_28.1 (constants.%T.as_type)] // CHECK:STDOUT: %.loc33_28.2: type = converted %T.ref.loc33, %T.as_type.loc33_28.2 [symbolic = %T.as_type.loc33_28.1 (constants.%T.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %t: @G.%T.as_type.loc33_28.1 (%T.as_type) = value_binding t, %t.param +// CHECK:STDOUT: %t: @G.%T.as_type.loc33_28.1 (%T.as_type) = wrapper_binding t, %t.param // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [concrete = constants.%F] {} {} // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/facet/convert_class_type_to_generic_facet_value.carbon b/toolchain/check/testdata/facet/convert_class_type_to_generic_facet_value.carbon index c4aa3ad9d988..dab852ac989f 100644 --- a/toolchain/check/testdata/facet/convert_class_type_to_generic_facet_value.carbon +++ b/toolchain/check/testdata/facet/convert_class_type_to_generic_facet_value.carbon @@ -553,7 +553,7 @@ fn G() { // CHECK:STDOUT: %U.loc15_40.2: @CallGenericMethod.%Generic.type.loc15_52.1 (%Generic.type.ee14e9.2) = symbolic_binding U, 1 [symbolic = %U.loc15_40.1 (constants.%U)] // CHECK:STDOUT: %t.param: @CallGenericMethod.%T.loc15_23.1 (%T) = value_param call_param0 // CHECK:STDOUT: %T.ref.loc15_65: type = name_ref T, %T.loc15_23.2 [symbolic = %T.loc15_23.1 (constants.%T)] -// CHECK:STDOUT: %t: @CallGenericMethod.%T.loc15_23.1 (%T) = value_binding t, %t.param +// CHECK:STDOUT: %t: @CallGenericMethod.%T.loc15_23.1 (%T) = wrapper_binding t, %t.param // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [concrete = constants.%G] {} {} // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/facet/convert_class_value_to_facet_value_value.carbon b/toolchain/check/testdata/facet/convert_class_value_to_facet_value_value.carbon index ff20e6bca4a1..465feffcd489 100644 --- a/toolchain/check/testdata/facet/convert_class_value_to_facet_value_value.carbon +++ b/toolchain/check/testdata/facet/convert_class_value_to_facet_value_value.carbon @@ -96,7 +96,7 @@ fn F() { // CHECK:STDOUT: %T.as_type.loc17_37.2: type = facet_access_type %T.ref [symbolic = %T.as_type.loc17_37.1 (constants.%T.as_type)] // CHECK:STDOUT: %.loc17_37.2: type = converted %T.ref, %T.as_type.loc17_37.2 [symbolic = %T.as_type.loc17_37.1 (constants.%T.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: @WalkAnimal.%T.as_type.loc17_37.1 (%T.as_type) = value_binding a, %a.param +// CHECK:STDOUT: %a: @WalkAnimal.%T.as_type.loc17_37.1 (%T.as_type) = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %Goat.decl: type = class_decl @Goat [concrete = constants.%Goat] {} {} // CHECK:STDOUT: impl_decl @Goat.as.Animal.impl [concrete] {} { diff --git a/toolchain/check/testdata/facet/convert_class_value_to_generic_facet_value_value.carbon b/toolchain/check/testdata/facet/convert_class_value_to_generic_facet_value_value.carbon index a116e916f50a..109d54557ad3 100644 --- a/toolchain/check/testdata/facet/convert_class_value_to_generic_facet_value_value.carbon +++ b/toolchain/check/testdata/facet/convert_class_value_to_generic_facet_value_value.carbon @@ -245,10 +245,10 @@ fn B() { // CHECK:STDOUT: %U.as_type.loc15_58.2: type = facet_access_type %U.ref.loc15 [symbolic = %U.as_type.loc15_58.1 (constants.%U.as_type)] // CHECK:STDOUT: %.loc15_58.2: type = converted %U.ref.loc15, %U.as_type.loc15_58.2 [symbolic = %U.as_type.loc15_58.1 (constants.%U.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: @CallGenericMethod.%U.as_type.loc15_58.1 (%U.as_type) = value_binding a, %a.param +// CHECK:STDOUT: %a: @CallGenericMethod.%U.as_type.loc15_58.1 (%U.as_type) = wrapper_binding a, %a.param // CHECK:STDOUT: %s.param: @CallGenericMethod.%T.loc15_23.1 (%T) = value_param call_param1 // CHECK:STDOUT: %T.ref.loc15_71: type = name_ref T, %T.loc15_23.2 [symbolic = %T.loc15_23.1 (constants.%T)] -// CHECK:STDOUT: %s: @CallGenericMethod.%T.loc15_23.1 (%T) = value_binding s, %s.param +// CHECK:STDOUT: %s: @CallGenericMethod.%T.loc15_23.1 (%T) = wrapper_binding s, %s.param // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [concrete = constants.%G] {} {} // CHECK:STDOUT: } @@ -638,7 +638,7 @@ fn B() { // CHECK:STDOUT: %T.as_type.loc9_31.2: type = facet_access_type %T.ref [symbolic = %T.as_type.loc9_31.1 (constants.%T.as_type)] // CHECK:STDOUT: %.loc9_31.2: type = converted %T.ref, %T.as_type.loc9_31.2 [symbolic = %T.as_type.loc9_31.1 (constants.%T.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %t: @A.%T.as_type.loc9_31.1 (%T.as_type) = value_binding t, %t.param +// CHECK:STDOUT: %t: @A.%T.as_type.loc9_31.1 (%T.as_type) = wrapper_binding t, %t.param // CHECK:STDOUT: } // CHECK:STDOUT: %B.decl: %B.type = fn_decl @B [concrete = constants.%B] {} {} // CHECK:STDOUT: } @@ -929,7 +929,7 @@ fn B() { // CHECK:STDOUT: %T.as_type.loc9_31.2: type = facet_access_type %T.ref [symbolic = %T.as_type.loc9_31.1 (constants.%T.as_type)] // CHECK:STDOUT: %.loc9_31.2: type = converted %T.ref, %T.as_type.loc9_31.2 [symbolic = %T.as_type.loc9_31.1 (constants.%T.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %t: @A.%T.as_type.loc9_31.1 (%T.as_type) = value_binding t, %t.param +// CHECK:STDOUT: %t: @A.%T.as_type.loc9_31.1 (%T.as_type) = wrapper_binding t, %t.param // CHECK:STDOUT: } // CHECK:STDOUT: %B.decl: %B.type = fn_decl @B [concrete = constants.%B] {} {} // CHECK:STDOUT: } @@ -1174,7 +1174,7 @@ fn B() { // CHECK:STDOUT: %T.as_type.loc9_23.2: type = facet_access_type %T.ref [symbolic = %T.as_type.loc9_23.1 (constants.%T.as_type)] // CHECK:STDOUT: %.loc9_23.2: type = converted %T.ref, %T.as_type.loc9_23.2 [symbolic = %T.as_type.loc9_23.1 (constants.%T.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %t: @A.%T.as_type.loc9_23.1 (%T.as_type) = value_binding t, %t.param +// CHECK:STDOUT: %t: @A.%T.as_type.loc9_23.1 (%T.as_type) = wrapper_binding t, %t.param // CHECK:STDOUT: } // CHECK:STDOUT: %B.decl: %B.type = fn_decl @B [concrete = constants.%B] {} {} // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/facet/convert_facet_value_as_type_knows_original_type.carbon b/toolchain/check/testdata/facet/convert_facet_value_as_type_knows_original_type.carbon index 97d00510bc22..a36dc7b1fc23 100644 --- a/toolchain/check/testdata/facet/convert_facet_value_as_type_knows_original_type.carbon +++ b/toolchain/check/testdata/facet/convert_facet_value_as_type_knows_original_type.carbon @@ -174,7 +174,7 @@ fn F[A:! J, B:! A](x: C(A, B)) { // CHECK:STDOUT: %as_type.loc22: type = facet_access_type %.loc22_15.2 [concrete = constants.%Goat] // CHECK:STDOUT: %.loc22_15.3: type = converted %.loc22_15.2, %as_type.loc22 [concrete = constants.%Goat] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %Goat = value_binding x, %.loc22_30.3 +// CHECK:STDOUT: %x: %Goat = wrapper_binding x, %.loc22_30.3 // CHECK:STDOUT: %x.ref.loc23: %Goat = name_ref x, %x // CHECK:STDOUT: %Bleet.ref.loc23: %Goat.Bleet.type = name_ref Bleet, @Goat.%Goat.Bleet.decl [concrete = constants.%Goat.Bleet] // CHECK:STDOUT: %Goat.Bleet.call.loc23: init %empty_tuple.type = call %Bleet.ref.loc23() diff --git a/toolchain/check/testdata/facet/convert_facet_value_to_narrowed_facet_type.carbon b/toolchain/check/testdata/facet/convert_facet_value_to_narrowed_facet_type.carbon index 2eb7af7c9536..1cc07ca342e2 100644 --- a/toolchain/check/testdata/facet/convert_facet_value_to_narrowed_facet_type.carbon +++ b/toolchain/check/testdata/facet/convert_facet_value_to_narrowed_facet_type.carbon @@ -175,7 +175,7 @@ fn CallsWithTypeExplicit(U:! type) { // CHECK:STDOUT: %T.as_type.loc6_29.2: type = facet_access_type %T.ref [symbolic = %T.as_type.loc6_29.1 (constants.%T.as_type)] // CHECK:STDOUT: %.loc6_29.2: type = converted %T.ref, %T.as_type.loc6_29.2 [symbolic = %T.as_type.loc6_29.1 (constants.%T.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %e: @Feed.%T.as_type.loc6_29.1 (%T.as_type) = value_binding e, %e.param +// CHECK:STDOUT: %e: @Feed.%T.as_type.loc6_29.1 (%T.as_type) = wrapper_binding e, %e.param // CHECK:STDOUT: } // CHECK:STDOUT: %HandleAnimal.decl: %HandleAnimal.type = fn_decl @HandleAnimal [concrete = constants.%HandleAnimal] { // CHECK:STDOUT: %U.patt.loc8_18.1: %pattern_type.018 = symbolic_binding_pattern U, 0 [symbolic = %U.patt.loc8_18.2 (constants.%U.patt)] @@ -199,7 +199,7 @@ fn CallsWithTypeExplicit(U:! type) { // CHECK:STDOUT: %U.as_type.loc8_39.2: type = facet_access_type %U.ref [symbolic = %U.as_type.loc8_39.1 (constants.%U.as_type)] // CHECK:STDOUT: %.loc8_39.2: type = converted %U.ref, %U.as_type.loc8_39.2 [symbolic = %U.as_type.loc8_39.1 (constants.%U.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: @HandleAnimal.%U.as_type.loc8_39.1 (%U.as_type) = value_binding a, %a.param +// CHECK:STDOUT: %a: @HandleAnimal.%U.as_type.loc8_39.1 (%U.as_type) = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -409,7 +409,7 @@ fn CallsWithTypeExplicit(U:! type) { // CHECK:STDOUT: %V.as_type.loc7_40.2: type = facet_access_type %V.ref [symbolic = %V.as_type.loc7_40.1 (constants.%V.as_type)] // CHECK:STDOUT: %.loc7_40.2: type = converted %V.ref, %V.as_type.loc7_40.2 [symbolic = %V.as_type.loc7_40.1 (constants.%V.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: @FeedTame.%V.as_type.loc7_40.1 (%V.as_type) = value_binding v, %v.param +// CHECK:STDOUT: %v: @FeedTame.%V.as_type.loc7_40.1 (%V.as_type) = wrapper_binding v, %v.param // CHECK:STDOUT: } // CHECK:STDOUT: %HandleTameAnimal.decl: %HandleTameAnimal.type = fn_decl @HandleTameAnimal [concrete = constants.%HandleTameAnimal] { // CHECK:STDOUT: %W.patt.loc9_22.1: %pattern_type.66f = symbolic_binding_pattern W, 0 [symbolic = %W.patt.loc9_22.2 (constants.%W.patt)] @@ -439,7 +439,7 @@ fn CallsWithTypeExplicit(U:! type) { // CHECK:STDOUT: %W.as_type.loc9_50.2: type = facet_access_type %W.ref [symbolic = %W.as_type.loc9_50.1 (constants.%W.as_type)] // CHECK:STDOUT: %.loc9_50.2: type = converted %W.ref, %W.as_type.loc9_50.2 [symbolic = %W.as_type.loc9_50.1 (constants.%W.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %w: @HandleTameAnimal.%W.as_type.loc9_50.1 (%W.as_type) = value_binding w, %w.param +// CHECK:STDOUT: %w: @HandleTameAnimal.%W.as_type.loc9_50.1 (%W.as_type) = wrapper_binding w, %w.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -686,7 +686,7 @@ fn CallsWithTypeExplicit(U:! type) { // CHECK:STDOUT: %V.as_type.loc9_41.2: type = facet_access_type %V.ref [symbolic = %V.as_type.loc9_41.1 (constants.%V.as_type)] // CHECK:STDOUT: %.loc9_41.2: type = converted %V.ref, %V.as_type.loc9_41.2 [symbolic = %V.as_type.loc9_41.1 (constants.%V.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: @FeedTame2.%V.as_type.loc9_41.1 (%V.as_type) = value_binding v, %v.param +// CHECK:STDOUT: %v: @FeedTame2.%V.as_type.loc9_41.1 (%V.as_type) = wrapper_binding v, %v.param // CHECK:STDOUT: } // CHECK:STDOUT: %HandleTameAnimal2.decl: %HandleTameAnimal2.type = fn_decl @HandleTameAnimal2 [concrete = constants.%HandleTameAnimal2] { // CHECK:STDOUT: %W.patt.loc11_23.1: %pattern_type.82c = symbolic_binding_pattern W, 0 [symbolic = %W.patt.loc11_23.2 (constants.%W.patt)] @@ -710,7 +710,7 @@ fn CallsWithTypeExplicit(U:! type) { // CHECK:STDOUT: %W.as_type.loc11_44.2: type = facet_access_type %W.ref [symbolic = %W.as_type.loc11_44.1 (constants.%W.as_type)] // CHECK:STDOUT: %.loc11_44.2: type = converted %W.ref, %W.as_type.loc11_44.2 [symbolic = %W.as_type.loc11_44.1 (constants.%W.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %w: @HandleTameAnimal2.%W.as_type.loc11_44.1 (%W.as_type) = value_binding w, %w.param +// CHECK:STDOUT: %w: @HandleTameAnimal2.%W.as_type.loc11_44.1 (%W.as_type) = wrapper_binding w, %w.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -942,7 +942,7 @@ fn CallsWithTypeExplicit(U:! type) { // CHECK:STDOUT: %T.as_type.loc7_28.2: type = facet_access_type %T.ref [symbolic = %T.as_type.loc7_28.1 (constants.%T.as_type)] // CHECK:STDOUT: %.loc7_28.2: type = converted %T.ref, %T.as_type.loc7_28.2 [symbolic = %T.as_type.loc7_28.1 (constants.%T.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @TakesA.%T.as_type.loc7_28.1 (%T.as_type) = value_binding x, %x.param +// CHECK:STDOUT: %x: @TakesA.%T.as_type.loc7_28.1 (%T.as_type) = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %WithExtraWhere.decl: %WithExtraWhere.type = fn_decl @WithExtraWhere [concrete = constants.%WithExtraWhere] { // CHECK:STDOUT: %U.patt.loc9_20.1: %pattern_type.029 = symbolic_binding_pattern U, 0 [symbolic = %U.patt.loc9_20.2 (constants.%U.patt)] @@ -969,7 +969,7 @@ fn CallsWithTypeExplicit(U:! type) { // CHECK:STDOUT: %U.as_type.loc9_52.2: type = facet_access_type %U.ref [symbolic = %U.as_type.loc9_52.1 (constants.%U.as_type)] // CHECK:STDOUT: %.loc9_52.2: type = converted %U.ref, %U.as_type.loc9_52.2 [symbolic = %U.as_type.loc9_52.1 (constants.%U.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: @WithExtraWhere.%U.as_type.loc9_52.1 (%U.as_type) = value_binding y, %y.param +// CHECK:STDOUT: %y: @WithExtraWhere.%U.as_type.loc9_52.1 (%U.as_type) = wrapper_binding y, %y.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1124,7 +1124,7 @@ fn CallsWithTypeExplicit(U:! type) { // CHECK:STDOUT: %T.loc3_22.2: type = symbolic_binding T, 0 [symbolic = %T.loc3_22.1 (constants.%T.67db0b.1)] // CHECK:STDOUT: %x.param: @TakesTypeDeduced.%T.loc3_22.1 (%T.67db0b.1) = value_param call_param0 // CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc3_22.2 [symbolic = %T.loc3_22.1 (constants.%T.67db0b.1)] -// CHECK:STDOUT: %x: @TakesTypeDeduced.%T.loc3_22.1 (%T.67db0b.1) = value_binding x, %x.param +// CHECK:STDOUT: %x: @TakesTypeDeduced.%T.loc3_22.1 (%T.67db0b.1) = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %CallsWithExtraWhere.decl: %CallsWithExtraWhere.type = fn_decl @CallsWithExtraWhere [concrete = constants.%CallsWithExtraWhere] { // CHECK:STDOUT: %U.patt.loc4_25.1: %pattern_type.9a5 = symbolic_binding_pattern U, 0 [symbolic = %U.patt.loc4_25.2 (constants.%U.patt)] @@ -1151,7 +1151,7 @@ fn CallsWithTypeExplicit(U:! type) { // CHECK:STDOUT: %U.as_type.loc4_60.2: type = facet_access_type %U.ref [symbolic = %U.as_type.loc4_60.1 (constants.%U.as_type)] // CHECK:STDOUT: %.loc4_60.2: type = converted %U.ref, %U.as_type.loc4_60.2 [symbolic = %U.as_type.loc4_60.1 (constants.%U.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: @CallsWithExtraWhere.%U.as_type.loc4_60.1 (%U.as_type) = value_binding y, %y.param +// CHECK:STDOUT: %y: @CallsWithExtraWhere.%U.as_type.loc4_60.1 (%U.as_type) = wrapper_binding y, %y.param // CHECK:STDOUT: } // CHECK:STDOUT: %TakesTypeExplicit.decl: %TakesTypeExplicit.type = fn_decl @TakesTypeExplicit [concrete = constants.%TakesTypeExplicit] { // CHECK:STDOUT: %T.patt.loc8_30.1: %pattern_type.98f = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc8_30.2 (constants.%T.patt)] @@ -1379,7 +1379,7 @@ fn CallsWithTypeExplicit(U:! type) { // CHECK:STDOUT: %T.as_type.loc3_70.2: type = facet_access_type %T.ref [symbolic = %T.as_type.loc3_70.1 (constants.%T.as_type)] // CHECK:STDOUT: %.loc3_70.2: type = converted %T.ref, %T.as_type.loc3_70.2 [symbolic = %T.as_type.loc3_70.1 (constants.%T.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @TakesExtraWhereDeduced.%T.as_type.loc3_70.1 (%T.as_type) = value_binding x, %x.param +// CHECK:STDOUT: %x: @TakesExtraWhereDeduced.%T.as_type.loc3_70.1 (%T.as_type) = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %CallsWithType.decl: %CallsWithType.type = fn_decl @CallsWithType [concrete = constants.%CallsWithType] { // CHECK:STDOUT: %U.patt.loc4_19.1: %pattern_type.98f = symbolic_binding_pattern U, 0 [symbolic = %U.patt.loc4_19.2 (constants.%U.patt)] @@ -1393,7 +1393,7 @@ fn CallsWithTypeExplicit(U:! type) { // CHECK:STDOUT: %U.loc4_19.2: type = symbolic_binding U, 0 [symbolic = %U.loc4_19.1 (constants.%U)] // CHECK:STDOUT: %y.param: @CallsWithType.%U.loc4_19.1 (%U) = value_param call_param0 // CHECK:STDOUT: %U.ref: type = name_ref U, %U.loc4_19.2 [symbolic = %U.loc4_19.1 (constants.%U)] -// CHECK:STDOUT: %y: @CallsWithType.%U.loc4_19.1 (%U) = value_binding y, %y.param +// CHECK:STDOUT: %y: @CallsWithType.%U.loc4_19.1 (%U) = wrapper_binding y, %y.param // CHECK:STDOUT: } // CHECK:STDOUT: %TakesExtraWhereExplicit.decl: %TakesExtraWhereExplicit.type = fn_decl @TakesExtraWhereExplicit [concrete = constants.%TakesExtraWhereExplicit] { // CHECK:STDOUT: %T.patt.loc8_36.1: %pattern_type.9a5 = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc8_36.2 (constants.%T.patt)] diff --git a/toolchain/check/testdata/facet/convert_facet_value_value_to_blanket_impl.carbon b/toolchain/check/testdata/facet/convert_facet_value_value_to_blanket_impl.carbon index 5d60c86a0b8e..21e0af3eca44 100644 --- a/toolchain/check/testdata/facet/convert_facet_value_value_to_blanket_impl.carbon +++ b/toolchain/check/testdata/facet/convert_facet_value_value_to_blanket_impl.carbon @@ -112,7 +112,7 @@ fn HandleAnimal[T:! Animal](a: T) { Feed(a); } // CHECK:STDOUT: %T.as_type.loc20_29.2: type = facet_access_type %T.ref [symbolic = %T.as_type.loc20_29.1 (constants.%T.as_type.422)] // CHECK:STDOUT: %.loc20_29.2: type = converted %T.ref, %T.as_type.loc20_29.2 [symbolic = %T.as_type.loc20_29.1 (constants.%T.as_type.422)] // CHECK:STDOUT: } -// CHECK:STDOUT: %e: @Feed.%T.as_type.loc20_29.1 (%T.as_type.422) = value_binding e, %e.param +// CHECK:STDOUT: %e: @Feed.%T.as_type.loc20_29.1 (%T.as_type.422) = wrapper_binding e, %e.param // CHECK:STDOUT: } // CHECK:STDOUT: %HandleAnimal.decl: %HandleAnimal.type = fn_decl @HandleAnimal [concrete = constants.%HandleAnimal] { // CHECK:STDOUT: %T.patt.loc22_18.1: %pattern_type.333 = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc22_18.2 (constants.%T.patt.e44)] @@ -130,7 +130,7 @@ fn HandleAnimal[T:! Animal](a: T) { Feed(a); } // CHECK:STDOUT: %T.as_type.loc22_32.2: type = facet_access_type %T.ref [symbolic = %T.as_type.loc22_32.1 (constants.%T.as_type.01d)] // CHECK:STDOUT: %.loc22_32.2: type = converted %T.ref, %T.as_type.loc22_32.2 [symbolic = %T.as_type.loc22_32.1 (constants.%T.as_type.01d)] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: @HandleAnimal.%T.as_type.loc22_32.1 (%T.as_type.01d) = value_binding a, %a.param +// CHECK:STDOUT: %a: @HandleAnimal.%T.as_type.loc22_32.1 (%T.as_type.01d) = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/facet/convert_facet_value_value_to_generic_facet_value_value.carbon b/toolchain/check/testdata/facet/convert_facet_value_value_to_generic_facet_value_value.carbon index 4b67f5af7cb2..51a1302ea721 100644 --- a/toolchain/check/testdata/facet/convert_facet_value_value_to_generic_facet_value_value.carbon +++ b/toolchain/check/testdata/facet/convert_facet_value_value_to_generic_facet_value_value.carbon @@ -249,14 +249,14 @@ fn F() { // CHECK:STDOUT: %T.as_type.loc31_50.2: type = facet_access_type %T.ref [symbolic = %T.as_type.loc31_50.1 (constants.%T.as_type.b84)] // CHECK:STDOUT: %.loc31_50.2: type = converted %T.ref, %T.as_type.loc31_50.2 [symbolic = %T.as_type.loc31_50.1 (constants.%T.as_type.b84)] // CHECK:STDOUT: } -// CHECK:STDOUT: %e: @Feed.%T.as_type.loc31_50.1 (%T.as_type.b84) = value_binding e, %e.param +// CHECK:STDOUT: %e: @Feed.%T.as_type.loc31_50.1 (%T.as_type.b84) = wrapper_binding e, %e.param // CHECK:STDOUT: %food.param: @Feed.%Food.as_type.loc31_37.1 (%Food.as_type.bca) = value_param call_param1 // CHECK:STDOUT: %.loc31_66.1: type = splice_block %.loc31_66.2 [symbolic = %Food.as_type.loc31_37.1 (constants.%Food.as_type.bca)] { // CHECK:STDOUT: %Food.ref.loc31_66: %Edible.type = name_ref Food, %Food.loc31_13.2 [symbolic = %Food.loc31_13.1 (constants.%Food.196)] // CHECK:STDOUT: %Food.as_type.loc31_66: type = facet_access_type %Food.ref.loc31_66 [symbolic = %Food.as_type.loc31_37.1 (constants.%Food.as_type.bca)] // CHECK:STDOUT: %.loc31_66.2: type = converted %Food.ref.loc31_66, %Food.as_type.loc31_66 [symbolic = %Food.as_type.loc31_37.1 (constants.%Food.as_type.bca)] // CHECK:STDOUT: } -// CHECK:STDOUT: %food: @Feed.%Food.as_type.loc31_37.1 (%Food.as_type.bca) = value_binding food, %food.param +// CHECK:STDOUT: %food: @Feed.%Food.as_type.loc31_37.1 (%Food.as_type.bca) = wrapper_binding food, %food.param // CHECK:STDOUT: } // CHECK:STDOUT: %HandleAnimal.decl: %HandleAnimal.type = fn_decl @HandleAnimal [concrete = constants.%HandleAnimal] { // CHECK:STDOUT: %A.patt.loc32_18.1: %pattern_type.333 = symbolic_binding_pattern A, 0 [symbolic = %A.patt.loc32_18.2 (constants.%A.patt)] @@ -282,14 +282,14 @@ fn F() { // CHECK:STDOUT: %A.as_type.loc32_47.2: type = facet_access_type %A.ref [symbolic = %A.as_type.loc32_47.1 (constants.%A.as_type)] // CHECK:STDOUT: %.loc32_47.2: type = converted %A.ref, %A.as_type.loc32_47.2 [symbolic = %A.as_type.loc32_47.1 (constants.%A.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: @HandleAnimal.%A.as_type.loc32_47.1 (%A.as_type) = value_binding a, %a.param +// CHECK:STDOUT: %a: @HandleAnimal.%A.as_type.loc32_47.1 (%A.as_type) = wrapper_binding a, %a.param // CHECK:STDOUT: %food.param: @HandleAnimal.%Food.as_type.loc32_56.1 (%Food.as_type.24e) = value_param call_param1 // CHECK:STDOUT: %.loc32_56.1: type = splice_block %.loc32_56.2 [symbolic = %Food.as_type.loc32_56.1 (constants.%Food.as_type.24e)] { // CHECK:STDOUT: %Food.ref: %Edible.type = name_ref Food, %Food.loc32_33.2 [symbolic = %Food.loc32_33.1 (constants.%Food.5f8)] // CHECK:STDOUT: %Food.as_type.loc32_56.2: type = facet_access_type %Food.ref [symbolic = %Food.as_type.loc32_56.1 (constants.%Food.as_type.24e)] // CHECK:STDOUT: %.loc32_56.2: type = converted %Food.ref, %Food.as_type.loc32_56.2 [symbolic = %Food.as_type.loc32_56.1 (constants.%Food.as_type.24e)] // CHECK:STDOUT: } -// CHECK:STDOUT: %food: @HandleAnimal.%Food.as_type.loc32_56.1 (%Food.as_type.24e) = value_binding food, %food.param +// CHECK:STDOUT: %food: @HandleAnimal.%Food.as_type.loc32_56.1 (%Food.as_type.24e) = wrapper_binding food, %food.param // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [concrete = constants.%F] {} {} // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/facet/convert_facet_value_value_to_itself.carbon b/toolchain/check/testdata/facet/convert_facet_value_value_to_itself.carbon index 4d9a773c7ee8..c79eb7bea55b 100644 --- a/toolchain/check/testdata/facet/convert_facet_value_value_to_itself.carbon +++ b/toolchain/check/testdata/facet/convert_facet_value_value_to_itself.carbon @@ -105,7 +105,7 @@ fn F() { // CHECK:STDOUT: %T.as_type.loc17_37.2: type = facet_access_type %T.ref [symbolic = %T.as_type.loc17_37.1 (constants.%T.as_type)] // CHECK:STDOUT: %.loc17_37.2: type = converted %T.ref, %T.as_type.loc17_37.2 [symbolic = %T.as_type.loc17_37.1 (constants.%T.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: @FeedAnimal.%T.as_type.loc17_37.1 (%T.as_type) = value_binding a, %a.param +// CHECK:STDOUT: %a: @FeedAnimal.%T.as_type.loc17_37.1 (%T.as_type) = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %HandleAnimal.decl: %HandleAnimal.type = fn_decl @HandleAnimal [concrete = constants.%HandleAnimal] { // CHECK:STDOUT: %T.patt.loc19_18.1: %pattern_type.333 = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc19_18.2 (constants.%T.patt)] @@ -123,7 +123,7 @@ fn F() { // CHECK:STDOUT: %T.as_type.loc19_32.2: type = facet_access_type %T.ref [symbolic = %T.as_type.loc19_32.1 (constants.%T.as_type)] // CHECK:STDOUT: %.loc19_32.2: type = converted %T.ref, %T.as_type.loc19_32.2 [symbolic = %T.as_type.loc19_32.1 (constants.%T.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: @HandleAnimal.%T.as_type.loc19_32.1 (%T.as_type) = value_binding a, %a.param +// CHECK:STDOUT: %a: @HandleAnimal.%T.as_type.loc19_32.1 (%T.as_type) = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %Goat.decl: type = class_decl @Goat [concrete = constants.%Goat] {} {} // CHECK:STDOUT: impl_decl @Goat.as.Animal.impl [concrete] {} { diff --git a/toolchain/check/testdata/facet/convert_interface.carbon b/toolchain/check/testdata/facet/convert_interface.carbon index 7b3034b75478..80c9c647aa66 100644 --- a/toolchain/check/testdata/facet/convert_interface.carbon +++ b/toolchain/check/testdata/facet/convert_interface.carbon @@ -69,7 +69,7 @@ fn G() { F(Animal); } // CHECK:STDOUT: } { // CHECK:STDOUT: %e.param: %Eats.type = value_param call_param0 // CHECK:STDOUT: %Eats.ref: type = name_ref Eats, file.%Eats.decl [concrete = constants.%Eats.type] -// CHECK:STDOUT: %e: %Eats.type = value_binding e, %e.param +// CHECK:STDOUT: %e: %Eats.type = wrapper_binding e, %e.param // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [concrete = constants.%G] {} {} // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/facet/fail_convert_facet_value_to_missing_impl.carbon b/toolchain/check/testdata/facet/fail_convert_facet_value_to_missing_impl.carbon index 81927cdf534d..4f27788c86df 100644 --- a/toolchain/check/testdata/facet/fail_convert_facet_value_to_missing_impl.carbon +++ b/toolchain/check/testdata/facet/fail_convert_facet_value_to_missing_impl.carbon @@ -91,7 +91,7 @@ fn HandleAnimal[T:! Animal](a: T) { Feed(a); } // CHECK:STDOUT: %T.as_type.loc18_29.2: type = facet_access_type %T.ref [symbolic = %T.as_type.loc18_29.1 (constants.%T.as_type.422)] // CHECK:STDOUT: %.loc18_29.2: type = converted %T.ref, %T.as_type.loc18_29.2 [symbolic = %T.as_type.loc18_29.1 (constants.%T.as_type.422)] // CHECK:STDOUT: } -// CHECK:STDOUT: %e: @Feed.%T.as_type.loc18_29.1 (%T.as_type.422) = value_binding e, %e.param +// CHECK:STDOUT: %e: @Feed.%T.as_type.loc18_29.1 (%T.as_type.422) = wrapper_binding e, %e.param // CHECK:STDOUT: } // CHECK:STDOUT: %HandleAnimal.decl: %HandleAnimal.type = fn_decl @HandleAnimal [concrete = constants.%HandleAnimal] { // CHECK:STDOUT: %T.patt.loc27_18.1: %pattern_type.333 = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc27_18.2 (constants.%T.patt.e44)] @@ -109,7 +109,7 @@ fn HandleAnimal[T:! Animal](a: T) { Feed(a); } // CHECK:STDOUT: %T.as_type.loc27_32.2: type = facet_access_type %T.ref [symbolic = %T.as_type.loc27_32.1 (constants.%T.as_type.01d)] // CHECK:STDOUT: %.loc27_32.2: type = converted %T.ref, %T.as_type.loc27_32.2 [symbolic = %T.as_type.loc27_32.1 (constants.%T.as_type.01d)] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: @HandleAnimal.%T.as_type.loc27_32.1 (%T.as_type.01d) = value_binding a, %a.param +// CHECK:STDOUT: %a: @HandleAnimal.%T.as_type.loc27_32.1 (%T.as_type.01d) = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/facet/fail_deduction_uses_runtime_type_conversion.carbon b/toolchain/check/testdata/facet/fail_deduction_uses_runtime_type_conversion.carbon index 0904e717dee9..ff61389f5c7c 100644 --- a/toolchain/check/testdata/facet/fail_deduction_uses_runtime_type_conversion.carbon +++ b/toolchain/check/testdata/facet/fail_deduction_uses_runtime_type_conversion.carbon @@ -174,7 +174,7 @@ fn G(holds_to: HoldsType((RuntimeConvertTo, )), from:! RuntimeConvertFrom) { // CHECK:STDOUT: %T.ref.loc27_56: %tuple.type = name_ref T, %T.loc27_7.2 [symbolic = %T.loc27_7.1 (constants.%T)] // CHECK:STDOUT: %HoldsType.loc27_57.2: type = class_type @HoldsType, @HoldsType(constants.%T) [symbolic = %HoldsType.loc27_57.1 (constants.%HoldsType.a83)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @F.%HoldsType.loc27_57.1 (%HoldsType.a83) = value_binding x, %x.param +// CHECK:STDOUT: %x: @F.%HoldsType.loc27_57.1 (%HoldsType.a83) = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [concrete = constants.%G] { // CHECK:STDOUT: %holds_to.param_patt: %pattern_type.905 = value_param_pattern [concrete = constants.%holds_to.param_patt] @@ -190,7 +190,7 @@ fn G(holds_to: HoldsType((RuntimeConvertTo, )), from:! RuntimeConvertFrom) { // CHECK:STDOUT: %.loc29_46.2: %tuple.type = converted %.loc29_45, %tuple.loc29 [concrete = constants.%tuple.162] // CHECK:STDOUT: %HoldsType: type = class_type @HoldsType, @HoldsType(constants.%tuple.162) [concrete = constants.%HoldsType.9f2] // CHECK:STDOUT: } -// CHECK:STDOUT: %holds_to: %HoldsType.9f2 = value_binding holds_to, %holds_to.param +// CHECK:STDOUT: %holds_to: %HoldsType.9f2 = wrapper_binding holds_to, %holds_to.param // CHECK:STDOUT: %.loc29_56: type = splice_block %RuntimeConvertFrom.ref [concrete = constants.%RuntimeConvertFrom] { // CHECK:STDOUT: %.Self: %type = symbolic_binding .Self [symbolic_self = constants.%.Self] // CHECK:STDOUT: %RuntimeConvertFrom.ref: type = name_ref RuntimeConvertFrom, file.%RuntimeConvertFrom.decl [concrete = constants.%RuntimeConvertFrom] @@ -210,7 +210,7 @@ fn G(holds_to: HoldsType((RuntimeConvertTo, )), from:! RuntimeConvertFrom) { // CHECK:STDOUT: %.loc24_30: Core.Form = init_form %RuntimeConvertTo.ref [concrete = constants.%.aac] // CHECK:STDOUT: %self.param: %RuntimeConvertFrom = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @RuntimeConvertFrom.as.ImplicitAs.impl.%RuntimeConvertFrom.ref [concrete = constants.%RuntimeConvertFrom] -// CHECK:STDOUT: %self: %RuntimeConvertFrom = value_binding self, %self.param +// CHECK:STDOUT: %self: %RuntimeConvertFrom = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref %RuntimeConvertTo = out_param call_param1 // CHECK:STDOUT: %return: ref %RuntimeConvertTo = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/facet/runtime_value.carbon b/toolchain/check/testdata/facet/runtime_value.carbon index e15b1368bbd3..b6f2cce10ac6 100644 --- a/toolchain/check/testdata/facet/runtime_value.carbon +++ b/toolchain/check/testdata/facet/runtime_value.carbon @@ -149,7 +149,7 @@ fn F(T: Z) { // CHECK:STDOUT: %.loc13_22.1: ref %I.type = class_element_access %c.ref, element0 // CHECK:STDOUT: %.loc13_22.2: %I.type = acquire_value %.loc13_22.1 // CHECK:STDOUT: %I.ref: type = name_ref I, file.%I.decl [concrete = constants.%I.type] -// CHECK:STDOUT: %a: %I.type = value_binding a, %.loc13_22.2 +// CHECK:STDOUT: %a: %I.type = wrapper_binding a, %.loc13_22.2 // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -174,7 +174,7 @@ fn F(T: Z) { // CHECK:STDOUT: %.loc21_22.1: ref %facet_type = class_element_access %c.ref, element0 // CHECK:STDOUT: %.loc21_22.2: %facet_type = acquire_value %.loc21_22.1 // CHECK:STDOUT: %I.ref: type = name_ref I, file.%I.decl [concrete = constants.%I.type] -// CHECK:STDOUT: %a: %I.type = value_binding a, [concrete = ] +// CHECK:STDOUT: %a: %I.type = wrapper_binding a, [concrete = ] // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/for/actual.carbon b/toolchain/check/testdata/for/actual.carbon index 3745fd5fced0..2dd737523548 100644 --- a/toolchain/check/testdata/for/actual.carbon +++ b/toolchain/check/testdata/for/actual.carbon @@ -310,7 +310,7 @@ fn Read(y:! Core.IntLiteral) { // CHECK:STDOUT: %.loc26_34.2: Core.Form = init_form %IntRange.loc26 [concrete = constants.%.9fd] // CHECK:STDOUT: %end.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %end: %i32 = value_binding end, %end.param +// CHECK:STDOUT: %end: %i32 = wrapper_binding end, %end.param // CHECK:STDOUT: %return.param: ref %IntRange.bbd = out_param call_param1 // CHECK:STDOUT: %return: ref %IntRange.bbd = return_slot %return.param // CHECK:STDOUT: } @@ -352,7 +352,7 @@ fn Read(y:! Core.IntLiteral) { // CHECK:STDOUT: %.loc10_18.2: type = specific_constant constants.%IntRange.2c4, @IntRange(constants.%N) [symbolic = %IntRange (constants.%IntRange.2c4)] // CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc10_18.2 [symbolic = %IntRange (constants.%IntRange.2c4)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @IntRange.as.Iterate.impl.NewCursor.%IntRange (%IntRange.2c4) = value_binding self, %self.param +// CHECK:STDOUT: %self: @IntRange.as.Iterate.impl.NewCursor.%IntRange (%IntRange.2c4) = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref @IntRange.as.Iterate.impl.NewCursor.%Int.loc10_37.1 (%Int.67af24.1) = out_param call_param1 // CHECK:STDOUT: %return: ref @IntRange.as.Iterate.impl.NewCursor.%Int.loc10_37.1 (%Int.67af24.1) = return_slot %return.param // CHECK:STDOUT: } @@ -379,7 +379,7 @@ fn Read(y:! Core.IntLiteral) { // CHECK:STDOUT: %.loc11_13.2: type = specific_constant constants.%IntRange.2c4, @IntRange(constants.%N) [symbolic = %IntRange (constants.%IntRange.2c4)] // CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc11_13.2 [symbolic = %IntRange (constants.%IntRange.2c4)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @IntRange.as.Iterate.impl.Next.%IntRange (%IntRange.2c4) = value_binding self, %self.param +// CHECK:STDOUT: %self: @IntRange.as.Iterate.impl.Next.%IntRange (%IntRange.2c4) = wrapper_binding self, %self.param // CHECK:STDOUT: %cursor.param: @IntRange.as.Iterate.impl.Next.%ptr.loc11_38.1 (%ptr.41e) = value_param call_param1 // CHECK:STDOUT: %.loc11_38: type = splice_block %ptr.loc11_38.2 [symbolic = %ptr.loc11_38.1 (constants.%ptr.41e)] { // CHECK:STDOUT: %Core.ref.loc11_27: = name_ref Core, imports.%Core [concrete = imports.%Core] @@ -388,7 +388,7 @@ fn Read(y:! Core.IntLiteral) { // CHECK:STDOUT: %Int.loc11_37.2: type = class_type @Int, @Int(constants.%N) [symbolic = %Int.loc11_37.1 (constants.%Int.67af24.1)] // CHECK:STDOUT: %ptr.loc11_38.2: type = ptr_type %Int.loc11_37.2 [symbolic = %ptr.loc11_38.1 (constants.%ptr.41e)] // CHECK:STDOUT: } -// CHECK:STDOUT: %cursor: @IntRange.as.Iterate.impl.Next.%ptr.loc11_38.1 (%ptr.41e) = value_binding cursor, %cursor.param +// CHECK:STDOUT: %cursor: @IntRange.as.Iterate.impl.Next.%ptr.loc11_38.1 (%ptr.41e) = wrapper_binding cursor, %cursor.param // CHECK:STDOUT: %return.param: ref @IntRange.as.Iterate.impl.Next.%Optional.loc11_69.1 (%Optional.5ec) = out_param call_param2 // CHECK:STDOUT: %return: ref @IntRange.as.Iterate.impl.Next.%Optional.loc11_69.1 (%Optional.5ec) = return_slot %return.param // CHECK:STDOUT: } @@ -442,7 +442,7 @@ fn Read(y:! Core.IntLiteral) { // CHECK:STDOUT: %N.ref.loc5_27: Core.IntLiteral = name_ref N, @IntRange.%N.loc4_17.2 [symbolic = %N (constants.%N)] // CHECK:STDOUT: %Int.loc5_28.2: type = class_type @Int, @Int(constants.%N) [symbolic = %Int.loc5_28.1 (constants.%Int.67af24.1)] // CHECK:STDOUT: } -// CHECK:STDOUT: %start: @IntRange.Make.%Int.loc5_28.1 (%Int.67af24.1) = value_binding start, %start.param +// CHECK:STDOUT: %start: @IntRange.Make.%Int.loc5_28.1 (%Int.67af24.1) = wrapper_binding start, %start.param // CHECK:STDOUT: %end.param: @IntRange.Make.%Int.loc5_28.1 (%Int.67af24.1) = value_param call_param1 // CHECK:STDOUT: %.loc5_46: type = splice_block %Int.loc5_46 [symbolic = %Int.loc5_28.1 (constants.%Int.67af24.1)] { // CHECK:STDOUT: %Core.ref.loc5_36: = name_ref Core, imports.%Core [concrete = imports.%Core] @@ -450,7 +450,7 @@ fn Read(y:! Core.IntLiteral) { // CHECK:STDOUT: %N.ref.loc5_45: Core.IntLiteral = name_ref N, @IntRange.%N.loc4_17.2 [symbolic = %N (constants.%N)] // CHECK:STDOUT: %Int.loc5_46: type = class_type @Int, @Int(constants.%N) [symbolic = %Int.loc5_28.1 (constants.%Int.67af24.1)] // CHECK:STDOUT: } -// CHECK:STDOUT: %end: @IntRange.Make.%Int.loc5_28.1 (%Int.67af24.1) = value_binding end, %end.param +// CHECK:STDOUT: %end: @IntRange.Make.%Int.loc5_28.1 (%Int.67af24.1) = wrapper_binding end, %end.param // CHECK:STDOUT: %return.param: ref @IntRange.Make.%IntRange (%IntRange.2c4) = out_param call_param2 // CHECK:STDOUT: %return: ref @IntRange.Make.%IntRange (%IntRange.2c4) = return_slot %return.param // CHECK:STDOUT: } @@ -698,7 +698,7 @@ fn Read(y:! Core.IntLiteral) { // CHECK:STDOUT: %N.ref.loc12: Core.IntLiteral = name_ref N, @IntRange.%N.loc4_17.2 [symbolic = %N (constants.%N)] // CHECK:STDOUT: %Int.loc12: type = class_type @Int, @Int(constants.%N) [symbolic = %Int.loc11_37.1 (constants.%Int.67af24.1)] // CHECK:STDOUT: } -// CHECK:STDOUT: %value: ref @IntRange.as.Iterate.impl.Next.%Int.loc11_37.1 (%Int.67af24.1) = ref_binding value, %value.var +// CHECK:STDOUT: %value: ref @IntRange.as.Iterate.impl.Next.%Int.loc11_37.1 (%Int.67af24.1) = wrapper_binding value, %value.var // CHECK:STDOUT: %value.ref.loc13: ref @IntRange.as.Iterate.impl.Next.%Int.loc11_37.1 (%Int.67af24.1) = name_ref value, %value // CHECK:STDOUT: %self.ref: @IntRange.as.Iterate.impl.Next.%IntRange (%IntRange.2c4) = name_ref self, %self // CHECK:STDOUT: %end.ref: @IntRange.as.Iterate.impl.Next.%IntRange.elem (%IntRange.elem.bed) = name_ref end, @IntRange.%.loc23 [concrete = @IntRange.%.loc23] @@ -1133,7 +1133,7 @@ fn Read(y:! Core.IntLiteral) { // CHECK:STDOUT: %int_32: Core.IntLiteral = int_value 32 [concrete = constants.%int_32] // CHECK:STDOUT: %IntRange: type = class_type @IntRange, @IntRange(constants.%int_32) [concrete = constants.%IntRange.bbd] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %IntRange.bbd = ref_binding x, %x.var +// CHECK:STDOUT: %x: ref %IntRange.bbd = wrapper_binding x, %x.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %x.var, constants.%Destroy.Op.1a2547.4 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%x.var) // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/for/basic.carbon b/toolchain/check/testdata/for/basic.carbon index 357b4f6ba106..56aa16be3c72 100644 --- a/toolchain/check/testdata/for/basic.carbon +++ b/toolchain/check/testdata/for/basic.carbon @@ -177,7 +177,7 @@ fn Run() { // CHECK:STDOUT: %.loc18_12.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc18_12.3: type = converted %.loc18_12.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %_: %empty_tuple.type = value_binding _, %.loc18_35.11 +// CHECK:STDOUT: %_: %empty_tuple.type = wrapper_binding _, %.loc18_35.11 // CHECK:STDOUT: %Body.ref: %Body.type = name_ref Body, file.%Body.decl [concrete = constants.%Body] // CHECK:STDOUT: %Body.call: init %empty_tuple.type = call %Body.ref() // CHECK:STDOUT: br !for.next diff --git a/toolchain/check/testdata/for/pattern.carbon b/toolchain/check/testdata/for/pattern.carbon index 332aa9366275..c5123d6ce6c4 100644 --- a/toolchain/check/testdata/for/pattern.carbon +++ b/toolchain/check/testdata/for/pattern.carbon @@ -256,7 +256,7 @@ fn Run() { // CHECK:STDOUT: %.loc10_36.10: ref %C = temporary %.loc10_36.8, %Optional.Get.call // CHECK:STDOUT: %.loc10_36.11: %C = acquire_value %.loc10_36.10 // CHECK:STDOUT: %C.ref.loc10_11: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %c: %C = value_binding c, %.loc10_36.11 +// CHECK:STDOUT: %c: %C = wrapper_binding c, %.loc10_36.11 // CHECK:STDOUT: %Body.ref: %Body.type = name_ref Body, file.%Body.decl [concrete = constants.%Body] // CHECK:STDOUT: %c.ref: %C = name_ref c, %c // CHECK:STDOUT: %Body.call: init %empty_tuple.type = call %Body.ref(%c.ref) @@ -439,7 +439,7 @@ fn Run() { // CHECK:STDOUT: %Optional.Get.call: init %C to %.loc10_8 = call %bound_method.loc10_40.6(%.loc10_40.8) // CHECK:STDOUT: assign %c.var, %Optional.Get.call // CHECK:STDOUT: %C.ref.loc10_15: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var // CHECK:STDOUT: %Body.ref: %Body.type = name_ref Body, file.%Body.decl [concrete = constants.%Body] // CHECK:STDOUT: %c.ref: ref %C = name_ref c, %c // CHECK:STDOUT: %addr.loc11: %ptr.6b6 = addr_of %c.ref @@ -637,10 +637,10 @@ fn Run() { // CHECK:STDOUT: %tuple.elem1: ref bool = tuple_access %.loc10_61.10, element1 // CHECK:STDOUT: %.loc10_61.11: bool = acquire_value %tuple.elem0 // CHECK:STDOUT: %.loc10_12: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %a: bool = value_binding a, %.loc10_61.11 +// CHECK:STDOUT: %a: bool = wrapper_binding a, %.loc10_61.11 // CHECK:STDOUT: %.loc10_61.12: bool = acquire_value %tuple.elem1 // CHECK:STDOUT: %.loc10_21: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %b: bool = value_binding b, %.loc10_61.12 +// CHECK:STDOUT: %b: bool = wrapper_binding b, %.loc10_61.12 // CHECK:STDOUT: %Body.ref: %Body.type = name_ref Body, file.%Body.decl [concrete = constants.%Body] // CHECK:STDOUT: %a.ref: bool = name_ref a, %a // CHECK:STDOUT: %b.ref: bool = name_ref b, %b @@ -840,10 +840,10 @@ fn Run() { // CHECK:STDOUT: %tuple.elem1: ref %C = tuple_access %.loc10_49.10, element1 // CHECK:STDOUT: %.loc10_49.11: %C = acquire_value %tuple.elem0 // CHECK:STDOUT: %C.ref.loc10_12: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %a: %C = value_binding a, %.loc10_49.11 +// CHECK:STDOUT: %a: %C = wrapper_binding a, %.loc10_49.11 // CHECK:STDOUT: %.loc10_49.12: %C = acquire_value %tuple.elem1 // CHECK:STDOUT: %C.ref.loc10_18: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %b: %C = value_binding b, %.loc10_49.12 +// CHECK:STDOUT: %b: %C = wrapper_binding b, %.loc10_49.12 // CHECK:STDOUT: %Body.ref: %Body.type = name_ref Body, file.%Body.decl [concrete = constants.%Body] // CHECK:STDOUT: %a.ref: %C = name_ref a, %a // CHECK:STDOUT: %b.ref: %C = name_ref b, %b diff --git a/toolchain/check/testdata/function/builtin/adapted_type.carbon b/toolchain/check/testdata/function/builtin/adapted_type.carbon index 43c3ae5c68d8..cb8c4d1386db 100644 --- a/toolchain/check/testdata/function/builtin/adapted_type.carbon +++ b/toolchain/check/testdata/function/builtin/adapted_type.carbon @@ -132,7 +132,7 @@ fn Int(N: MyIntLiteral) -> type = "int.make_type_signed"; // CHECK:STDOUT: %.loc11_28.2: Core.Form = init_form %.loc11_28.1 [concrete = constants.%.805] // CHECK:STDOUT: %N.param: %MyIntLiteral = value_param call_param0 // CHECK:STDOUT: %MyIntLiteral.ref: type = name_ref MyIntLiteral, file.%MyIntLiteral.decl [concrete = constants.%MyIntLiteral] -// CHECK:STDOUT: %N: %MyIntLiteral = value_binding N, %N.param +// CHECK:STDOUT: %N: %MyIntLiteral = wrapper_binding N, %N.param // CHECK:STDOUT: %return.param: ref type = out_param call_param1 // CHECK:STDOUT: %return: ref type = return_slot %return.param // CHECK:STDOUT: } @@ -147,7 +147,7 @@ fn Int(N: MyIntLiteral) -> type = "int.make_type_signed"; // CHECK:STDOUT: %.loc19: Core.Form = init_form %MyInt32.ref.loc19 [concrete = constants.%.6a2] // CHECK:STDOUT: %a.param.loc19: %MyIntLiteral = value_param call_param0 // CHECK:STDOUT: %MyIntLiteral.ref.loc19: type = name_ref MyIntLiteral, file.%MyIntLiteral.decl [concrete = constants.%MyIntLiteral] -// CHECK:STDOUT: %a.loc19: %MyIntLiteral = value_binding a, %a.param.loc19 +// CHECK:STDOUT: %a.loc19: %MyIntLiteral = wrapper_binding a, %a.param.loc19 // CHECK:STDOUT: %return.param.loc19: ref %MyInt32 = out_param call_param1 // CHECK:STDOUT: %return.loc19: ref %MyInt32 = return_slot %return.param.loc19 // CHECK:STDOUT: } @@ -163,10 +163,10 @@ fn Int(N: MyIntLiteral) -> type = "int.make_type_signed"; // CHECK:STDOUT: %.loc21: Core.Form = init_form %MyInt32.ref.loc21_37 [concrete = constants.%.6a2] // CHECK:STDOUT: %a.param: %MyInt32 = value_param call_param0 // CHECK:STDOUT: %MyInt32.ref.loc21_13: type = name_ref MyInt32, file.%MyInt32.decl [concrete = constants.%MyInt32] -// CHECK:STDOUT: %a: %MyInt32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %MyInt32 = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %MyInt32 = value_param call_param1 // CHECK:STDOUT: %MyInt32.ref.loc21_25: type = name_ref MyInt32, file.%MyInt32.decl [concrete = constants.%MyInt32] -// CHECK:STDOUT: %b: %MyInt32 = value_binding b, %b.param +// CHECK:STDOUT: %b: %MyInt32 = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref %MyInt32 = out_param call_param2 // CHECK:STDOUT: %return: ref %MyInt32 = return_slot %return.param // CHECK:STDOUT: } @@ -176,7 +176,7 @@ fn Int(N: MyIntLiteral) -> type = "int.make_type_signed"; // CHECK:STDOUT: } // CHECK:STDOUT: %v.var: ref %MyInt32 = var %v.var_patt [concrete] // CHECK:STDOUT: %MyInt32.ref: type = name_ref MyInt32, %MyInt32.decl [concrete = constants.%MyInt32] -// CHECK:STDOUT: %v: ref %MyInt32 = ref_binding v, %v.var [concrete = %v.var] +// CHECK:STDOUT: %v: ref %MyInt32 = wrapper_binding v, %v.var [concrete = %v.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @MyIntLiteral { @@ -210,7 +210,7 @@ fn Int(N: MyIntLiteral) -> type = "int.make_type_signed"; // CHECK:STDOUT: %.loc16: Core.Form = init_form %MyInt32.ref.loc16 [concrete = constants.%.6a2] // CHECK:STDOUT: %a.param.loc16: %MyIntLiteral = value_param call_param0 // CHECK:STDOUT: %MyIntLiteral.ref.loc16: type = name_ref MyIntLiteral, file.%MyIntLiteral.decl [concrete = constants.%MyIntLiteral] -// CHECK:STDOUT: %a.loc16: %MyIntLiteral = value_binding a, %a.param.loc16 +// CHECK:STDOUT: %a.loc16: %MyIntLiteral = wrapper_binding a, %a.param.loc16 // CHECK:STDOUT: %return.param.loc16: ref %MyInt32 = out_param call_param1 // CHECK:STDOUT: %return.loc16: ref %MyInt32 = return_slot %return.param.loc16 // CHECK:STDOUT: } @@ -293,7 +293,7 @@ fn Int(N: MyIntLiteral) -> type = "int.make_type_signed"; // CHECK:STDOUT: %.loc12_28.2: Core.Form = init_form %.loc12_28.1 [concrete = constants.%.805] // CHECK:STDOUT: %N.param: %MyIntLiteral = value_param call_param0 // CHECK:STDOUT: %MyIntLiteral.ref: type = name_ref MyIntLiteral, file.%MyIntLiteral.decl [concrete = constants.%MyIntLiteral] -// CHECK:STDOUT: %N: %MyIntLiteral = value_binding N, %N.param +// CHECK:STDOUT: %N: %MyIntLiteral = wrapper_binding N, %N.param // CHECK:STDOUT: %return.param: ref type = out_param call_param1 // CHECK:STDOUT: %return: ref type = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/builtin/call.carbon b/toolchain/check/testdata/function/builtin/call.carbon index 82cd2e480fc0..f36f8617ee8f 100644 --- a/toolchain/check/testdata/function/builtin/call.carbon +++ b/toolchain/check/testdata/function/builtin/call.carbon @@ -129,10 +129,10 @@ fn RuntimeCall(a: i32, b: i32) -> i32 { // CHECK:STDOUT: %.loc15: Core.Form = init_form %i32.loc15_27 [concrete = constants.%.795] // CHECK:STDOUT: %a.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc15_11: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %i32 = value_param call_param1 // CHECK:STDOUT: %i32.loc15_19: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: %i32 = value_binding b, %b.param +// CHECK:STDOUT: %b: %i32 = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param2 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -172,7 +172,7 @@ fn RuntimeCall(a: i32, b: i32) -> i32 { // CHECK:STDOUT: %.loc17_29.4: Core.IntLiteral = converted %Add.call, %.loc17_29.3 [concrete = constants.%int_3.1ba] // CHECK:STDOUT: %array_type: type = array_type %.loc17_29.4, %i32 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %arr: ref %array_type = ref_binding arr, %arr.var [concrete = %arr.var] +// CHECK:STDOUT: %arr: ref %array_type = wrapper_binding arr, %arr.var [concrete = %arr.var] // CHECK:STDOUT: %RuntimeCall.decl: %RuntimeCall.type = fn_decl @RuntimeCall [concrete = constants.%RuntimeCall] { // CHECK:STDOUT: %a.param_patt: %pattern_type.6b6 = value_param_pattern [concrete = constants.%a.param_patt] // CHECK:STDOUT: %a.patt: %pattern_type.6b6 = at_binding_pattern a, %a.param_patt [concrete = constants.%a.patt] @@ -185,10 +185,10 @@ fn RuntimeCall(a: i32, b: i32) -> i32 { // CHECK:STDOUT: %.loc19: Core.Form = init_form %i32.loc19_35 [concrete = constants.%.795] // CHECK:STDOUT: %a.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc19_19: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %i32 = value_param call_param1 // CHECK:STDOUT: %i32.loc19_27: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: %i32 = value_binding b, %b.param +// CHECK:STDOUT: %b: %i32 = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param2 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/builtin/call_from_operator.carbon b/toolchain/check/testdata/function/builtin/call_from_operator.carbon index 77a69ef6d1a5..61876e464656 100644 --- a/toolchain/check/testdata/function/builtin/call_from_operator.carbon +++ b/toolchain/check/testdata/function/builtin/call_from_operator.carbon @@ -216,7 +216,7 @@ var arr: array(i32, (1 as i32) + (2 as i32)) = (3, 4, (3 as i32) + (4 as i32)); // CHECK:STDOUT: %.loc6_26.2: Core.Form = init_form %.loc6_26.1 [concrete = constants.%.805] // CHECK:STDOUT: %N.param: Core.IntLiteral = value_param call_param0 // CHECK:STDOUT: %IntLiteral.ref: type = name_ref IntLiteral, file.%IntLiteral [concrete = Core.IntLiteral] -// CHECK:STDOUT: %N: Core.IntLiteral = value_binding N, %N.param +// CHECK:STDOUT: %N: Core.IntLiteral = wrapper_binding N, %N.param // CHECK:STDOUT: %return.param: ref type = out_param call_param1 // CHECK:STDOUT: %return: ref type = return_slot %return.param // CHECK:STDOUT: } @@ -306,7 +306,7 @@ var arr: array(i32, (1 as i32) + (2 as i32)) = (3, 4, (3 as i32) + (4 as i32)); // CHECK:STDOUT: %Self.as_type.loc9_9.2: type = facet_access_type %Self.ref.loc9_9 [symbolic = %Self.as_type.loc9_9.1 (constants.%Self.as_type.48c)] // CHECK:STDOUT: %.loc9_9.3: type = converted %Self.ref.loc9_9, %Self.as_type.loc9_9.2 [symbolic = %Self.as_type.loc9_9.1 (constants.%Self.as_type.48c)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @AddWith.WithSelf.Op.%Self.as_type.loc9_9.1 (%Self.as_type.48c) = value_binding self, %self.param +// CHECK:STDOUT: %self: @AddWith.WithSelf.Op.%Self.as_type.loc9_9.1 (%Self.as_type.48c) = wrapper_binding self, %self.param // CHECK:STDOUT: %other.param: @AddWith.WithSelf.Op.%Self.as_type.loc9_9.1 (%Self.as_type.48c) = value_param call_param1 // CHECK:STDOUT: %.loc9_22.1: type = splice_block %.loc9_22.3 [symbolic = %Self.as_type.loc9_9.1 (constants.%Self.as_type.48c)] { // CHECK:STDOUT: %.loc9_22.2: @AddWith.WithSelf.Op.%AddWith.type (%AddWith.type.7e9) = specific_constant @AddWith.%Self.loc8_29.1, @AddWith(constants.%T) [symbolic = %Self (constants.%Self.8d5)] @@ -314,7 +314,7 @@ var arr: array(i32, (1 as i32) + (2 as i32)) = (3, 4, (3 as i32) + (4 as i32)); // CHECK:STDOUT: %Self.as_type.loc9_22: type = facet_access_type %Self.ref.loc9_22 [symbolic = %Self.as_type.loc9_9.1 (constants.%Self.as_type.48c)] // CHECK:STDOUT: %.loc9_22.3: type = converted %Self.ref.loc9_22, %Self.as_type.loc9_22 [symbolic = %Self.as_type.loc9_9.1 (constants.%Self.as_type.48c)] // CHECK:STDOUT: } -// CHECK:STDOUT: %other: @AddWith.WithSelf.Op.%Self.as_type.loc9_9.1 (%Self.as_type.48c) = value_binding other, %other.param +// CHECK:STDOUT: %other: @AddWith.WithSelf.Op.%Self.as_type.loc9_9.1 (%Self.as_type.48c) = wrapper_binding other, %other.param // CHECK:STDOUT: %return.param: ref @AddWith.WithSelf.Op.%Self.as_type.loc9_9.1 (%Self.as_type.48c) = out_param call_param2 // CHECK:STDOUT: %return: ref @AddWith.WithSelf.Op.%Self.as_type.loc9_9.1 (%Self.as_type.48c) = return_slot %return.param // CHECK:STDOUT: } @@ -357,7 +357,7 @@ var arr: array(i32, (1 as i32) + (2 as i32)) = (3, 4, (3 as i32) + (4 as i32)); // CHECK:STDOUT: %Self.as_type.loc13_14.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc13_14.1 (constants.%Self.as_type.1ce)] // CHECK:STDOUT: %.loc13_14.3: type = converted %Self.ref, %Self.as_type.loc13_14.2 [symbolic = %Self.as_type.loc13_14.1 (constants.%Self.as_type.1ce)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @As.WithSelf.Convert.%Self.as_type.loc13_14.1 (%Self.as_type.1ce) = value_binding self, %self.param +// CHECK:STDOUT: %self: @As.WithSelf.Convert.%Self.as_type.loc13_14.1 (%Self.as_type.1ce) = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref @As.WithSelf.Convert.%T (%T) = out_param call_param1 // CHECK:STDOUT: %return: ref @As.WithSelf.Convert.%T (%T) = return_slot %return.param // CHECK:STDOUT: } @@ -402,7 +402,7 @@ var arr: array(i32, (1 as i32) + (2 as i32)) = (3, 4, (3 as i32) + (4 as i32)); // CHECK:STDOUT: %Self.as_type.loc17_14.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc17_14.1 (constants.%Self.as_type.5b8)] // CHECK:STDOUT: %.loc17_14.3: type = converted %Self.ref, %Self.as_type.loc17_14.2 [symbolic = %Self.as_type.loc17_14.1 (constants.%Self.as_type.5b8)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @ImplicitAs.WithSelf.Convert.%Self.as_type.loc17_14.1 (%Self.as_type.5b8) = value_binding self, %self.param +// CHECK:STDOUT: %self: @ImplicitAs.WithSelf.Convert.%Self.as_type.loc17_14.1 (%Self.as_type.5b8) = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref @ImplicitAs.WithSelf.Convert.%T (%T) = out_param call_param1 // CHECK:STDOUT: %return: ref @ImplicitAs.WithSelf.Convert.%T (%T) = return_slot %return.param // CHECK:STDOUT: } @@ -433,10 +433,10 @@ var arr: array(i32, (1 as i32) + (2 as i32)) = (3, 4, (3 as i32) + (4 as i32)); // CHECK:STDOUT: %.loc21: Core.Form = init_form %Self.ref.loc21_31 [concrete = constants.%.9cb] // CHECK:STDOUT: %self.param: %i32.builtin = value_param call_param0 // CHECK:STDOUT: %Self.ref.loc21_9: type = name_ref Self, @i32.builtin.as.AddWith.impl.%.loc20_6 [concrete = constants.%i32.builtin] -// CHECK:STDOUT: %self: %i32.builtin = value_binding self, %self.param +// CHECK:STDOUT: %self: %i32.builtin = wrapper_binding self, %self.param // CHECK:STDOUT: %other.param: %i32.builtin = value_param call_param1 // CHECK:STDOUT: %Self.ref.loc21_22: type = name_ref Self, @i32.builtin.as.AddWith.impl.%.loc20_6 [concrete = constants.%i32.builtin] -// CHECK:STDOUT: %other: %i32.builtin = value_binding other, %other.param +// CHECK:STDOUT: %other: %i32.builtin = wrapper_binding other, %other.param // CHECK:STDOUT: %return.param: ref %i32.builtin = out_param call_param2 // CHECK:STDOUT: %return: ref %i32.builtin = return_slot %return.param // CHECK:STDOUT: } @@ -460,7 +460,7 @@ var arr: array(i32, (1 as i32) + (2 as i32)) = (3, 4, (3 as i32) + (4 as i32)); // CHECK:STDOUT: %.loc25_23.2: Core.Form = init_form %.loc25_23.1 [concrete = constants.%.9cb] // CHECK:STDOUT: %self.param: Core.IntLiteral = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @Core.IntLiteral.as.As.impl.%IntLiteral.ref [concrete = Core.IntLiteral] -// CHECK:STDOUT: %self: Core.IntLiteral = value_binding self, %self.param +// CHECK:STDOUT: %self: Core.IntLiteral = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref %i32.builtin = out_param call_param1 // CHECK:STDOUT: %return: ref %i32.builtin = return_slot %return.param // CHECK:STDOUT: } @@ -484,7 +484,7 @@ var arr: array(i32, (1 as i32) + (2 as i32)) = (3, 4, (3 as i32) + (4 as i32)); // CHECK:STDOUT: %.loc29_23.2: Core.Form = init_form %.loc29_23.1 [concrete = constants.%.9cb] // CHECK:STDOUT: %self.param: Core.IntLiteral = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @Core.IntLiteral.as.ImplicitAs.impl.%IntLiteral.ref [concrete = Core.IntLiteral] -// CHECK:STDOUT: %self: Core.IntLiteral = value_binding self, %self.param +// CHECK:STDOUT: %self: Core.IntLiteral = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref %i32.builtin = out_param call_param1 // CHECK:STDOUT: %return: ref %i32.builtin = return_slot %return.param // CHECK:STDOUT: } @@ -508,7 +508,7 @@ var arr: array(i32, (1 as i32) + (2 as i32)) = (3, 4, (3 as i32) + (4 as i32)); // CHECK:STDOUT: %.loc33: Core.Form = init_form %IntLiteral.ref [concrete = constants.%.f7d] // CHECK:STDOUT: %self.param: %i32.builtin = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @i32.builtin.as.ImplicitAs.impl.%.loc32 [concrete = constants.%i32.builtin] -// CHECK:STDOUT: %self: %i32.builtin = value_binding self, %self.param +// CHECK:STDOUT: %self: %i32.builtin = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref Core.IntLiteral = out_param call_param1 // CHECK:STDOUT: %return: ref Core.IntLiteral = return_slot %return.param // CHECK:STDOUT: } @@ -1060,7 +1060,7 @@ var arr: array(i32, (1 as i32) + (2 as i32)) = (3, 4, (3 as i32) + (4 as i32)); // CHECK:STDOUT: %.loc4_32.4: Core.IntLiteral = converted %i32.builtin.as.AddWith.impl.Op.call, %.loc4_32.3 [concrete = constants.%int_3.1ba] // CHECK:STDOUT: %array_type: type = array_type %.loc4_32.4, %.loc4_16 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %arr: ref %array_type = ref_binding arr, %arr.var [concrete = %arr.var] +// CHECK:STDOUT: %arr: ref %array_type = wrapper_binding arr, %arr.var [concrete = %arr.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic interface @As(imports.%Core.import_ref.b3bc94.3: type) [from "core.carbon"] { diff --git a/toolchain/check/testdata/function/builtin/definition.carbon b/toolchain/check/testdata/function/builtin/definition.carbon index 3107a0a900d1..64b401fa97a2 100644 --- a/toolchain/check/testdata/function/builtin/definition.carbon +++ b/toolchain/check/testdata/function/builtin/definition.carbon @@ -60,10 +60,10 @@ fn Add(a: i32, b: i32) -> i32 = "int.sadd"; // CHECK:STDOUT: %.loc15: Core.Form = init_form %i32.loc15_27 [concrete = constants.%.795] // CHECK:STDOUT: %a.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc15_11: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %i32 = value_param call_param1 // CHECK:STDOUT: %i32.loc15_19: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: %i32 = value_binding b, %b.param +// CHECK:STDOUT: %b: %i32 = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param2 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/builtin/fail_redefined.carbon b/toolchain/check/testdata/function/builtin/fail_redefined.carbon index 41fcdf178dae..0544e0598163 100644 --- a/toolchain/check/testdata/function/builtin/fail_redefined.carbon +++ b/toolchain/check/testdata/function/builtin/fail_redefined.carbon @@ -115,10 +115,10 @@ fn C(n: i32, m: i32) -> i32 = "int.sadd"; // CHECK:STDOUT: %.loc15: Core.Form = init_form %i32.loc15_25 [concrete = constants.%.795] // CHECK:STDOUT: %n.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc15_9: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: %i32 = value_binding n, %n.param +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, %n.param // CHECK:STDOUT: %m.param: %i32 = value_param call_param1 // CHECK:STDOUT: %i32.loc15_17: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %m: %i32 = value_binding m, %m.param +// CHECK:STDOUT: %m: %i32 = wrapper_binding m, %m.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param2 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -134,10 +134,10 @@ fn C(n: i32, m: i32) -> i32 = "int.sadd"; // CHECK:STDOUT: %.loc23: Core.Form = init_form %i32.loc23_32 [concrete = constants.%.795] // CHECK:STDOUT: %n.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc23_9: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: %i32 = value_binding n, %n.param +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, %n.param // CHECK:STDOUT: %m.param: %i32 = value_param call_param1 // CHECK:STDOUT: %i32.loc23_24: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %m: %i32 = value_binding m, %m.param +// CHECK:STDOUT: %m: %i32 = wrapper_binding m, %m.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param2 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -153,10 +153,10 @@ fn C(n: i32, m: i32) -> i32 = "int.sadd"; // CHECK:STDOUT: %.loc25: Core.Form = init_form %i32.loc25_32 [concrete = constants.%.795] // CHECK:STDOUT: %n.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc25_9: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: %i32 = value_binding n, %n.param +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, %n.param // CHECK:STDOUT: %m.param: %i32 = value_param call_param1 // CHECK:STDOUT: %i32.loc25_24: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %m: %i32 = value_binding m, %m.param +// CHECK:STDOUT: %m: %i32 = wrapper_binding m, %m.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param2 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -172,10 +172,10 @@ fn C(n: i32, m: i32) -> i32 = "int.sadd"; // CHECK:STDOUT: %.loc33: Core.Form = init_form %i32.loc33_25 [concrete = constants.%.795] // CHECK:STDOUT: %n.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc33_9: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: %i32 = value_binding n, %n.param +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, %n.param // CHECK:STDOUT: %m.param: %i32 = value_param call_param1 // CHECK:STDOUT: %i32.loc33_17: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %m: %i32 = value_binding m, %m.param +// CHECK:STDOUT: %m: %i32 = wrapper_binding m, %m.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param2 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -191,10 +191,10 @@ fn C(n: i32, m: i32) -> i32 = "int.sadd"; // CHECK:STDOUT: %.loc35: Core.Form = init_form %i32.loc35_25 [concrete = constants.%.795] // CHECK:STDOUT: %n.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc35_9: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: %i32 = value_binding n, %n.param +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, %n.param // CHECK:STDOUT: %m.param: %i32 = value_param call_param1 // CHECK:STDOUT: %i32.loc35_17: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %m: %i32 = value_binding m, %m.param +// CHECK:STDOUT: %m: %i32 = wrapper_binding m, %m.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param2 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -210,10 +210,10 @@ fn C(n: i32, m: i32) -> i32 = "int.sadd"; // CHECK:STDOUT: %.loc43: Core.Form = init_form %i32.loc43_25 [concrete = constants.%.795] // CHECK:STDOUT: %n.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc43_9: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: %i32 = value_binding n, %n.param +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, %n.param // CHECK:STDOUT: %m.param: %i32 = value_param call_param1 // CHECK:STDOUT: %i32.loc43_17: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %m: %i32 = value_binding m, %m.param +// CHECK:STDOUT: %m: %i32 = wrapper_binding m, %m.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param2 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/builtin/import.carbon b/toolchain/check/testdata/function/builtin/import.carbon index e73c3c98ff12..ac8c964a588a 100644 --- a/toolchain/check/testdata/function/builtin/import.carbon +++ b/toolchain/check/testdata/function/builtin/import.carbon @@ -102,7 +102,7 @@ var arr: array(i32, Core.AsIntLiteral(Core.TestAdd(Core.AsI32(1), Core.AsI32(2)) // CHECK:STDOUT: %.loc7_26.2: Core.Form = init_form %.loc7_26.1 [concrete = constants.%.805] // CHECK:STDOUT: %N.param: Core.IntLiteral = value_param call_param0 // CHECK:STDOUT: %IntLiteral.ref: type = name_ref IntLiteral, file.%IntLiteral [concrete = Core.IntLiteral] -// CHECK:STDOUT: %N: Core.IntLiteral = value_binding N, %N.param +// CHECK:STDOUT: %N: Core.IntLiteral = wrapper_binding N, %N.param // CHECK:STDOUT: %return.param: ref type = out_param call_param1 // CHECK:STDOUT: %return: ref type = return_slot %return.param // CHECK:STDOUT: } @@ -116,7 +116,7 @@ var arr: array(i32, Core.AsIntLiteral(Core.TestAdd(Core.AsI32(1), Core.AsI32(2)) // CHECK:STDOUT: %.loc9_28.2: Core.Form = init_form %.loc9_28.1 [concrete = constants.%.9cb] // CHECK:STDOUT: %a.param: Core.IntLiteral = value_param call_param0 // CHECK:STDOUT: %IntLiteral.ref: type = name_ref IntLiteral, file.%IntLiteral [concrete = Core.IntLiteral] -// CHECK:STDOUT: %a: Core.IntLiteral = value_binding a, %a.param +// CHECK:STDOUT: %a: Core.IntLiteral = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref %i32.builtin = out_param call_param1 // CHECK:STDOUT: %return: ref %i32.builtin = return_slot %return.param // CHECK:STDOUT: } @@ -130,7 +130,7 @@ var arr: array(i32, Core.AsIntLiteral(Core.TestAdd(Core.AsI32(1), Core.AsI32(2)) // CHECK:STDOUT: %.loc10_28: Core.Form = init_form %IntLiteral.ref [concrete = constants.%.f7d] // CHECK:STDOUT: %a.param: %i32.builtin = value_param call_param0 // CHECK:STDOUT: %.loc10_20: type = type_literal constants.%i32.builtin [concrete = constants.%i32.builtin] -// CHECK:STDOUT: %a: %i32.builtin = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32.builtin = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref Core.IntLiteral = out_param call_param1 // CHECK:STDOUT: %return: ref Core.IntLiteral = return_slot %return.param // CHECK:STDOUT: } @@ -146,10 +146,10 @@ var arr: array(i32, Core.AsIntLiteral(Core.TestAdd(Core.AsI32(1), Core.AsI32(2)) // CHECK:STDOUT: %.loc12_31.2: Core.Form = init_form %.loc12_31.1 [concrete = constants.%.9cb] // CHECK:STDOUT: %a.param: %i32.builtin = value_param call_param0 // CHECK:STDOUT: %.loc12_15: type = type_literal constants.%i32.builtin [concrete = constants.%i32.builtin] -// CHECK:STDOUT: %a: %i32.builtin = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32.builtin = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %i32.builtin = value_param call_param1 // CHECK:STDOUT: %.loc12_23: type = type_literal constants.%i32.builtin [concrete = constants.%i32.builtin] -// CHECK:STDOUT: %b: %i32.builtin = value_binding b, %b.param +// CHECK:STDOUT: %b: %i32.builtin = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref %i32.builtin = out_param call_param2 // CHECK:STDOUT: %return: ref %i32.builtin = return_slot %return.param // CHECK:STDOUT: } @@ -245,7 +245,7 @@ var arr: array(i32, Core.AsIntLiteral(Core.TestAdd(Core.AsI32(1), Core.AsI32(2)) // CHECK:STDOUT: %.loc4_81.2: Core.IntLiteral = converted %AsIntLiteral.call, %.loc4_81.1 [concrete = constants.%int_3.1ba] // CHECK:STDOUT: %array_type: type = array_type %.loc4_81.2, %.loc4_16 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %arr: ref %array_type = ref_binding arr, %arr.var [concrete = %arr.var] +// CHECK:STDOUT: %arr: ref %array_type = wrapper_binding arr, %arr.var [concrete = %arr.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Int = "int.make_type_signed" [from "core.carbon"]; diff --git a/toolchain/check/testdata/function/builtin/method.carbon b/toolchain/check/testdata/function/builtin/method.carbon index 2ecff9294d5a..c675dec54694 100644 --- a/toolchain/check/testdata/function/builtin/method.carbon +++ b/toolchain/check/testdata/function/builtin/method.carbon @@ -199,7 +199,7 @@ var arr: array(i32, (1 as i32).(I.F)(2)); // CHECK:STDOUT: %.loc23_39.4: Core.IntLiteral = converted %i32.as.I.impl.F.call, %.loc23_39.3 [concrete = constants.%int_3.1ba] // CHECK:STDOUT: %array_type: type = array_type %.loc23_39.4, %i32.loc23_16 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %arr: ref %array_type = ref_binding arr, %arr.var [concrete = %arr.var] +// CHECK:STDOUT: %arr: ref %array_type = wrapper_binding arr, %arr.var [concrete = %arr.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @I { @@ -225,14 +225,14 @@ var arr: array(i32, (1 as i32).(I.F)(2)); // CHECK:STDOUT: %Self.as_type.loc16_8.2: type = facet_access_type %Self.ref.loc16_8 [symbolic = %Self.as_type.loc16_8.1 (constants.%Self.as_type.c84)] // CHECK:STDOUT: %.loc16_8.2: type = converted %Self.ref.loc16_8, %Self.as_type.loc16_8.2 [symbolic = %Self.as_type.loc16_8.1 (constants.%Self.as_type.c84)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @I.WithSelf.F.%Self.as_type.loc16_8.1 (%Self.as_type.c84) = value_binding self, %self.param +// CHECK:STDOUT: %self: @I.WithSelf.F.%Self.as_type.loc16_8.1 (%Self.as_type.c84) = wrapper_binding self, %self.param // CHECK:STDOUT: %other.param: @I.WithSelf.F.%Self.as_type.loc16_8.1 (%Self.as_type.c84) = value_param call_param1 // CHECK:STDOUT: %.loc16_21.1: type = splice_block %.loc16_21.2 [symbolic = %Self.as_type.loc16_8.1 (constants.%Self.as_type.c84)] { // CHECK:STDOUT: %Self.ref.loc16_21: %I.type = name_ref Self, @I.%Self [symbolic = %Self (constants.%Self.37e)] // CHECK:STDOUT: %Self.as_type.loc16_21: type = facet_access_type %Self.ref.loc16_21 [symbolic = %Self.as_type.loc16_8.1 (constants.%Self.as_type.c84)] // CHECK:STDOUT: %.loc16_21.2: type = converted %Self.ref.loc16_21, %Self.as_type.loc16_21 [symbolic = %Self.as_type.loc16_8.1 (constants.%Self.as_type.c84)] // CHECK:STDOUT: } -// CHECK:STDOUT: %other: @I.WithSelf.F.%Self.as_type.loc16_8.1 (%Self.as_type.c84) = value_binding other, %other.param +// CHECK:STDOUT: %other: @I.WithSelf.F.%Self.as_type.loc16_8.1 (%Self.as_type.c84) = wrapper_binding other, %other.param // CHECK:STDOUT: %return.param: ref @I.WithSelf.F.%Self.as_type.loc16_8.1 (%Self.as_type.c84) = out_param call_param2 // CHECK:STDOUT: %return: ref @I.WithSelf.F.%Self.as_type.loc16_8.1 (%Self.as_type.c84) = return_slot %return.param // CHECK:STDOUT: } @@ -259,10 +259,10 @@ var arr: array(i32, (1 as i32).(I.F)(2)); // CHECK:STDOUT: %.loc20: Core.Form = init_form %i32.loc20_34 [concrete = constants.%.795] // CHECK:STDOUT: %self.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc20_14: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %self: %i32 = value_binding self, %self.param +// CHECK:STDOUT: %self: %i32 = wrapper_binding self, %self.param // CHECK:STDOUT: %other.param: %i32 = value_param call_param1 // CHECK:STDOUT: %i32.loc20_26: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %other: %i32 = value_binding other, %other.param +// CHECK:STDOUT: %other: %i32 = wrapper_binding other, %other.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param2 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/alias.carbon b/toolchain/check/testdata/function/call/alias.carbon index 68c904d925bc..ae5191246c0c 100644 --- a/toolchain/check/testdata/function/call/alias.carbon +++ b/toolchain/check/testdata/function/call/alias.carbon @@ -94,7 +94,7 @@ fn Main() { // CHECK:STDOUT: %.loc20_18.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc20_18.3: type = converted %.loc20_18.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: ref %empty_tuple.type = ref_binding b, %b.var +// CHECK:STDOUT: %b: ref %empty_tuple.type = wrapper_binding b, %b.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %b.var, constants.%Destroy.Op // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%b.var) // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/function/call/empty_struct.carbon b/toolchain/check/testdata/function/call/empty_struct.carbon index c710cae45b1c..cdbd1bb57994 100644 --- a/toolchain/check/testdata/function/call/empty_struct.carbon +++ b/toolchain/check/testdata/function/call/empty_struct.carbon @@ -56,7 +56,7 @@ fn Main() { // CHECK:STDOUT: %.loc15_13.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc15_13.3: type = converted %.loc15_13.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %empty_struct_type = value_binding a, %a.param +// CHECK:STDOUT: %a: %empty_struct_type = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref %empty_struct_type = out_param call_param1 // CHECK:STDOUT: %return: ref %empty_struct_type = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/empty_tuple.carbon b/toolchain/check/testdata/function/call/empty_tuple.carbon index bc421277c36d..73967d33e602 100644 --- a/toolchain/check/testdata/function/call/empty_tuple.carbon +++ b/toolchain/check/testdata/function/call/empty_tuple.carbon @@ -56,7 +56,7 @@ fn Main() { // CHECK:STDOUT: %.loc15_13.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc15_13.3: type = converted %.loc15_13.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %empty_tuple.type = value_binding a, %a.param +// CHECK:STDOUT: %a: %empty_tuple.type = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref %empty_tuple.type = out_param call_param1 // CHECK:STDOUT: %return: ref %empty_tuple.type = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/fail_param_count.carbon b/toolchain/check/testdata/function/call/fail_param_count.carbon index fa55f6997a42..41a8a93690ad 100644 --- a/toolchain/check/testdata/function/call/fail_param_count.carbon +++ b/toolchain/check/testdata/function/call/fail_param_count.carbon @@ -119,7 +119,7 @@ fn Main() { // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %Run2.decl: %Run2.type = fn_decl @Run2 [concrete = constants.%Run2] { // CHECK:STDOUT: %a.param_patt: %pattern_type.6b6 = value_param_pattern [concrete = constants.%a.param_patt] @@ -129,10 +129,10 @@ fn Main() { // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc17_19: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %i32 = value_param call_param1 // CHECK:STDOUT: %i32.loc17_34: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: %i32 = value_binding b, %b.param +// CHECK:STDOUT: %b: %i32 = wrapper_binding b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: %Main.decl: %Main.type = fn_decl @Main [concrete = constants.%Main] {} {} // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/fail_param_type.carbon b/toolchain/check/testdata/function/call/fail_param_type.carbon index b50079dfea8d..ac247cecaffd 100644 --- a/toolchain/check/testdata/function/call/fail_param_type.carbon +++ b/toolchain/check/testdata/function/call/fail_param_type.carbon @@ -72,7 +72,7 @@ fn F() { // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [concrete = constants.%F] {} {} // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon b/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon index eb470c0b573d..99c55851ff30 100644 --- a/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon +++ b/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon @@ -131,7 +131,7 @@ fn Run() { // CHECK:STDOUT: %.loc25: %i32 = converted %Foo.call, [concrete = ] // CHECK:STDOUT: assign %x.var, // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %x: ref %i32 = ref_binding x, %x.var +// CHECK:STDOUT: %x: ref %i32 = wrapper_binding x, %x.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %x.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%x.var) // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/function/call/form.carbon b/toolchain/check/testdata/function/call/form.carbon index 75eeaf21365e..7ce2f13c3b53 100644 --- a/toolchain/check/testdata/function/call/form.carbon +++ b/toolchain/check/testdata/function/call/form.carbon @@ -313,7 +313,7 @@ fn G() { // CHECK:STDOUT: %.loc4_15.2: Core.Form = ref_form %i32 [concrete = constants.%.512] // CHECK:STDOUT: %.loc4_15.3: type = type_component_of %.loc4_15.2 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %i32 = ref_binding x, %x.param +// CHECK:STDOUT: %x: ref %i32 = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -379,7 +379,7 @@ fn G() { // CHECK:STDOUT: %.loc4_15.2: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %.loc4_15.3: type = type_component_of %.loc4_15.2 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %i32 = ref_binding x, %x.param +// CHECK:STDOUT: %x: ref %i32 = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -455,7 +455,7 @@ fn G() { // CHECK:STDOUT: %.loc4_15.2: Core.Form = value_form %i32 [concrete = constants.%.c2a] // CHECK:STDOUT: %.loc4_15.3: type = type_component_of %.loc4_15.2 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %i32 = value_binding x, %x.param +// CHECK:STDOUT: %x: %i32 = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -501,7 +501,7 @@ fn G() { // CHECK:STDOUT: %.loc4_15.2: Core.Form = ref_form %.loc4_20.2 [concrete = constants.%.9f9] // CHECK:STDOUT: %.loc4_15.3: type = type_component_of %.loc4_15.2 [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %empty_tuple.type = ref_binding x, %x.param +// CHECK:STDOUT: %x: ref %empty_tuple.type = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -544,7 +544,7 @@ fn G() { // CHECK:STDOUT: %F.ref: %F.type = name_ref F, file.%F.decl [concrete = constants.%F] // CHECK:STDOUT: %F.call: ref %i32 = call %F.ref() // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %_: ref %i32 = ref_binding _, %F.call +// CHECK:STDOUT: %_: ref %i32 = wrapper_binding _, %F.call // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -593,7 +593,7 @@ fn G() { // CHECK:STDOUT: %F.call: init %i32 = call %F.ref() // CHECK:STDOUT: assign %_.var, %F.call // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %_: ref %i32 = ref_binding _, %_.var +// CHECK:STDOUT: %_: ref %i32 = wrapper_binding _, %_.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %_.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%_.var) // CHECK:STDOUT: @@ -643,7 +643,7 @@ fn G() { // CHECK:STDOUT: %F.ref: %F.type = name_ref F, file.%F.decl [concrete = constants.%F] // CHECK:STDOUT: %F.call: %i32 = call %F.ref() // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %_: %i32 = value_binding _, %F.call +// CHECK:STDOUT: %_: %i32 = wrapper_binding _, %F.call // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -866,7 +866,7 @@ fn G() { // CHECK:STDOUT: %.loc11: init %i32 = converted %int_0, %Core.IntLiteral.as.ImplicitAs.impl.Convert.call [concrete = constants.%int_0.3c0] // CHECK:STDOUT: assign %v.var.loc11, %.loc11 // CHECK:STDOUT: %i32.loc11: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %v: ref %i32 = ref_binding v, %v.var.loc11 +// CHECK:STDOUT: %v: ref %i32 = wrapper_binding v, %v.var.loc11 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %x.patt: %pattern_type.6b6 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.6b6 = var_pattern %x.patt [concrete = constants.%x.var_patt] @@ -888,7 +888,7 @@ fn G() { // CHECK:STDOUT: %F.call.loc13: init %i32 = call %F.specific_fn.loc13(%v.var.1) // CHECK:STDOUT: assign %x.var, %F.call.loc13 // CHECK:STDOUT: %i32.loc13_17: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %x: ref %i32 = ref_binding x, %x.var +// CHECK:STDOUT: %x: ref %i32 = wrapper_binding x, %x.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %y.patt: %pattern_type.6b6 = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: } @@ -900,7 +900,7 @@ fn G() { // CHECK:STDOUT: %F.specific_fn.loc14: = specific_function %F.ref.loc14, @F(constants.%.512) [concrete = constants.%F.specific_fn.0c3] // CHECK:STDOUT: %F.call.loc14: ref %i32 = call %F.specific_fn.loc14(%v.ref.loc14) // CHECK:STDOUT: %i32.loc14_21: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %y: ref %i32 = ref_binding y, %F.call.loc14 +// CHECK:STDOUT: %y: ref %i32 = wrapper_binding y, %F.call.loc14 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %z.patt: %pattern_type.6b6 = value_binding_pattern z [concrete = constants.%z.patt] // CHECK:STDOUT: } @@ -912,7 +912,7 @@ fn G() { // CHECK:STDOUT: %.loc15_40: %i32 = acquire_value %v.ref.loc15 // CHECK:STDOUT: %F.call.loc15: %i32 = call %F.specific_fn.loc15(%.loc15_40) // CHECK:STDOUT: %i32.loc15_17: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %z: %i32 = value_binding z, %F.call.loc15 +// CHECK:STDOUT: %z: %i32 = wrapper_binding z, %F.call.loc15 // CHECK:STDOUT: %Op.ref: %Destroy.assoc_type = name_ref Op, imports.%Core.import_ref.c64 [concrete = constants.%assoc0.ae8] // CHECK:STDOUT: %impl.elem0.1: %.22e = impl_witness_access constants.%custom_witness.df9cc1.2, element0 [concrete = constants.%Destroy.Op.1a2547.2] // CHECK:STDOUT: %bound_method.1: = bound_method %v.var.1, %impl.elem0.1 diff --git a/toolchain/check/testdata/function/call/i32.carbon b/toolchain/check/testdata/function/call/i32.carbon index 4eac8f74b4e3..f254866d970a 100644 --- a/toolchain/check/testdata/function/call/i32.carbon +++ b/toolchain/check/testdata/function/call/i32.carbon @@ -110,7 +110,7 @@ fn Main() { // CHECK:STDOUT: %.loc15: Core.Form = init_form %i32.loc15_20 [concrete = constants.%.795] // CHECK:STDOUT: %a.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc15_12: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -147,7 +147,7 @@ fn Main() { // CHECK:STDOUT: %Echo.call: init %i32 = call %Echo.ref(%.loc20_28.2) // CHECK:STDOUT: assign %b.var, %Echo.call // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: ref %i32 = ref_binding b, %b.var +// CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %b.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%b.var) // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/function/call/more_param_ir.carbon b/toolchain/check/testdata/function/call/more_param_ir.carbon index 86d58f94b575..b501b262d0a1 100644 --- a/toolchain/check/testdata/function/call/more_param_ir.carbon +++ b/toolchain/check/testdata/function/call/more_param_ir.carbon @@ -104,10 +104,10 @@ fn Main() { // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc15_18: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %i32 = value_param call_param1 // CHECK:STDOUT: %i32.loc15_33: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: %i32 = value_binding b, %b.param +// CHECK:STDOUT: %b: %i32 = wrapper_binding b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: %Main.decl: %Main.type = fn_decl @Main [concrete = constants.%Main] {} {} // CHECK:STDOUT: } @@ -140,7 +140,7 @@ fn Main() { // CHECK:STDOUT: %.loc18_15.2: %tuple.type.85c = tuple_literal (%i32) [concrete = constants.%tuple.19c] // CHECK:STDOUT: %.loc18_15.3: type = converted %.loc18_15.2, constants.%tuple.type.a8a [concrete = constants.%tuple.type.a8a] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %tuple.type.a8a = ref_binding x, %x.var +// CHECK:STDOUT: %x: ref %tuple.type.a8a = wrapper_binding x, %x.var // CHECK:STDOUT: %Foo.ref: %Foo.type = name_ref Foo, file.%Foo.decl [concrete = constants.%Foo] // CHECK:STDOUT: %x.ref: ref %tuple.type.a8a = name_ref x, %x // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [concrete = constants.%int_0] diff --git a/toolchain/check/testdata/function/call/params_one.carbon b/toolchain/check/testdata/function/call/params_one.carbon index 793cd8a0ebd9..7ea0d866660d 100644 --- a/toolchain/check/testdata/function/call/params_one.carbon +++ b/toolchain/check/testdata/function/call/params_one.carbon @@ -78,7 +78,7 @@ fn Main() { // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %Main.decl: %Main.type = fn_decl @Main [concrete = constants.%Main] {} {} // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/params_one_comma.carbon b/toolchain/check/testdata/function/call/params_one_comma.carbon index d8ea38e62604..53a02c5429e7 100644 --- a/toolchain/check/testdata/function/call/params_one_comma.carbon +++ b/toolchain/check/testdata/function/call/params_one_comma.carbon @@ -79,7 +79,7 @@ fn Main() { // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %Main.decl: %Main.type = fn_decl @Main [concrete = constants.%Main] {} {} // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/params_two.carbon b/toolchain/check/testdata/function/call/params_two.carbon index ac3dd53df5c5..c461b1872c44 100644 --- a/toolchain/check/testdata/function/call/params_two.carbon +++ b/toolchain/check/testdata/function/call/params_two.carbon @@ -86,10 +86,10 @@ fn Main() { // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc15_18: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %i32 = value_param call_param1 // CHECK:STDOUT: %i32.loc15_33: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: %i32 = value_binding b, %b.param +// CHECK:STDOUT: %b: %i32 = wrapper_binding b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: %Main.decl: %Main.type = fn_decl @Main [concrete = constants.%Main] {} {} // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/params_two_comma.carbon b/toolchain/check/testdata/function/call/params_two_comma.carbon index 3c16ccdb3e0d..8360e9de1abe 100644 --- a/toolchain/check/testdata/function/call/params_two_comma.carbon +++ b/toolchain/check/testdata/function/call/params_two_comma.carbon @@ -87,10 +87,10 @@ fn Main() { // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc15_18: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %i32 = value_param call_param1 // CHECK:STDOUT: %i32.loc15_33: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: %i32 = value_binding b, %b.param +// CHECK:STDOUT: %b: %i32 = wrapper_binding b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: %Main.decl: %Main.type = fn_decl @Main [concrete = constants.%Main] {} {} // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/ref.carbon b/toolchain/check/testdata/function/call/ref.carbon index 10636dbec318..1933beced8fa 100644 --- a/toolchain/check/testdata/function/call/ref.carbon +++ b/toolchain/check/testdata/function/call/ref.carbon @@ -158,7 +158,7 @@ fn G(ref d: D) { F(ref d); } // CHECK:STDOUT: } { // CHECK:STDOUT: %x.param: ref %i32 = ref_param call_param0 // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %x: ref %i32 = ref_binding x, %x.param +// CHECK:STDOUT: %x: ref %i32 = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [concrete = constants.%G] {} {} // CHECK:STDOUT: } @@ -181,7 +181,7 @@ fn G(ref d: D) { F(ref d); } // CHECK:STDOUT: %.loc8: init %i32 = converted %int_0, %Core.IntLiteral.as.ImplicitAs.impl.Convert.call [concrete = constants.%int_0.3c0] // CHECK:STDOUT: assign %y.var, %.loc8 // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %y: ref %i32 = ref_binding y, %y.var +// CHECK:STDOUT: %y: ref %i32 = wrapper_binding y, %y.var // CHECK:STDOUT: %F.ref: %F.type = name_ref F, file.%F.decl [concrete = constants.%F] // CHECK:STDOUT: %y.ref: ref %i32 = name_ref y, %y // CHECK:STDOUT: %.loc10: %i32 = ref_tag %y.ref @@ -241,7 +241,7 @@ fn G(ref d: D) { F(ref d); } // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: ref %C = ref_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%C [concrete = constants.%C] -// CHECK:STDOUT: %self: ref %C = ref_binding self, %self.param +// CHECK:STDOUT: %self: ref %C = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%empty_struct_type [concrete = constants.%complete_type] // CHECK:STDOUT: complete_type_witness = %complete_type @@ -269,7 +269,7 @@ fn G(ref d: D) { F(ref d); } // CHECK:STDOUT: %T.as.DefaultOrUnformed.impl.Op.call: init %C to %.loc10_3 = call %T.as.DefaultOrUnformed.impl.Op.specific_fn() // CHECK:STDOUT: assign %c.var, %T.as.DefaultOrUnformed.impl.Op.call // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var // CHECK:STDOUT: %c.ref: ref %C = name_ref c, %c // CHECK:STDOUT: %F.ref: %C.F.type = name_ref F, @C.%C.F.decl [concrete = constants.%C.F] // CHECK:STDOUT: %C.F.bound: = bound_method %c.ref, %F.ref diff --git a/toolchain/check/testdata/function/call/return_implicit.carbon b/toolchain/check/testdata/function/call/return_implicit.carbon index db73ff851a6e..4dfd1d67f16f 100644 --- a/toolchain/check/testdata/function/call/return_implicit.carbon +++ b/toolchain/check/testdata/function/call/return_implicit.carbon @@ -75,7 +75,7 @@ fn Main() { // CHECK:STDOUT: %.loc19_18.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc19_18.3: type = converted %.loc19_18.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: ref %empty_tuple.type = ref_binding b, %b.var +// CHECK:STDOUT: %b: ref %empty_tuple.type = wrapper_binding b, %b.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %b.var, constants.%Destroy.Op // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%b.var) // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/function/declaration/export_name.carbon b/toolchain/check/testdata/function/declaration/export_name.carbon index 0bc970467133..e826c635523e 100644 --- a/toolchain/check/testdata/function/declaration/export_name.carbon +++ b/toolchain/check/testdata/function/declaration/export_name.carbon @@ -110,7 +110,7 @@ var f: () = F(); // CHECK:STDOUT: %.loc6_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_9.3: type = converted %.loc6_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %f: ref %empty_tuple.type = ref_binding f, %f.var [concrete = %f.var] +// CHECK:STDOUT: %f: ref %empty_tuple.type = wrapper_binding f, %f.var [concrete = %f.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F [from "export.carbon"]; diff --git a/toolchain/check/testdata/function/declaration/extern.carbon b/toolchain/check/testdata/function/declaration/extern.carbon index 8ffc6f6eb753..098ee07b4006 100644 --- a/toolchain/check/testdata/function/declaration/extern.carbon +++ b/toolchain/check/testdata/function/declaration/extern.carbon @@ -132,7 +132,7 @@ extern library "basic" fn F(); // CHECK:STDOUT: %.loc4_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_9.3: type = converted %.loc4_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %empty_tuple.type = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %empty_tuple.type = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: extern fn @F [from "basic.carbon"]; @@ -209,7 +209,7 @@ extern library "basic" fn F(); // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %C = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%C [concrete = constants.%C] -// CHECK:STDOUT: %self: %C = value_binding self, %self.param +// CHECK:STDOUT: %self: %C = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%empty_struct_type [concrete = constants.%complete_type] // CHECK:STDOUT: complete_type_witness = %complete_type diff --git a/toolchain/check/testdata/function/declaration/fail_param_in_type.carbon b/toolchain/check/testdata/function/declaration/fail_param_in_type.carbon index 526d059d3fc9..60884d7f6d50 100644 --- a/toolchain/check/testdata/function/declaration/fail_param_in_type.carbon +++ b/toolchain/check/testdata/function/declaration/fail_param_in_type.carbon @@ -55,14 +55,14 @@ fn F(n: i32, a: array(i32, n)*); // CHECK:STDOUT: } { // CHECK:STDOUT: %n.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc19_9: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: %i32 = value_binding n, %n.param +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, %n.param // CHECK:STDOUT: %a.param: = value_param call_param1 // CHECK:STDOUT: %.loc19: type = splice_block %ptr [concrete = ] { // CHECK:STDOUT: %i32.loc19_23: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %n.ref: %i32 = name_ref n, %n // CHECK:STDOUT: %ptr: type = ptr_type [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: = value_binding a, [concrete = ] +// CHECK:STDOUT: %a: = wrapper_binding a, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/declaration/fail_param_redecl.carbon b/toolchain/check/testdata/function/declaration/fail_param_redecl.carbon index 861bb53e5c3c..239802ce61d7 100644 --- a/toolchain/check/testdata/function/declaration/fail_param_redecl.carbon +++ b/toolchain/check/testdata/function/declaration/fail_param_redecl.carbon @@ -58,10 +58,10 @@ fn F(n: i32, n: i32); // CHECK:STDOUT: } { // CHECK:STDOUT: %n.param.loc22_7: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc22_9: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n.loc22_7: %i32 = value_binding n, %n.param.loc22_7 +// CHECK:STDOUT: %n.loc22_7: %i32 = wrapper_binding n, %n.param.loc22_7 // CHECK:STDOUT: %n.param.loc22_15: %i32 = value_param call_param1 // CHECK:STDOUT: %i32.loc22_17: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n.loc22_15: %i32 = value_binding n, %n.param.loc22_15 +// CHECK:STDOUT: %n.loc22_15: %i32 = wrapper_binding n, %n.param.loc22_15 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/declaration/fail_redecl.carbon b/toolchain/check/testdata/function/declaration/fail_redecl.carbon index d297d5b26995..3bcda9e11008 100644 --- a/toolchain/check/testdata/function/declaration/fail_redecl.carbon +++ b/toolchain/check/testdata/function/declaration/fail_redecl.carbon @@ -105,7 +105,7 @@ fn E() {} // CHECK:STDOUT: %.loc25_10.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc25_10.3: type = converted %.loc25_10.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.loc25: %empty_tuple.type = value_binding x, %x.param.loc25 +// CHECK:STDOUT: %x.loc25: %empty_tuple.type = wrapper_binding x, %x.param.loc25 // CHECK:STDOUT: } // CHECK:STDOUT: %B.decl.loc33: %B.type = fn_decl @B [concrete = constants.%B] { // CHECK:STDOUT: %x.param_patt: %pattern_type = value_param_pattern [concrete = constants.%x.param_patt] @@ -116,7 +116,7 @@ fn E() {} // CHECK:STDOUT: %.loc33_10.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc33_10.3: type = converted %.loc33_10.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.loc33: %empty_tuple.type = value_binding x, %x.param.loc33 +// CHECK:STDOUT: %x.loc33: %empty_tuple.type = wrapper_binding x, %x.param.loc33 // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl.loc35: %C.type.322e3b.1 = fn_decl @C.loc35 [concrete = constants.%C.010386.1] {} {} // CHECK:STDOUT: %C.decl.loc43: %C.type.322e3b.2 = fn_decl @C.loc43 [concrete = constants.%C.010386.2] { @@ -128,7 +128,7 @@ fn E() {} // CHECK:STDOUT: %.loc43_10.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc43_10.3: type = converted %.loc43_10.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %empty_tuple.type = value_binding x, %x.param +// CHECK:STDOUT: %x: %empty_tuple.type = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %D.decl.loc45: %D.type = fn_decl @D [concrete = constants.%D] {} {} // CHECK:STDOUT: %D.decl.loc53: %D.type = fn_decl @D [concrete = constants.%D] {} {} diff --git a/toolchain/check/testdata/function/declaration/import.carbon b/toolchain/check/testdata/function/declaration/import.carbon index 172848ca81a9..03b8d8309f69 100644 --- a/toolchain/check/testdata/function/declaration/import.carbon +++ b/toolchain/check/testdata/function/declaration/import.carbon @@ -326,7 +326,7 @@ import library "extern_api"; // CHECK:STDOUT: %.loc5: Core.Form = init_form %i32.loc5_17 [concrete = constants.%.795] // CHECK:STDOUT: %b.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc5_9: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: %i32 = value_binding b, %b.param +// CHECK:STDOUT: %b: %i32 = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -345,7 +345,7 @@ import library "extern_api"; // CHECK:STDOUT: %.loc6_14.2: %tuple.type.85c = tuple_literal (%i32.loc6_10) [concrete = constants.%tuple] // CHECK:STDOUT: %.loc6_14.3: type = converted %.loc6_14.2, constants.%tuple.type.a8a [concrete = constants.%tuple.type.a8a] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %tuple.type.a8a = value_binding c, %c.param +// CHECK:STDOUT: %c: %tuple.type.a8a = wrapper_binding c, %c.param // CHECK:STDOUT: %return.param: ref %struct_type.c = out_param call_param1 // CHECK:STDOUT: %return: ref %struct_type.c = return_slot %return.param // CHECK:STDOUT: } @@ -432,7 +432,7 @@ import library "extern_api"; // CHECK:STDOUT: %.loc5: Core.Form = init_form %i32.loc5_52 [concrete = constants.%.795] // CHECK:STDOUT: %b.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc5_44: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: %i32 = value_binding b, %b.param +// CHECK:STDOUT: %b: %i32 = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -451,7 +451,7 @@ import library "extern_api"; // CHECK:STDOUT: %.loc6_49.2: %tuple.type.85c = tuple_literal (%i32.loc6_45) [concrete = constants.%tuple] // CHECK:STDOUT: %.loc6_49.3: type = converted %.loc6_49.2, constants.%tuple.type.a8a [concrete = constants.%tuple.type.a8a] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %tuple.type.a8a = value_binding c, %c.param +// CHECK:STDOUT: %c: %tuple.type.a8a = wrapper_binding c, %c.param // CHECK:STDOUT: %return.param: ref %struct_type.c = out_param call_param1 // CHECK:STDOUT: %return: ref %struct_type.c = return_slot %return.param // CHECK:STDOUT: } @@ -575,14 +575,14 @@ import library "extern_api"; // CHECK:STDOUT: %.loc6_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_9.3: type = converted %.loc6_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %empty_tuple.type = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %empty_tuple.type = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt.b23] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] // CHECK:STDOUT: %i32.loc7: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: ref %i32 = ref_binding b, %b.var [concrete = %b.var] +// CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.e1a = ref_binding_pattern c [concrete = constants.%c.patt.863] // CHECK:STDOUT: %c.var_patt: %pattern_type.e1a = var_pattern %c.patt [concrete = constants.%c.var_patt] @@ -592,7 +592,7 @@ import library "extern_api"; // CHECK:STDOUT: %i32.loc8: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.c: type = struct_type {.c: %i32} [concrete = constants.%struct_type.c] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %struct_type.c = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %struct_type.c = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.cb1 = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.cb1 = var_pattern %d.patt [concrete = constants.%d.var_patt] @@ -602,7 +602,7 @@ import library "extern_api"; // CHECK:STDOUT: %.loc9_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc9_9.3: type = converted %.loc9_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %d: ref %empty_tuple.type = ref_binding d, %d.var [concrete = %d.var] +// CHECK:STDOUT: %d: ref %empty_tuple.type = wrapper_binding d, %d.var [concrete = %d.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %e.patt: %pattern_type.cb1 = ref_binding_pattern e [concrete = constants.%e.patt] // CHECK:STDOUT: %e.var_patt: %pattern_type.cb1 = var_pattern %e.patt [concrete = constants.%e.var_patt] @@ -612,7 +612,7 @@ import library "extern_api"; // CHECK:STDOUT: %.loc10_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc10_9.3: type = converted %.loc10_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %e: ref %empty_tuple.type = ref_binding e, %e.var [concrete = %e.var] +// CHECK:STDOUT: %e: ref %empty_tuple.type = wrapper_binding e, %e.var [concrete = %e.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A [from "api.carbon"]; @@ -764,7 +764,7 @@ import library "extern_api"; // CHECK:STDOUT: %.loc23: Core.Form = init_form %i32.loc23_24 [concrete = constants.%.795] // CHECK:STDOUT: %b.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc23_16: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: %i32 = value_binding b, %b.param +// CHECK:STDOUT: %b: %i32 = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -778,7 +778,7 @@ import library "extern_api"; // CHECK:STDOUT: %.loc32_21.2: %tuple.type.85c = tuple_literal (%i32.loc32_17) [concrete = constants.%tuple.19c] // CHECK:STDOUT: %.loc32_21.3: type = converted %.loc32_21.2, constants.%tuple.type.a8a [concrete = constants.%tuple.type.a8a] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %tuple.type.a8a = value_binding c, %c.param +// CHECK:STDOUT: %c: %tuple.type.a8a = wrapper_binding c, %c.param // CHECK:STDOUT: %return.param: ref %struct_type.c = out_param call_param1 // CHECK:STDOUT: %return: ref %struct_type.c = return_slot %return.param // CHECK:STDOUT: } @@ -793,14 +793,14 @@ import library "extern_api"; // CHECK:STDOUT: %.loc52_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc52_9.3: type = converted %.loc52_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %empty_tuple.type = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %empty_tuple.type = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt.b23] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] // CHECK:STDOUT: %i32.loc53: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: ref %i32 = ref_binding b, %b.var [concrete = %b.var] +// CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.e1a = ref_binding_pattern c [concrete = constants.%c.patt.863] // CHECK:STDOUT: %c.var_patt: %pattern_type.e1a = var_pattern %c.patt [concrete = constants.%c.var_patt] @@ -810,7 +810,7 @@ import library "extern_api"; // CHECK:STDOUT: %i32.loc54: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.c: type = struct_type {.c: %i32} [concrete = constants.%struct_type.c] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %struct_type.c = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %struct_type.c = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.cb1 = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.cb1 = var_pattern %d.patt [concrete = constants.%d.var_patt] @@ -820,7 +820,7 @@ import library "extern_api"; // CHECK:STDOUT: %.loc55_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc55_9.3: type = converted %.loc55_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %d: ref %empty_tuple.type = ref_binding d, %d.var [concrete = %d.var] +// CHECK:STDOUT: %d: ref %empty_tuple.type = wrapper_binding d, %d.var [concrete = %d.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %e.patt: %pattern_type.cb1 = ref_binding_pattern e [concrete = constants.%e.patt] // CHECK:STDOUT: %e.var_patt: %pattern_type.cb1 = var_pattern %e.patt [concrete = constants.%e.var_patt] @@ -830,7 +830,7 @@ import library "extern_api"; // CHECK:STDOUT: %.loc56_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc56_9.3: type = converted %.loc56_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %e: ref %empty_tuple.type = ref_binding e, %e.var [concrete = %e.var] +// CHECK:STDOUT: %e: ref %empty_tuple.type = wrapper_binding e, %e.var [concrete = %e.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A [from "api.carbon"]; @@ -982,7 +982,7 @@ import library "extern_api"; // CHECK:STDOUT: %.loc7: Core.Form = init_form %i32.loc7_24 [concrete = constants.%.795] // CHECK:STDOUT: %b.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc7_16: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: %i32 = value_binding b, %b.param +// CHECK:STDOUT: %b: %i32 = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -996,7 +996,7 @@ import library "extern_api"; // CHECK:STDOUT: %.loc8_21.2: %tuple.type.85c = tuple_literal (%i32.loc8_17) [concrete = constants.%tuple.19c] // CHECK:STDOUT: %.loc8_21.3: type = converted %.loc8_21.2, constants.%tuple.type.a8a [concrete = constants.%tuple.type.a8a] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %tuple.type.a8a = value_binding c, %c.param +// CHECK:STDOUT: %c: %tuple.type.a8a = wrapper_binding c, %c.param // CHECK:STDOUT: %return.param: ref %struct_type.c = out_param call_param1 // CHECK:STDOUT: %return: ref %struct_type.c = return_slot %return.param // CHECK:STDOUT: } @@ -1011,14 +1011,14 @@ import library "extern_api"; // CHECK:STDOUT: %.loc12_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc12_9.3: type = converted %.loc12_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %empty_tuple.type = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %empty_tuple.type = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt.b23] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] // CHECK:STDOUT: %i32.loc13: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: ref %i32 = ref_binding b, %b.var [concrete = %b.var] +// CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.e1a = ref_binding_pattern c [concrete = constants.%c.patt.863] // CHECK:STDOUT: %c.var_patt: %pattern_type.e1a = var_pattern %c.patt [concrete = constants.%c.var_patt] @@ -1028,7 +1028,7 @@ import library "extern_api"; // CHECK:STDOUT: %i32.loc14: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.c: type = struct_type {.c: %i32} [concrete = constants.%struct_type.c] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %struct_type.c = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %struct_type.c = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.cb1 = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.cb1 = var_pattern %d.patt [concrete = constants.%d.var_patt] @@ -1038,7 +1038,7 @@ import library "extern_api"; // CHECK:STDOUT: %.loc15_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc15_9.3: type = converted %.loc15_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %d: ref %empty_tuple.type = ref_binding d, %d.var [concrete = %d.var] +// CHECK:STDOUT: %d: ref %empty_tuple.type = wrapper_binding d, %d.var [concrete = %d.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %e.patt: %pattern_type.cb1 = ref_binding_pattern e [concrete = constants.%e.patt] // CHECK:STDOUT: %e.var_patt: %pattern_type.cb1 = var_pattern %e.patt [concrete = constants.%e.var_patt] @@ -1048,7 +1048,7 @@ import library "extern_api"; // CHECK:STDOUT: %.loc16_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc16_9.3: type = converted %.loc16_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %e: ref %empty_tuple.type = ref_binding e, %e.var [concrete = %e.var] +// CHECK:STDOUT: %e: ref %empty_tuple.type = wrapper_binding e, %e.var [concrete = %e.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: extern fn @A; @@ -1204,14 +1204,14 @@ import library "extern_api"; // CHECK:STDOUT: %.loc52_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc52_9.3: type = converted %.loc52_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %empty_tuple.type = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %empty_tuple.type = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt.b23] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] // CHECK:STDOUT: %i32.loc53: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: ref %i32 = ref_binding b, %b.var [concrete = %b.var] +// CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.e1a = ref_binding_pattern c [concrete = constants.%c.patt.863] // CHECK:STDOUT: %c.var_patt: %pattern_type.e1a = var_pattern %c.patt [concrete = constants.%c.var_patt] @@ -1221,7 +1221,7 @@ import library "extern_api"; // CHECK:STDOUT: %i32.loc54: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.c: type = struct_type {.c: %i32} [concrete = constants.%struct_type.c] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %struct_type.c = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %struct_type.c = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.cb1 = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.cb1 = var_pattern %d.patt [concrete = constants.%d.var_patt] @@ -1231,7 +1231,7 @@ import library "extern_api"; // CHECK:STDOUT: %.loc55_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc55_9.3: type = converted %.loc55_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %d: ref %empty_tuple.type = ref_binding d, %d.var [concrete = %d.var] +// CHECK:STDOUT: %d: ref %empty_tuple.type = wrapper_binding d, %d.var [concrete = %d.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %e.patt: %pattern_type.cb1 = ref_binding_pattern e [concrete = constants.%e.patt] // CHECK:STDOUT: %e.var_patt: %pattern_type.cb1 = var_pattern %e.patt [concrete = constants.%e.var_patt] @@ -1241,7 +1241,7 @@ import library "extern_api"; // CHECK:STDOUT: %.loc56_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc56_9.3: type = converted %.loc56_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %e: ref %empty_tuple.type = ref_binding e, %e.var [concrete = %e.var] +// CHECK:STDOUT: %e: ref %empty_tuple.type = wrapper_binding e, %e.var [concrete = %e.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A [from "api.carbon"]; @@ -1397,14 +1397,14 @@ import library "extern_api"; // CHECK:STDOUT: %.loc52_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc52_9.3: type = converted %.loc52_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %empty_tuple.type = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %empty_tuple.type = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt.b23] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] // CHECK:STDOUT: %i32.loc53: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: ref %i32 = ref_binding b, %b.var [concrete = %b.var] +// CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.e1a = ref_binding_pattern c [concrete = constants.%c.patt.863] // CHECK:STDOUT: %c.var_patt: %pattern_type.e1a = var_pattern %c.patt [concrete = constants.%c.var_patt] @@ -1414,7 +1414,7 @@ import library "extern_api"; // CHECK:STDOUT: %i32.loc54: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.c: type = struct_type {.c: %i32} [concrete = constants.%struct_type.c] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %struct_type.c = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %struct_type.c = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.cb1 = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.cb1 = var_pattern %d.patt [concrete = constants.%d.var_patt] @@ -1424,7 +1424,7 @@ import library "extern_api"; // CHECK:STDOUT: %.loc55_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc55_9.3: type = converted %.loc55_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %d: ref %empty_tuple.type = ref_binding d, %d.var [concrete = %d.var] +// CHECK:STDOUT: %d: ref %empty_tuple.type = wrapper_binding d, %d.var [concrete = %d.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %e.patt: %pattern_type.cb1 = ref_binding_pattern e [concrete = constants.%e.patt] // CHECK:STDOUT: %e.var_patt: %pattern_type.cb1 = var_pattern %e.patt [concrete = constants.%e.var_patt] @@ -1434,7 +1434,7 @@ import library "extern_api"; // CHECK:STDOUT: %.loc56_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc56_9.3: type = converted %.loc56_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %e: ref %empty_tuple.type = ref_binding e, %e.var [concrete = %e.var] +// CHECK:STDOUT: %e: ref %empty_tuple.type = wrapper_binding e, %e.var [concrete = %e.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: extern fn @A; diff --git a/toolchain/check/testdata/function/declaration/param_same_name.carbon b/toolchain/check/testdata/function/declaration/param_same_name.carbon index e630214a59cc..749b190db84f 100644 --- a/toolchain/check/testdata/function/declaration/param_same_name.carbon +++ b/toolchain/check/testdata/function/declaration/param_same_name.carbon @@ -54,7 +54,7 @@ fn G(a: i32); // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [concrete = constants.%G] { // CHECK:STDOUT: %a.param_patt: %pattern_type.6b6 = value_param_pattern [concrete = constants.%a.param_patt] @@ -62,7 +62,7 @@ fn G(a: i32); // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/declaration/pattern_in_signature.carbon b/toolchain/check/testdata/function/declaration/pattern_in_signature.carbon index 836e638ef34f..5af11e629c1c 100644 --- a/toolchain/check/testdata/function/declaration/pattern_in_signature.carbon +++ b/toolchain/check/testdata/function/declaration/pattern_in_signature.carbon @@ -61,19 +61,19 @@ fn CallF(ab: ({}, {}), c: {}) { // CHECK:STDOUT: %.loc14_18.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc14_18.3: type = converted %.loc14_18.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %empty_struct_type = value_binding a, %a.param +// CHECK:STDOUT: %a: %empty_struct_type = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %empty_struct_type = value_param call_param1 // CHECK:STDOUT: %.loc14_32.1: type = splice_block %.loc14_32.3 [concrete = constants.%empty_struct_type] { // CHECK:STDOUT: %.loc14_32.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc14_32.3: type = converted %.loc14_32.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %empty_struct_type = value_binding b, %b.param +// CHECK:STDOUT: %b: %empty_struct_type = wrapper_binding b, %b.param // CHECK:STDOUT: %c.param: %empty_struct_type = value_param call_param2 // CHECK:STDOUT: %.loc14_47.1: type = splice_block %.loc14_47.3 [concrete = constants.%empty_struct_type] { // CHECK:STDOUT: %.loc14_47.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc14_47.3: type = converted %.loc14_47.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %empty_struct_type = value_binding c, %c.param +// CHECK:STDOUT: %c: %empty_struct_type = wrapper_binding c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: %CallF.decl: %CallF.type = fn_decl @CallF [concrete = constants.%CallF] { // CHECK:STDOUT: %ab.param_patt: %pattern_type.de4 = value_param_pattern [concrete = constants.%ab.param_patt] @@ -90,13 +90,13 @@ fn CallF(ab: ({}, {}), c: {}) { // CHECK:STDOUT: %.loc18_21.4: type = converted constants.%empty_struct, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: %.loc18_21.5: type = converted %.loc18_21.2, constants.%tuple.type.b6b [concrete = constants.%tuple.type.b6b] // CHECK:STDOUT: } -// CHECK:STDOUT: %ab: %tuple.type.b6b = value_binding ab, %ab.param +// CHECK:STDOUT: %ab: %tuple.type.b6b = wrapper_binding ab, %ab.param // CHECK:STDOUT: %c.param: %empty_struct_type = value_param call_param1 // CHECK:STDOUT: %.loc18_28.1: type = splice_block %.loc18_28.3 [concrete = constants.%empty_struct_type] { // CHECK:STDOUT: %.loc18_28.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc18_28.3: type = converted %.loc18_28.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %empty_struct_type = value_binding c, %c.param +// CHECK:STDOUT: %c: %empty_struct_type = wrapper_binding c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/declaration/ref.carbon b/toolchain/check/testdata/function/declaration/ref.carbon index 5b0b5cc7c4ca..7ca3e93b4774 100644 --- a/toolchain/check/testdata/function/declaration/ref.carbon +++ b/toolchain/check/testdata/function/declaration/ref.carbon @@ -78,7 +78,7 @@ fn G() { // CHECK:STDOUT: %F.ref: %F.type = name_ref F, file.%F.decl [concrete = constants.%F] // CHECK:STDOUT: %F.call: ref %i32 = call %F.ref() // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %x: ref %i32 = ref_binding x, %F.call +// CHECK:STDOUT: %x: ref %i32 = wrapper_binding x, %F.call // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/basics.carbon b/toolchain/check/testdata/function/definition/basics.carbon index cc5145be574f..2304693b4876 100644 --- a/toolchain/check/testdata/function/definition/basics.carbon +++ b/toolchain/check/testdata/function/definition/basics.carbon @@ -49,7 +49,7 @@ fn F(unused n: C) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %n.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %n: %C = value_binding n, %n.param +// CHECK:STDOUT: %n: %C = wrapper_binding n, %n.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/fail_decl_param_mismatch.carbon b/toolchain/check/testdata/function/definition/fail_decl_param_mismatch.carbon index fd8d582cde08..29e6a667bf2d 100644 --- a/toolchain/check/testdata/function/definition/fail_decl_param_mismatch.carbon +++ b/toolchain/check/testdata/function/definition/fail_decl_param_mismatch.carbon @@ -132,7 +132,7 @@ fn K() -> {} { return {}; } // CHECK:STDOUT: %.loc23_17.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc23_17.3: type = converted %.loc23_17.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %empty_tuple.type = value_binding x, %x.param +// CHECK:STDOUT: %x: %empty_tuple.type = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl.loc25: %G.type.f42045.1 = fn_decl @G.loc25 [concrete = constants.%G.4228ed.1] { // CHECK:STDOUT: %x.param_patt: %pattern_type.cb1 = value_param_pattern [concrete = constants.%x.param_patt] @@ -143,7 +143,7 @@ fn K() -> {} { return {}; } // CHECK:STDOUT: %.loc25_10.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc25_10.3: type = converted %.loc25_10.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %empty_tuple.type = value_binding x, %x.param +// CHECK:STDOUT: %x: %empty_tuple.type = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl.loc33: %G.type.f42045.2 = fn_decl @G.loc33 [concrete = constants.%G.4228ed.2] {} {} // CHECK:STDOUT: %H.decl.loc35: %H.type.c0bf33.1 = fn_decl @H.loc35 [concrete = constants.%H.aacb46.1] { @@ -155,7 +155,7 @@ fn K() -> {} { return {}; } // CHECK:STDOUT: %.loc35_10.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc35_10.3: type = converted %.loc35_10.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %empty_tuple.type = value_binding x, %x.param +// CHECK:STDOUT: %x: %empty_tuple.type = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %H.decl.loc40: %H.type.c0bf33.2 = fn_decl @H.loc40 [concrete = constants.%H.aacb46.2] { // CHECK:STDOUT: %x.param_patt: = value_param_pattern [concrete = ] @@ -163,7 +163,7 @@ fn K() -> {} { return {}; } // CHECK:STDOUT: } { // CHECK:STDOUT: %x.param: = value_param call_param0 // CHECK:STDOUT: %.loc40: type = type_literal [concrete = ] -// CHECK:STDOUT: %x: = value_binding x, [concrete = ] +// CHECK:STDOUT: %x: = wrapper_binding x, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: %I.decl.loc42: %I.type.4c8936.1 = fn_decl @I.loc42 [concrete = constants.%I.8a67f5.1] {} {} // CHECK:STDOUT: %I.decl.loc50: %I.type.4c8936.2 = fn_decl @I.loc50 [concrete = constants.%I.8a67f5.2] { diff --git a/toolchain/check/testdata/function/definition/import.carbon b/toolchain/check/testdata/function/definition/import.carbon index d630b636602a..ba26f1390009 100644 --- a/toolchain/check/testdata/function/definition/import.carbon +++ b/toolchain/check/testdata/function/definition/import.carbon @@ -193,7 +193,7 @@ fn D() {} // CHECK:STDOUT: %.loc5: Core.Form = init_form %i32.loc5_17 [concrete = constants.%.795] // CHECK:STDOUT: %b.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc5_9: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: %i32 = value_binding b, %b.param +// CHECK:STDOUT: %b: %i32 = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -212,7 +212,7 @@ fn D() {} // CHECK:STDOUT: %.loc6_14.2: %tuple.type.85c = tuple_literal (%i32.loc6_10) [concrete = constants.%tuple.19c] // CHECK:STDOUT: %.loc6_14.3: type = converted %.loc6_14.2, constants.%tuple.type.a8a [concrete = constants.%tuple.type.a8a] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %tuple.type.a8a = value_binding c, %c.param +// CHECK:STDOUT: %c: %tuple.type.a8a = wrapper_binding c, %c.param // CHECK:STDOUT: %return.param: ref %struct_type.c = out_param call_param1 // CHECK:STDOUT: %return: ref %struct_type.c = return_slot %return.param // CHECK:STDOUT: } @@ -365,14 +365,14 @@ fn D() {} // CHECK:STDOUT: %.loc6_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_9.3: type = converted %.loc6_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %empty_tuple.type = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %empty_tuple.type = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt.b23] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] // CHECK:STDOUT: %i32.loc7: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: ref %i32 = ref_binding b, %b.var [concrete = %b.var] +// CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.e1a = ref_binding_pattern c [concrete = constants.%c.patt.863] // CHECK:STDOUT: %c.var_patt: %pattern_type.e1a = var_pattern %c.patt [concrete = constants.%c.var_patt] @@ -382,7 +382,7 @@ fn D() {} // CHECK:STDOUT: %i32.loc8: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.c: type = struct_type {.c: %i32} [concrete = constants.%struct_type.c] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %struct_type.c = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %struct_type.c = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A [from "fns.carbon"]; @@ -468,7 +468,7 @@ fn D() {} // CHECK:STDOUT: %.loc23: Core.Form = init_form %i32.loc23_17 [concrete = constants.%.795] // CHECK:STDOUT: %b.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc23_9: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: %i32 = value_binding b, %b.param +// CHECK:STDOUT: %b: %i32 = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/definition/import_access.carbon b/toolchain/check/testdata/function/definition/import_access.carbon index 73e5fc50bce3..4f4df9484949 100644 --- a/toolchain/check/testdata/function/definition/import_access.carbon +++ b/toolchain/check/testdata/function/definition/import_access.carbon @@ -227,7 +227,7 @@ private fn Redecl() {} // CHECK:STDOUT: %.loc4_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_9.3: type = converted %.loc4_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %f: ref %empty_tuple.type = ref_binding f, %f.var [concrete = %f.var] +// CHECK:STDOUT: %f: ref %empty_tuple.type = wrapper_binding f, %f.var [concrete = %f.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Def [from "def.carbon"]; @@ -265,7 +265,7 @@ private fn Redecl() {} // CHECK:STDOUT: %.loc10_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc10_9.3: type = converted %.loc10_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %f: ref %empty_tuple.type = ref_binding f, %f.var [concrete = %f.var] +// CHECK:STDOUT: %f: ref %empty_tuple.type = wrapper_binding f, %f.var [concrete = %f.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -307,7 +307,7 @@ private fn Redecl() {} // CHECK:STDOUT: %.loc10_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc10_9.3: type = converted %.loc10_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %f: ref %empty_tuple.type = ref_binding f, %f.var [concrete = %f.var] +// CHECK:STDOUT: %f: ref %empty_tuple.type = wrapper_binding f, %f.var [concrete = %f.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -350,7 +350,7 @@ private fn Redecl() {} // CHECK:STDOUT: %.loc4_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_9.3: type = converted %.loc4_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %f: ref %empty_tuple.type = ref_binding f, %f.var [concrete = %f.var] +// CHECK:STDOUT: %f: ref %empty_tuple.type = wrapper_binding f, %f.var [concrete = %f.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @ForwardWithDef [from "forward_with_def.carbon"]; @@ -388,7 +388,7 @@ private fn Redecl() {} // CHECK:STDOUT: %.loc10_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc10_9.3: type = converted %.loc10_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %f: ref %empty_tuple.type = ref_binding f, %f.var [concrete = %f.var] +// CHECK:STDOUT: %f: ref %empty_tuple.type = wrapper_binding f, %f.var [concrete = %f.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -430,7 +430,7 @@ private fn Redecl() {} // CHECK:STDOUT: %.loc10_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc10_9.3: type = converted %.loc10_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %f: ref %empty_tuple.type = ref_binding f, %f.var [concrete = %f.var] +// CHECK:STDOUT: %f: ref %empty_tuple.type = wrapper_binding f, %f.var [concrete = %f.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -473,7 +473,7 @@ private fn Redecl() {} // CHECK:STDOUT: %.loc4_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_9.3: type = converted %.loc4_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %f: ref %empty_tuple.type = ref_binding f, %f.var [concrete = %f.var] +// CHECK:STDOUT: %f: ref %empty_tuple.type = wrapper_binding f, %f.var [concrete = %f.var] // CHECK:STDOUT: %Forward.decl: %Forward.type = fn_decl @Forward [concrete = constants.%Forward] {} {} // CHECK:STDOUT: } // CHECK:STDOUT: @@ -515,7 +515,7 @@ private fn Redecl() {} // CHECK:STDOUT: %.loc10_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc10_9.3: type = converted %.loc10_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %f: ref %empty_tuple.type = ref_binding f, %f.var [concrete = %f.var] +// CHECK:STDOUT: %f: ref %empty_tuple.type = wrapper_binding f, %f.var [concrete = %f.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -557,7 +557,7 @@ private fn Redecl() {} // CHECK:STDOUT: %.loc10_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc10_9.3: type = converted %.loc10_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %f: ref %empty_tuple.type = ref_binding f, %f.var [concrete = %f.var] +// CHECK:STDOUT: %f: ref %empty_tuple.type = wrapper_binding f, %f.var [concrete = %f.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/function/definition/params_one.carbon b/toolchain/check/testdata/function/definition/params_one.carbon index 85b9a5a5d147..ea4d6a8b5482 100644 --- a/toolchain/check/testdata/function/definition/params_one.carbon +++ b/toolchain/check/testdata/function/definition/params_one.carbon @@ -49,7 +49,7 @@ fn Foo(unused a: i32) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/params_one_comma.carbon b/toolchain/check/testdata/function/definition/params_one_comma.carbon index f03f59e7f278..0756b54abcb8 100644 --- a/toolchain/check/testdata/function/definition/params_one_comma.carbon +++ b/toolchain/check/testdata/function/definition/params_one_comma.carbon @@ -49,7 +49,7 @@ fn Foo(unused a: i32,) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/params_two.carbon b/toolchain/check/testdata/function/definition/params_two.carbon index e363366801d1..f56233fabf08 100644 --- a/toolchain/check/testdata/function/definition/params_two.carbon +++ b/toolchain/check/testdata/function/definition/params_two.carbon @@ -53,10 +53,10 @@ fn Foo(unused a: i32, unused b: i32) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc15_18: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %i32 = value_param call_param1 // CHECK:STDOUT: %i32.loc15_33: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: %i32 = value_binding b, %b.param +// CHECK:STDOUT: %b: %i32 = wrapper_binding b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/params_two_comma.carbon b/toolchain/check/testdata/function/definition/params_two_comma.carbon index db28910eabdd..b053862c91cf 100644 --- a/toolchain/check/testdata/function/definition/params_two_comma.carbon +++ b/toolchain/check/testdata/function/definition/params_two_comma.carbon @@ -53,10 +53,10 @@ fn Foo(unused a: i32, unused b: i32,) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc15_18: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %i32 = value_param call_param1 // CHECK:STDOUT: %i32.loc15_33: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: %i32 = value_binding b, %b.param +// CHECK:STDOUT: %b: %i32 = wrapper_binding b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/syntactic_merge.carbon b/toolchain/check/testdata/function/definition/syntactic_merge.carbon index 6e4c6c5f3e09..916c599eab6c 100644 --- a/toolchain/check/testdata/function/definition/syntactic_merge.carbon +++ b/toolchain/check/testdata/function/definition/syntactic_merge.carbon @@ -236,7 +236,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param.loc7: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc7: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %a.loc7: %C = value_binding a, %a.param.loc7 +// CHECK:STDOUT: %a.loc7: %C = wrapper_binding a, %a.param.loc7 // CHECK:STDOUT: } // CHECK:STDOUT: %Foo.decl.loc8: %Foo.type = fn_decl @Foo [concrete = constants.%Foo] { // CHECK:STDOUT: %a.param_patt: %pattern_type = value_param_pattern [concrete = constants.%a.param_patt] @@ -244,7 +244,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param.loc8: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc8: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %a.loc8: %C = value_binding a, %a.param.loc8 +// CHECK:STDOUT: %a.loc8: %C = wrapper_binding a, %a.param.loc8 // CHECK:STDOUT: } // CHECK:STDOUT: %Bar.decl.loc10: %Bar.type = fn_decl @Bar [concrete = constants.%Bar] { // CHECK:STDOUT: %a.param_patt: %pattern_type = value_param_pattern [concrete = constants.%a.param_patt] @@ -252,7 +252,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param.loc10: %C = value_param call_param0 // CHECK:STDOUT: %D.ref.loc10: type = name_ref D, file.%D [concrete = constants.%C] -// CHECK:STDOUT: %a.loc10: %C = value_binding a, %a.param.loc10 +// CHECK:STDOUT: %a.loc10: %C = wrapper_binding a, %a.param.loc10 // CHECK:STDOUT: } // CHECK:STDOUT: %Bar.decl.loc11: %Bar.type = fn_decl @Bar [concrete = constants.%Bar] { // CHECK:STDOUT: %a.param_patt: %pattern_type = value_param_pattern [concrete = constants.%a.param_patt] @@ -260,7 +260,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param.loc11: %C = value_param call_param0 // CHECK:STDOUT: %D.ref.loc11: type = name_ref D, file.%D [concrete = constants.%C] -// CHECK:STDOUT: %a.loc11: %C = value_binding a, %a.param.loc11 +// CHECK:STDOUT: %a.loc11: %C = wrapper_binding a, %a.param.loc11 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -307,7 +307,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param.loc6: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc6: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %a.loc6: %C = value_binding a, %a.param.loc6 +// CHECK:STDOUT: %a.loc6: %C = wrapper_binding a, %a.param.loc6 // CHECK:STDOUT: } // CHECK:STDOUT: %Foo.decl.loc7: %Foo.type = fn_decl @Foo [concrete = constants.%Foo] { // CHECK:STDOUT: %a.param_patt: %pattern_type = value_param_pattern [concrete = constants.%a.param_patt] @@ -315,7 +315,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param.loc7: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc7: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %a.loc7: %C = value_binding a, %a.param.loc7 +// CHECK:STDOUT: %a.loc7: %C = wrapper_binding a, %a.param.loc7 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -359,7 +359,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %a: %C = value_binding a, %a.param +// CHECK:STDOUT: %a: %C = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %Foo.decl.loc14: %Foo.type.11c674.2 = fn_decl @Foo.loc14 [concrete = constants.%Foo.12ccef.2] { // CHECK:STDOUT: %a.param_patt: %pattern_type = value_param_pattern [concrete = constants.%a.param_patt] @@ -367,7 +367,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %a: %C = value_binding a, %a.param +// CHECK:STDOUT: %a: %C = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -450,7 +450,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %_.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %_: %C = value_binding _, %_.param +// CHECK:STDOUT: %_: %C = wrapper_binding _, %_.param // CHECK:STDOUT: } // CHECK:STDOUT: %Foo.decl.loc14: %Foo.type.11c674.2 = fn_decl @Foo.loc14 [concrete = constants.%Foo.12ccef.2] { // CHECK:STDOUT: %_.param_patt: %pattern_type = value_param_pattern [concrete = constants.%_.param_patt] @@ -458,7 +458,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %_.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %_: %C = value_binding _, %_.param +// CHECK:STDOUT: %_: %C = wrapper_binding _, %_.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -508,7 +508,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %a: %C = value_binding a, %a.param +// CHECK:STDOUT: %a: %C = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %Bar.decl: %Bar.type = fn_decl @Bar [concrete = constants.%Bar] { // CHECK:STDOUT: %a.param_patt: %pattern_type = value_param_pattern [concrete = constants.%a.param_patt] @@ -516,7 +516,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %C = value_param call_param0 // CHECK:STDOUT: %D.ref: type = name_ref D, file.%D [concrete = constants.%C] -// CHECK:STDOUT: %a: %C = value_binding a, %a.param +// CHECK:STDOUT: %a: %C = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -570,7 +570,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %a: %C = value_binding a, %a.param +// CHECK:STDOUT: %a: %C = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %Bar.decl: %Bar.type = fn_decl @Bar [concrete = constants.%Bar] { // CHECK:STDOUT: %a.param_patt: %pattern_type = value_param_pattern [concrete = constants.%a.param_patt] @@ -578,7 +578,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %C = value_param call_param0 // CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [concrete = constants.%C] -// CHECK:STDOUT: %a: %C = value_binding a, %a.param +// CHECK:STDOUT: %a: %C = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -631,7 +631,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %a: %C = value_binding a, %a.param +// CHECK:STDOUT: %a: %C = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %Foo.decl.loc15: %Foo.type.11c674.2 = fn_decl @Foo.loc15 [concrete = constants.%Foo.12ccef.2] { // CHECK:STDOUT: %b.param_patt: %pattern_type = value_param_pattern [concrete = constants.%b.param_patt] @@ -639,7 +639,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %b.param: %C = value_param call_param0 // CHECK:STDOUT: %D.ref: type = name_ref D, file.%D [concrete = constants.%C] -// CHECK:STDOUT: %b: %C = value_binding b, %b.param +// CHECK:STDOUT: %b: %C = wrapper_binding b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -688,7 +688,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %a: %C = value_binding a, %a.param +// CHECK:STDOUT: %a: %C = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %Foo.decl.loc15: %Foo.type.11c674.2 = fn_decl @Foo.loc15 [concrete = constants.%Foo.12ccef.2] { // CHECK:STDOUT: %a.param_patt: %pattern_type = value_param_pattern [concrete = constants.%a.param_patt] @@ -696,7 +696,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %C = value_param call_param0 // CHECK:STDOUT: %D.ref: type = name_ref D, file.%D [concrete = constants.%C] -// CHECK:STDOUT: %a: %C = value_binding a, %a.param +// CHECK:STDOUT: %a: %C = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -887,7 +887,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %a: %C = value_binding a, %a.param +// CHECK:STDOUT: %a: %C = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -936,7 +936,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %C = value_param call_param0 // CHECK:STDOUT: %D.ref: type = name_ref D, file.%D [concrete = constants.%C] -// CHECK:STDOUT: %a: %C = value_binding a, %a.param +// CHECK:STDOUT: %a: %C = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -983,7 +983,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %const: type = const_type %C.ref [concrete = constants.%const] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %const = value_binding a, %a.param +// CHECK:STDOUT: %a: %const = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %Foo.decl.loc18: %Foo.type.11c674.2 = fn_decl @Foo.loc18 [concrete = constants.%Foo.12ccef.2] { // CHECK:STDOUT: %a.param_patt: %pattern_type = value_param_pattern [concrete = constants.%a.param_patt] @@ -995,7 +995,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: %const.loc18_25: type = const_type %C.ref [concrete = constants.%const] // CHECK:STDOUT: %const.loc18_18: type = const_type %const.loc18_25 [concrete = constants.%const] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %const = value_binding a, %a.param +// CHECK:STDOUT: %a: %const = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/generic/call.carbon b/toolchain/check/testdata/function/generic/call.carbon index 65c4d4920a34..2f34cfb9bd9b 100644 --- a/toolchain/check/testdata/function/generic/call.carbon +++ b/toolchain/check/testdata/function/generic/call.carbon @@ -171,7 +171,7 @@ fn CallSpecific(x: C*) -> C* { // CHECK:STDOUT: %T.as_type.loc5_31.2: type = facet_access_type %T.ref.loc5_31 [symbolic = %T.as_type.loc5_31.1 (constants.%T.as_type)] // CHECK:STDOUT: %.loc5_31.2: type = converted %T.ref.loc5_31, %T.as_type.loc5_31.2 [symbolic = %T.as_type.loc5_31.1 (constants.%T.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @Function.%T.as_type.loc5_31.1 (%T.as_type) = value_binding x, %x.param +// CHECK:STDOUT: %x: @Function.%T.as_type.loc5_31.1 (%T.as_type) = wrapper_binding x, %x.param // CHECK:STDOUT: %return.param: ref @Function.%T.as_type.loc5_31.1 (%T.as_type) = out_param call_param1 // CHECK:STDOUT: %return: ref @Function.%T.as_type.loc5_31.1 (%T.as_type) = return_slot %return.param // CHECK:STDOUT: } @@ -461,7 +461,7 @@ fn CallSpecific(x: C*) -> C* { // CHECK:STDOUT: %T.as_type.loc5_31.2: type = facet_access_type %T.ref.loc5_31 [symbolic = %T.as_type.loc5_31.1 (constants.%T.as_type)] // CHECK:STDOUT: %.loc5_31.2: type = converted %T.ref.loc5_31, %T.as_type.loc5_31.2 [symbolic = %T.as_type.loc5_31.1 (constants.%T.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @Function.%T.as_type.loc5_31.1 (%T.as_type) = value_binding x, %x.param +// CHECK:STDOUT: %x: @Function.%T.as_type.loc5_31.1 (%T.as_type) = wrapper_binding x, %x.param // CHECK:STDOUT: %return.param: ref @Function.%T.as_type.loc5_31.1 (%T.as_type) = out_param call_param1 // CHECK:STDOUT: %return: ref @Function.%T.as_type.loc5_31.1 (%T.as_type) = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/generic/deduce.carbon b/toolchain/check/testdata/function/generic/deduce.carbon index 7c103f34d3d4..44f21bbe653b 100644 --- a/toolchain/check/testdata/function/generic/deduce.carbon +++ b/toolchain/check/testdata/function/generic/deduce.carbon @@ -498,7 +498,7 @@ fn F() { // CHECK:STDOUT: } { // CHECK:STDOUT: %T.param: type = value_param call_param0 // CHECK:STDOUT: %.loc10: type = type_literal type [concrete = type] -// CHECK:STDOUT: %T: type = value_binding T, %T.param +// CHECK:STDOUT: %T: type = wrapper_binding T, %T.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -650,7 +650,7 @@ fn F() { // CHECK:STDOUT: %T.loc6_28.2: type = symbolic_binding T, 0 [symbolic = %T.loc6_28.1 (constants.%T)] // CHECK:STDOUT: %x.param: @ExplicitAndAlsoDeduced.%T.loc6_28.1 (%T) = value_param call_param0 // CHECK:STDOUT: %T.ref.loc6_40: type = name_ref T, %T.loc6_28.2 [symbolic = %T.loc6_28.1 (constants.%T)] -// CHECK:STDOUT: %x: @ExplicitAndAlsoDeduced.%T.loc6_28.1 (%T) = value_binding x, %x.param +// CHECK:STDOUT: %x: @ExplicitAndAlsoDeduced.%T.loc6_28.1 (%T) = wrapper_binding x, %x.param // CHECK:STDOUT: %return.param: ref @ExplicitAndAlsoDeduced.%ptr.loc6_47.1 (%ptr.e8f) = out_param call_param1 // CHECK:STDOUT: %return: ref @ExplicitAndAlsoDeduced.%ptr.loc6_47.1 (%ptr.e8f) = return_slot %return.param // CHECK:STDOUT: } @@ -837,7 +837,7 @@ fn F() { // CHECK:STDOUT: %T.loc4_26.2: type = symbolic_binding T, 0 [symbolic = %T.loc4_26.1 (constants.%T)] // CHECK:STDOUT: %x.param: @ImplicitGenericParam.%T.loc4_26.1 (%T) = value_param call_param0 // CHECK:STDOUT: %T.ref.loc4_38: type = name_ref T, %T.loc4_26.2 [symbolic = %T.loc4_26.1 (constants.%T)] -// CHECK:STDOUT: %x: @ImplicitGenericParam.%T.loc4_26.1 (%T) = value_binding x, %x.param +// CHECK:STDOUT: %x: @ImplicitGenericParam.%T.loc4_26.1 (%T) = wrapper_binding x, %x.param // CHECK:STDOUT: %return.param: ref @ImplicitGenericParam.%ptr.loc4_45.1 (%ptr.e8f) = out_param call_param1 // CHECK:STDOUT: %return: ref @ImplicitGenericParam.%ptr.loc4_45.1 (%ptr.e8f) = return_slot %return.param // CHECK:STDOUT: } @@ -852,7 +852,7 @@ fn F() { // CHECK:STDOUT: %.loc6: Core.Form = init_form %ptr [concrete = constants.%.952] // CHECK:STDOUT: %n.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc6_32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: %i32 = value_binding n, %n.param +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, %n.param // CHECK:STDOUT: %return.param: ref %ptr.d08 = out_param call_param1 // CHECK:STDOUT: %return: ref %ptr.d08 = return_slot %return.param // CHECK:STDOUT: } @@ -1021,7 +1021,7 @@ fn F() { // CHECK:STDOUT: %.loc4_42.2: %tuple.type.24b = tuple_literal (%T.ref, %i32) [symbolic = %tuple (constants.%tuple.43e)] // CHECK:STDOUT: %.loc4_42.3: type = converted %.loc4_42.2, constants.%tuple.type.2d8 [symbolic = %tuple.type (constants.%tuple.type.2d8)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @TupleParam.%tuple.type (%tuple.type.2d8) = value_binding x, %x.param +// CHECK:STDOUT: %x: @TupleParam.%tuple.type (%tuple.type.2d8) = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %CallTupleParam.decl: %CallTupleParam.type = fn_decl @CallTupleParam [concrete = constants.%CallTupleParam] {} {} // CHECK:STDOUT: } @@ -1174,7 +1174,7 @@ fn F() { // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a.b.loc4_51.2: type = struct_type {.a: @StructParam.%T.loc4_17.1 (%T), .b: %i32} [symbolic = %struct_type.a.b.loc4_51.1 (constants.%struct_type.a.b.3aa)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @StructParam.%struct_type.a.b.loc4_51.1 (%struct_type.a.b.3aa) = value_binding x, %x.param +// CHECK:STDOUT: %x: @StructParam.%struct_type.a.b.loc4_51.1 (%struct_type.a.b.3aa) = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %CallStructParam.decl: %CallStructParam.type = fn_decl @CallStructParam [concrete = constants.%CallStructParam] {} {} // CHECK:STDOUT: } @@ -1297,7 +1297,7 @@ fn F() { // CHECK:STDOUT: %i32.loc4_60: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.c.d.e.loc4_63.2: type = struct_type {.c: @BigStructParam.%T.loc4_20.1 (%T), .d: %i32, .e: %i32} [symbolic = %struct_type.c.d.e.loc4_63.1 (constants.%struct_type.c.d.e)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @BigStructParam.%struct_type.c.d.e.loc4_63.1 (%struct_type.c.d.e) = value_binding x, %x.param +// CHECK:STDOUT: %x: @BigStructParam.%struct_type.c.d.e.loc4_63.1 (%struct_type.c.d.e) = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %CallBigStructParam.decl: %CallBigStructParam.type = fn_decl @CallBigStructParam [concrete = constants.%CallBigStructParam] {} {} // CHECK:STDOUT: } @@ -1397,7 +1397,7 @@ fn F() { // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.f.g.loc4_56.2: type = struct_type {.f: @SmallStructParam.%T.loc4_22.1 (%T), .g: %i32} [symbolic = %struct_type.f.g.loc4_56.1 (constants.%struct_type.f.g)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @SmallStructParam.%struct_type.f.g.loc4_56.1 (%struct_type.f.g) = value_binding x, %x.param +// CHECK:STDOUT: %x: @SmallStructParam.%struct_type.f.g.loc4_56.1 (%struct_type.f.g) = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %CallSmallStructParam.decl: %CallSmallStructParam.type = fn_decl @CallSmallStructParam [concrete = constants.%CallSmallStructParam] {} {} // CHECK:STDOUT: } @@ -1497,7 +1497,7 @@ fn F() { // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.i.different.loc4_68.2: type = struct_type {.i: @WrongNameStructParam.%T.loc4_26.1 (%T), .different: %i32} [symbolic = %struct_type.i.different.loc4_68.1 (constants.%struct_type.i.different)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @WrongNameStructParam.%struct_type.i.different.loc4_68.1 (%struct_type.i.different) = value_binding x, %x.param +// CHECK:STDOUT: %x: @WrongNameStructParam.%struct_type.i.different.loc4_68.1 (%struct_type.i.different) = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %CallWrongNameStructParam.decl: %CallWrongNameStructParam.type = fn_decl @CallWrongNameStructParam [concrete = constants.%CallWrongNameStructParam] {} {} // CHECK:STDOUT: } @@ -1596,7 +1596,7 @@ fn F() { // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.first.second.loc4_70.2: type = struct_type {.first: @WrongOrderStructParam.%T.loc4_27.1 (%T), .second: %i32} [symbolic = %struct_type.first.second.loc4_70.1 (constants.%struct_type.first.second)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @WrongOrderStructParam.%struct_type.first.second.loc4_70.1 (%struct_type.first.second) = value_binding x, %x.param +// CHECK:STDOUT: %x: @WrongOrderStructParam.%struct_type.first.second.loc4_70.1 (%struct_type.first.second) = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %CallWrongOrderStructParam.decl: %CallWrongOrderStructParam.type = fn_decl @CallWrongOrderStructParam [concrete = constants.%CallWrongOrderStructParam] {} {} // CHECK:STDOUT: } @@ -1696,7 +1696,7 @@ fn F() { // CHECK:STDOUT: %U.loc6_36.2: type = symbolic_binding U, 1 [symbolic = %U.loc6_36.1 (constants.%U)] // CHECK:STDOUT: %x.param: @ImplicitNotDeducible.%T.loc6_26.1 (%T) = value_param call_param0 // CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc6_26.2 [symbolic = %T.loc6_26.1 (constants.%T)] -// CHECK:STDOUT: %x: @ImplicitNotDeducible.%T.loc6_26.1 (%T) = value_binding x, %x.param +// CHECK:STDOUT: %x: @ImplicitNotDeducible.%T.loc6_26.1 (%T) = wrapper_binding x, %x.param // CHECK:STDOUT: %return.param: ref @ImplicitNotDeducible.%U.loc6_36.1 (%U) = out_param call_param1 // CHECK:STDOUT: %return: ref @ImplicitNotDeducible.%U.loc6_36.1 (%U) = return_slot %return.param // CHECK:STDOUT: } @@ -1798,10 +1798,10 @@ fn F() { // CHECK:STDOUT: %T.loc4_26.2: type = symbolic_binding T, 0 [symbolic = %T.loc4_26.1 (constants.%T)] // CHECK:STDOUT: %x.param: @ImplicitNotDeducible.%T.loc4_26.1 (%T) = value_param call_param0 // CHECK:STDOUT: %T.ref.loc4_38: type = name_ref T, %T.loc4_26.2 [symbolic = %T.loc4_26.1 (constants.%T)] -// CHECK:STDOUT: %x: @ImplicitNotDeducible.%T.loc4_26.1 (%T) = value_binding x, %x.param +// CHECK:STDOUT: %x: @ImplicitNotDeducible.%T.loc4_26.1 (%T) = wrapper_binding x, %x.param // CHECK:STDOUT: %y.param: @ImplicitNotDeducible.%T.loc4_26.1 (%T) = value_param call_param1 // CHECK:STDOUT: %T.ref.loc4_44: type = name_ref T, %T.loc4_26.2 [symbolic = %T.loc4_26.1 (constants.%T)] -// CHECK:STDOUT: %y: @ImplicitNotDeducible.%T.loc4_26.1 (%T) = value_binding y, %y.param +// CHECK:STDOUT: %y: @ImplicitNotDeducible.%T.loc4_26.1 (%T) = wrapper_binding y, %y.param // CHECK:STDOUT: %return.param: ref @ImplicitNotDeducible.%T.loc4_26.1 (%T) = out_param call_param2 // CHECK:STDOUT: %return: ref @ImplicitNotDeducible.%T.loc4_26.1 (%T) = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/generic/fail_deduce_imported_function.carbon b/toolchain/check/testdata/function/generic/fail_deduce_imported_function.carbon index c0dde18bd013..430c04f05290 100644 --- a/toolchain/check/testdata/function/generic/fail_deduce_imported_function.carbon +++ b/toolchain/check/testdata/function/generic/fail_deduce_imported_function.carbon @@ -88,7 +88,7 @@ fn B() { // CHECK:STDOUT: %.loc4_28: type = converted %T.ref, %T.as_type.loc4_28.2 [symbolic = %T.as_type.loc4_28.1 (constants.%T.as_type)] // CHECK:STDOUT: %struct_type.a.loc4_29.2: type = struct_type {.a: @A.%T.as_type.loc4_28.1 (%T.as_type)} [symbolic = %struct_type.a.loc4_29.1 (constants.%struct_type.a)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @A.%struct_type.a.loc4_29.1 (%struct_type.a) = value_binding x, %x.param +// CHECK:STDOUT: %x: @A.%struct_type.a.loc4_29.1 (%struct_type.a) = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -201,7 +201,7 @@ fn B() { // CHECK:STDOUT: %.loc4_32: type = converted %T.ref, %T.as_type.loc4_32.2 [symbolic = %T.as_type.loc4_32.1 (constants.%T.as_type)] // CHECK:STDOUT: %struct_type.a.loc4_33.2: type = struct_type {.a: @A.loc4.%T.as_type.loc4_32.1 (%T.as_type)} [symbolic = %struct_type.a.loc4_33.1 (constants.%struct_type.a)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @A.loc4.%struct_type.a.loc4_33.1 (%struct_type.a) = value_binding x, %x.param +// CHECK:STDOUT: %x: @A.loc4.%struct_type.a.loc4_33.1 (%struct_type.a) = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %B.decl: %B.type = fn_decl @B [concrete = constants.%B] {} {} // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/generic/param_in_type.carbon b/toolchain/check/testdata/function/generic/param_in_type.carbon index c7b62da30aac..46beffd50fa3 100644 --- a/toolchain/check/testdata/function/generic/param_in_type.carbon +++ b/toolchain/check/testdata/function/generic/param_in_type.carbon @@ -94,7 +94,7 @@ fn F(N:! i32, a: array(i32, N)*); // CHECK:STDOUT: %array_type.loc15_30.2: type = array_type %.loc15_29.2, %i32.loc15_24 [symbolic = %array_type.loc15_30.1 (constants.%array_type)] // CHECK:STDOUT: %ptr.loc15_31.2: type = ptr_type %array_type.loc15_30.2 [symbolic = %ptr.loc15_31.1 (constants.%ptr)] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: @F.%ptr.loc15_31.1 (%ptr) = value_binding a, %a.param +// CHECK:STDOUT: %a: @F.%ptr.loc15_31.1 (%ptr) = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/generic/resolve_used.carbon b/toolchain/check/testdata/function/generic/resolve_used.carbon index 0f577df4112c..f171fb80bfa1 100644 --- a/toolchain/check/testdata/function/generic/resolve_used.carbon +++ b/toolchain/check/testdata/function/generic/resolve_used.carbon @@ -181,7 +181,7 @@ fn CallNegative() { // CHECK:STDOUT: %N.ref: Core.IntLiteral = name_ref N, %N.loc4_20.2 [symbolic = %N.loc4_20.1 (constants.%N)] // CHECK:STDOUT: %Int.loc9_27.1: type = class_type @Int, @Int(constants.%N) [symbolic = %Int.loc9_27.2 (constants.%Int)] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: ref @ErrorIfNIsZero.%Int.loc9_27.2 (%Int) = ref_binding v, %v.var +// CHECK:STDOUT: %v: ref @ErrorIfNIsZero.%Int.loc9_27.2 (%Int) = wrapper_binding v, %v.var // CHECK:STDOUT: %impl.elem0.loc9_3.1: @ErrorIfNIsZero.%.loc9_3.3 (%.2c6) = impl_witness_access constants.%Destroy.lookup_impl_witness.173, element0 [symbolic = %impl.elem0.loc9_3.2 (constants.%impl.elem0.604)] // CHECK:STDOUT: %bound_method.loc9_3.1: = bound_method %v.var, %impl.elem0.loc9_3.1 // CHECK:STDOUT: %Destroy.facet.loc9_3.1: %Destroy.type = facet_value constants.%Int, (constants.%Destroy.lookup_impl_witness.173) [symbolic = %Destroy.facet.loc9_3.3 (constants.%Destroy.facet.7bb)] diff --git a/toolchain/check/testdata/function/generic/return_slot.carbon b/toolchain/check/testdata/function/generic/return_slot.carbon index 229fc4bb9a0e..ff953130dbc5 100644 --- a/toolchain/check/testdata/function/generic/return_slot.carbon +++ b/toolchain/check/testdata/function/generic/return_slot.carbon @@ -211,7 +211,7 @@ fn G() { // CHECK:STDOUT: %Wrap.Make.call.loc22: init %i32 = call %Wrap.Make.specific_fn.loc22() // CHECK:STDOUT: assign %a.var, %Wrap.Make.call.loc22 // CHECK:STDOUT: %i32.loc22_17: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: ref %i32 = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %i32 = wrapper_binding a, %a.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.cb1 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.cb1 = var_pattern %b.patt [concrete = constants.%b.var_patt] @@ -230,7 +230,7 @@ fn G() { // CHECK:STDOUT: %.loc23_18.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc23_18.3: type = converted %.loc23_18.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: ref %empty_tuple.type = ref_binding b, %b.var +// CHECK:STDOUT: %b: ref %empty_tuple.type = wrapper_binding b, %b.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.98b = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.98b = var_pattern %c.patt [concrete = constants.%c.var_patt] @@ -246,7 +246,7 @@ fn G() { // CHECK:STDOUT: %Wrap.Make.call.loc24: init %C to %.loc24_3 = call %Wrap.Make.specific_fn.loc24() // CHECK:STDOUT: assign %c.var, %Wrap.Make.call.loc24 // CHECK:STDOUT: %C.ref.loc24_17: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var // CHECK:STDOUT: %Destroy.Op.bound.loc24: = bound_method %c.var, constants.%Destroy.Op.1a2547.5 // CHECK:STDOUT: %Destroy.Op.call.loc24: init %empty_tuple.type = call %Destroy.Op.bound.loc24(%c.var) // CHECK:STDOUT: %Destroy.Op.bound.loc23: = bound_method %b.var, constants.%Destroy.Op.1a2547.6 diff --git a/toolchain/check/testdata/function/generic/type_param.carbon b/toolchain/check/testdata/function/generic/type_param.carbon index 70ca509cd0a3..d23c4c1f48b9 100644 --- a/toolchain/check/testdata/function/generic/type_param.carbon +++ b/toolchain/check/testdata/function/generic/type_param.carbon @@ -128,7 +128,7 @@ fn F(T:! type) { // CHECK:STDOUT: %T.ref.loc16: type = name_ref T, %T.loc15_7.2 [symbolic = %T.loc15_7.1 (constants.%T.67d)] // CHECK:STDOUT: %ptr.loc16_11.1: type = ptr_type %T.ref.loc16 [symbolic = %ptr.loc16_11.2 (constants.%ptr)] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: ref @F.%ptr.loc16_11.2 (%ptr) = ref_binding p, %p.var +// CHECK:STDOUT: %p: ref @F.%ptr.loc16_11.2 (%ptr) = wrapper_binding p, %p.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %n.patt.loc17_15.1: @F.%pattern_type.loc17 (%pattern_type.51d) = value_binding_pattern n [symbolic = %n.patt.loc17_15.2 (constants.%n.patt)] // CHECK:STDOUT: } @@ -137,7 +137,7 @@ fn F(T:! type) { // CHECK:STDOUT: %.loc17_21.1: ref @F.%T.loc15_7.1 (%T.67d) = deref %.loc17_22 // CHECK:STDOUT: %.loc17_21.2: @F.%T.loc15_7.1 (%T.67d) = acquire_value %.loc17_21.1 // CHECK:STDOUT: %T.ref.loc17: type = name_ref T, %T.loc15_7.2 [symbolic = %T.loc15_7.1 (constants.%T.67d)] -// CHECK:STDOUT: %n: @F.%T.loc15_7.1 (%T.67d) = value_binding n, %.loc17_21.2 +// CHECK:STDOUT: %n: @F.%T.loc15_7.1 (%T.67d) = wrapper_binding n, %.loc17_21.2 // CHECK:STDOUT: %impl.elem0.loc16_3.1: @F.%.loc16_3.3 (%.9f8) = impl_witness_access constants.%Destroy.lookup_impl_witness, element0 [symbolic = %impl.elem0.loc16_3.2 (constants.%impl.elem0.258)] // CHECK:STDOUT: %bound_method.loc16_3.1: = bound_method %p.var, %impl.elem0.loc16_3.1 // CHECK:STDOUT: %Destroy.facet.loc16_3.1: %Destroy.type = facet_value constants.%ptr, (constants.%Destroy.lookup_impl_witness) [symbolic = %Destroy.facet.loc16_3.3 (constants.%Destroy.facet)] diff --git a/toolchain/check/testdata/function/generic/type_param_scope.carbon b/toolchain/check/testdata/function/generic/type_param_scope.carbon index be9cfc7f23d6..01ab8dfae955 100644 --- a/toolchain/check/testdata/function/generic/type_param_scope.carbon +++ b/toolchain/check/testdata/function/generic/type_param_scope.carbon @@ -70,7 +70,7 @@ fn F(T:! type, n: T*) -> T* { // CHECK:STDOUT: %T.ref.loc6: type = name_ref T, %T.loc4_7.2 [symbolic = %T.loc4_7.1 (constants.%T.67d)] // CHECK:STDOUT: %ptr.loc6: type = ptr_type %T.ref.loc6 [symbolic = %ptr.loc4_20.1 (constants.%ptr)] // CHECK:STDOUT: } -// CHECK:STDOUT: %m: @F.%ptr.loc4_20.1 (%ptr) = value_binding m, %n.ref +// CHECK:STDOUT: %m: @F.%ptr.loc4_20.1 (%ptr) = wrapper_binding m, %n.ref // CHECK:STDOUT: %m.ref: @F.%ptr.loc4_20.1 (%ptr) = name_ref m, %m // CHECK:STDOUT: %impl.elem0.loc7_10.1: @F.%.loc7_10.4 (%.be5) = impl_witness_access constants.%Copy.lookup_impl_witness.1da, element0 [symbolic = %impl.elem0.loc7_10.2 (constants.%impl.elem0.484)] // CHECK:STDOUT: %bound_method.loc7_10.1: = bound_method %m.ref, %impl.elem0.loc7_10.1 diff --git a/toolchain/check/testdata/generic/call_basic_depth.carbon b/toolchain/check/testdata/generic/call_basic_depth.carbon index 724d3adb62c4..2ec01accb001 100644 --- a/toolchain/check/testdata/generic/call_basic_depth.carbon +++ b/toolchain/check/testdata/generic/call_basic_depth.carbon @@ -97,7 +97,7 @@ fn M() { // CHECK:STDOUT: %T.loc19_7.2: type = symbolic_binding T, 0 [symbolic = %T.loc19_7.1 (constants.%T)] // CHECK:STDOUT: %x.param: @F.%T.loc19_7.1 (%T) = value_param call_param0 // CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc19_7.2 [symbolic = %T.loc19_7.1 (constants.%T)] -// CHECK:STDOUT: %x: @F.%T.loc19_7.1 (%T) = value_binding x, %x.param +// CHECK:STDOUT: %x: @F.%T.loc19_7.1 (%T) = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/generic/complete_type.carbon b/toolchain/check/testdata/generic/complete_type.carbon index 1d2e54b50df4..109e39183c98 100644 --- a/toolchain/check/testdata/generic/complete_type.carbon +++ b/toolchain/check/testdata/generic/complete_type.carbon @@ -148,7 +148,7 @@ fn G(p: B*) { F(B, p); } // CHECK:STDOUT: %B.ref: type = name_ref B, file.%B.decl.loc4 [concrete = constants.%B] // CHECK:STDOUT: %A: type = class_type @A, @A(constants.%B) [concrete = constants.%A.d32] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %A.d32 = value_binding x, %x.param +// CHECK:STDOUT: %x: %A.d32 = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %B.decl.loc29: type = class_decl @B [concrete = constants.%B] {} {} // CHECK:STDOUT: } @@ -272,7 +272,7 @@ fn G(p: B*) { F(B, p); } // CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc6_7.2 [symbolic = %T.loc6_7.1 (constants.%T)] // CHECK:STDOUT: %ptr.loc6_20.2: type = ptr_type %T.ref [symbolic = %ptr.loc6_20.1 (constants.%ptr.e8f)] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: @F.%ptr.loc6_20.1 (%ptr.e8f) = value_binding v, %v.param +// CHECK:STDOUT: %v: @F.%ptr.loc6_20.1 (%ptr.e8f) = wrapper_binding v, %v.param // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [concrete = constants.%G] { // CHECK:STDOUT: %p.param_patt: %pattern_type.3c8 = value_param_pattern [concrete = constants.%p.param_patt] @@ -283,7 +283,7 @@ fn G(p: B*) { F(B, p); } // CHECK:STDOUT: %B.ref.loc11_9: type = name_ref B, file.%B.decl.loc4 [concrete = constants.%B] // CHECK:STDOUT: %ptr: type = ptr_type %B.ref.loc11_9 [concrete = constants.%ptr.432] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.432 = value_binding p, %p.param +// CHECK:STDOUT: %p: %ptr.432 = wrapper_binding p, %p.param // CHECK:STDOUT: } // CHECK:STDOUT: %B.decl.loc13: type = class_decl @B [concrete = constants.%B] {} {} // CHECK:STDOUT: } @@ -409,7 +409,7 @@ fn G(p: B*) { F(B, p); } // CHECK:STDOUT: %T.ref.loc6: type = name_ref T, %T.loc6_7.2 [symbolic = %T.loc6_7.1 (constants.%T)] // CHECK:STDOUT: %ptr.loc6_20.2: type = ptr_type %T.ref.loc6 [symbolic = %ptr.loc6_20.1 (constants.%ptr.e8f)] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: @F.%ptr.loc6_20.1 (%ptr.e8f) = value_binding p, %p.param +// CHECK:STDOUT: %p: @F.%ptr.loc6_20.1 (%ptr.e8f) = wrapper_binding p, %p.param // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [concrete = constants.%G] { // CHECK:STDOUT: %p.param_patt: %pattern_type.3c8 = value_param_pattern [concrete = constants.%p.param_patt.436] @@ -420,7 +420,7 @@ fn G(p: B*) { F(B, p); } // CHECK:STDOUT: %B.ref.loc20_9: type = name_ref B, file.%B.decl [concrete = constants.%B] // CHECK:STDOUT: %ptr: type = ptr_type %B.ref.loc20_9 [concrete = constants.%ptr.432] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.432 = value_binding p, %p.param +// CHECK:STDOUT: %p: %ptr.432 = wrapper_binding p, %p.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -449,7 +449,7 @@ fn G(p: B*) { F(B, p); } // CHECK:STDOUT: %.loc7_14.1: ref @F.%T.loc6_7.1 (%T) = deref %p.ref // CHECK:STDOUT: %.loc7_14.2: @F.%T.loc6_7.1 (%T) = acquire_value %.loc7_14.1 // CHECK:STDOUT: %T.ref.loc7: type = name_ref T, %T.loc6_7.2 [symbolic = %T.loc6_7.1 (constants.%T)] -// CHECK:STDOUT: %_: @F.%T.loc6_7.1 (%T) = value_binding _, %.loc7_14.2 +// CHECK:STDOUT: %_: @F.%T.loc6_7.1 (%T) = wrapper_binding _, %.loc7_14.2 // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/generic/dependent_param.carbon b/toolchain/check/testdata/generic/dependent_param.carbon index 62275f888f81..5ee899c893a0 100644 --- a/toolchain/check/testdata/generic/dependent_param.carbon +++ b/toolchain/check/testdata/generic/dependent_param.carbon @@ -122,7 +122,7 @@ var n: i32 = Outer(i32).Inner(42).Get(); // CHECK:STDOUT: } // CHECK:STDOUT: %n.var: ref %i32 = var %n.var_patt [concrete] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: ref %i32 = ref_binding n, %n.var [concrete = %n.var] +// CHECK:STDOUT: %n: ref %i32 = wrapper_binding n, %n.var [concrete = %n.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic class @Outer(%T.loc4_14.2: %Copy.type) { diff --git a/toolchain/check/testdata/generic/local.carbon b/toolchain/check/testdata/generic/local.carbon index 1e922ba8e3aa..9ed1d9f48fc3 100644 --- a/toolchain/check/testdata/generic/local.carbon +++ b/toolchain/check/testdata/generic/local.carbon @@ -190,7 +190,7 @@ class C(C:! type) { // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %C: type = class_type @C, @C(constants.%i32) [concrete = constants.%C.8eb] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: ref %C.8eb = ref_binding v, %v.var +// CHECK:STDOUT: %v: ref %C.8eb = wrapper_binding v, %v.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %v.var, constants.%Destroy.Op.1a2547.4 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%v.var) // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/generic/template/convert.carbon b/toolchain/check/testdata/generic/template/convert.carbon index 5ea1ca305a2c..f9b77c3e40b5 100644 --- a/toolchain/check/testdata/generic/template/convert.carbon +++ b/toolchain/check/testdata/generic/template/convert.carbon @@ -96,7 +96,7 @@ fn Test(d: D) -> i32 { // CHECK:STDOUT: %Int.as.Copy.impl.Op.4f6: %Int.as.Copy.impl.Op.type.3f6 = struct_value () [concrete] // CHECK:STDOUT: %Copy.facet: %Copy.type = facet_value %i32, (%Copy.impl_witness.0e0) [concrete] // CHECK:STDOUT: %Copy.WithSelf.Op.type.d09: type = fn_type @Copy.WithSelf.Op, @Copy.WithSelf(%Copy.facet) [concrete] -// CHECK:STDOUT: %.7a6: type = fn_type_with_self_type %Copy.WithSelf.Op.type.d09, %Copy.facet [concrete] +// CHECK:STDOUT: %.7a62: type = fn_type_with_self_type %Copy.WithSelf.Op.type.d09, %Copy.facet [concrete] // CHECK:STDOUT: %Int.as.Copy.impl.Op.specific_fn: = specific_function %Int.as.Copy.impl.Op.4f6, @Int.as.Copy.impl.Op(%int_32) [concrete] // CHECK:STDOUT: %n.param_patt: %pattern_type.6b6 = value_param_pattern [concrete] // CHECK:STDOUT: %n.patt.f0b: %pattern_type.6b6 = at_binding_pattern n, %n.param_patt [concrete] @@ -127,23 +127,23 @@ fn Test(d: D) -> i32 { // CHECK:STDOUT: %x.param_patt.0f9: %pattern_type.98b = value_param_pattern [concrete] // CHECK:STDOUT: %x.patt.2cc: %pattern_type.98b = at_binding_pattern x, %x.param_patt.0f9 [concrete] // CHECK:STDOUT: %F.specific_fn.e0d: = specific_function %F, @F(%C) [concrete] -// CHECK:STDOUT: %inst.as_compatible.7c9: = inst_value [concrete] { -// CHECK:STDOUT: %.aac: %i32 = as_compatible @F.%x.ref +// CHECK:STDOUT: %inst.as_compatible.1ff: = inst_value [concrete] { +// CHECK:STDOUT: %.775: %i32 = as_compatible @F.%x.ref // CHECK:STDOUT: } -// CHECK:STDOUT: %inst.splice_block.e9d: = inst_value [concrete] { -// CHECK:STDOUT: %.08e: %i32 = splice_block %.aac {} +// CHECK:STDOUT: %inst.splice_block.5e1: = inst_value [concrete] { +// CHECK:STDOUT: %.093: %i32 = splice_block %.775 {} // CHECK:STDOUT: } -// CHECK:STDOUT: %inst.as_compatible.ea0: = inst_value [concrete] { -// CHECK:STDOUT: %.bcf: %C = as_compatible @F.%x.ref +// CHECK:STDOUT: %inst.as_compatible.d98: = inst_value [concrete] { +// CHECK:STDOUT: %.f8c: %C = as_compatible @F.%x.ref // CHECK:STDOUT: } // CHECK:STDOUT: %.593: type = fn_type_with_self_type %ImplicitAs.WithSelf.Convert.type.034, %ImplicitAs.facet [concrete] -// CHECK:STDOUT: %inst.splice_block.76a: = inst_value [concrete] { -// CHECK:STDOUT: %.c87: %i32 = splice_block %.8ca { +// CHECK:STDOUT: %inst.splice_block.15c: = inst_value [concrete] { +// CHECK:STDOUT: %.7a69: %i32 = splice_block %.dc2 { // CHECK:STDOUT: %impl.elem0.6f7: %.593 = impl_witness_access %ImplicitAs.impl_witness.496, element0 [concrete = %C.as.ImplicitAs.impl.Convert] -// CHECK:STDOUT: %bound_method: = bound_method %.bcf, %impl.elem0.6f7 -// CHECK:STDOUT: %C.as.ImplicitAs.impl.Convert.call: init %i32 = call %bound_method(%.bcf) -// CHECK:STDOUT: %.c74: %i32 = value_of_initializer %C.as.ImplicitAs.impl.Convert.call -// CHECK:STDOUT: %.8ca: %i32 = converted %.bcf, %.c74 +// CHECK:STDOUT: %bound_method: = bound_method %.f8c, %impl.elem0.6f7 +// CHECK:STDOUT: %C.as.ImplicitAs.impl.Convert.call: init %i32 = call %bound_method(%.f8c) +// CHECK:STDOUT: %.cae: %i32 = value_of_initializer %C.as.ImplicitAs.impl.Convert.call +// CHECK:STDOUT: %.dc2: %i32 = converted %.f8c, %.cae // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -188,7 +188,7 @@ fn Test(d: D) -> i32 { // CHECK:STDOUT: %T.loc4_16.2: type = symbolic_binding T, 0, template [template = %T.loc4_16.1 (constants.%T.67db0b.1)] // CHECK:STDOUT: %x.param: @F.%T.loc4_16.1 (%T.67db0b.1) = value_param call_param0 // CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc4_16.2 [template = %T.loc4_16.1 (constants.%T.67db0b.1)] -// CHECK:STDOUT: %x: @F.%T.loc4_16.1 (%T.67db0b.1) = value_binding x, %x.param +// CHECK:STDOUT: %x: @F.%T.loc4_16.1 (%T.67db0b.1) = wrapper_binding x, %x.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -202,7 +202,7 @@ fn Test(d: D) -> i32 { // CHECK:STDOUT: %.loc9: Core.Form = init_form %i32.loc9_21 [concrete = constants.%.795] // CHECK:STDOUT: %n.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc9_13: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: %i32 = value_binding n, %n.param +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, %n.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -217,7 +217,7 @@ fn Test(d: D) -> i32 { // CHECK:STDOUT: %.loc20: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %c.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %c: %C = value_binding c, %c.param +// CHECK:STDOUT: %c: %C = wrapper_binding c, %c.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -234,7 +234,7 @@ fn Test(d: D) -> i32 { // CHECK:STDOUT: %.loc16_25: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %self.param: %C = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%C [concrete = constants.%C] -// CHECK:STDOUT: %self: %C = value_binding self, %self.param +// CHECK:STDOUT: %self: %C = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -285,9 +285,9 @@ fn Test(d: D) -> i32 { // CHECK:STDOUT: %.loc5_16.1: @F.%T.loc4_16.1 (%T.67db0b.1) = splice_inst %.loc5_16.3 // CHECK:STDOUT: %.loc5_16.2: %i32 = splice_inst %.loc5_16.4 // CHECK:STDOUT: %i32.loc5: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: %i32 = value_binding n, %.loc5_16.2 +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, %.loc5_16.2 // CHECK:STDOUT: %n.ref: %i32 = name_ref n, %n -// CHECK:STDOUT: %impl.elem0: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] +// CHECK:STDOUT: %impl.elem0: %.7a62 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] // CHECK:STDOUT: %bound_method.loc6_10.1: = bound_method %n.ref, %impl.elem0 // CHECK:STDOUT: %specific_fn: = specific_function %impl.elem0, @Int.as.Copy.impl.Op(constants.%int_32) [concrete = constants.%Int.as.Copy.impl.Op.specific_fn] // CHECK:STDOUT: %bound_method.loc6_10.2: = bound_method %n.ref, %specific_fn @@ -311,7 +311,7 @@ fn Test(d: D) -> i32 { // CHECK:STDOUT: %n.ref: %C.elem = name_ref n, @C.%.loc14 [concrete = @C.%.loc14] // CHECK:STDOUT: %.loc16_42.1: ref %i32 = class_element_access %self.ref, element0 // CHECK:STDOUT: %.loc16_42.2: %i32 = acquire_value %.loc16_42.1 -// CHECK:STDOUT: %impl.elem0: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] +// CHECK:STDOUT: %impl.elem0: %.7a62 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] // CHECK:STDOUT: %bound_method.loc16_42.1: = bound_method %.loc16_42.2, %impl.elem0 // CHECK:STDOUT: %specific_fn: = specific_function %impl.elem0, @Int.as.Copy.impl.Op(constants.%int_32) [concrete = constants.%Int.as.Copy.impl.Op.specific_fn] // CHECK:STDOUT: %bound_method.loc16_42.2: = bound_method %.loc16_42.2, %specific_fn @@ -345,8 +345,8 @@ fn Test(d: D) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %require_complete => constants.%complete_type.f8a -// CHECK:STDOUT: %.loc5_16.3 => constants.%inst.as_compatible.7c9 -// CHECK:STDOUT: %.loc5_16.4 => constants.%inst.splice_block.e9d +// CHECK:STDOUT: %.loc5_16.3 => constants.%inst.as_compatible.1ff +// CHECK:STDOUT: %.loc5_16.4 => constants.%inst.splice_block.5e1 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @F(constants.%C) { @@ -358,8 +358,8 @@ fn Test(d: D) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %require_complete => constants.%complete_type.cdf -// CHECK:STDOUT: %.loc5_16.3 => constants.%inst.as_compatible.ea0 -// CHECK:STDOUT: %.loc5_16.4 => constants.%inst.splice_block.76a +// CHECK:STDOUT: %.loc5_16.3 => constants.%inst.as_compatible.d98 +// CHECK:STDOUT: %.loc5_16.4 => constants.%inst.splice_block.15c // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_cannot_convert.carbon @@ -408,13 +408,13 @@ fn Test(d: D) -> i32 { // CHECK:STDOUT: %x.patt.75f: %pattern_type.d8d = at_binding_pattern x, %x.param_patt.23b [concrete] // CHECK:STDOUT: %F.specific_fn: = specific_function %F, @F(%D) [concrete] // CHECK:STDOUT: %inst.as_compatible: = inst_value [concrete] { -// CHECK:STDOUT: %.af0: %D = as_compatible @F.%x.ref +// CHECK:STDOUT: %.602: %D = as_compatible @F.%x.ref // CHECK:STDOUT: } // CHECK:STDOUT: %ImplicitAs.type.0ff: type = generic_interface_type @ImplicitAs [concrete] // CHECK:STDOUT: %ImplicitAs.generic: %ImplicitAs.type.0ff = struct_value () [concrete] // CHECK:STDOUT: %inst.splice_block: = inst_value [concrete] { -// CHECK:STDOUT: %.810: = splice_block [concrete = ] { -// CHECK:STDOUT: %.f0f: %i32 = converted %.af0, [concrete = ] +// CHECK:STDOUT: %.759: = splice_block [concrete = ] { +// CHECK:STDOUT: %.f8b: %i32 = converted %.602, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -458,7 +458,7 @@ fn Test(d: D) -> i32 { // CHECK:STDOUT: %T.loc4_16.2: type = symbolic_binding T, 0, template [template = %T.loc4_16.1 (constants.%T.67db0b.1)] // CHECK:STDOUT: %x.param: @F.%T.loc4_16.1 (%T.67db0b.1) = value_param call_param0 // CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc4_16.2 [template = %T.loc4_16.1 (constants.%T.67db0b.1)] -// CHECK:STDOUT: %x: @F.%T.loc4_16.1 (%T.67db0b.1) = value_binding x, %x.param +// CHECK:STDOUT: %x: @F.%T.loc4_16.1 (%T.67db0b.1) = wrapper_binding x, %x.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -473,7 +473,7 @@ fn Test(d: D) -> i32 { // CHECK:STDOUT: %.loc11: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %d.param: %D = value_param call_param0 // CHECK:STDOUT: %D.ref: type = name_ref D, file.%D.decl [concrete = constants.%D] -// CHECK:STDOUT: %d: %D = value_binding d, %d.param +// CHECK:STDOUT: %d: %D = wrapper_binding d, %d.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -508,7 +508,7 @@ fn Test(d: D) -> i32 { // CHECK:STDOUT: %.loc5_16.1: @F.%T.loc4_16.1 (%T.67db0b.1) = splice_inst %.loc5_16.3 // CHECK:STDOUT: %.loc5_16.2: %i32 = splice_inst %.loc5_16.4 // CHECK:STDOUT: %i32.loc5: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: %i32 = value_binding n, %.loc5_16.2 +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, %.loc5_16.2 // CHECK:STDOUT: %n.ref: %i32 = name_ref n, %n // CHECK:STDOUT: %impl.elem0: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] // CHECK:STDOUT: %bound_method.loc6_10.1: = bound_method %n.ref, %impl.elem0 diff --git a/toolchain/check/testdata/generic/template/member_access.carbon b/toolchain/check/testdata/generic/template/member_access.carbon index 9e5d4399dc5f..e6f2e6c97180 100644 --- a/toolchain/check/testdata/generic/template/member_access.carbon +++ b/toolchain/check/testdata/generic/template/member_access.carbon @@ -138,28 +138,28 @@ fn Test(e: E) { // CHECK:STDOUT: %Test2.type: type = fn_type @Test2 [concrete] // CHECK:STDOUT: %Test2: %Test2.type = struct_value () [concrete] // CHECK:STDOUT: %F.specific_fn.4da: = specific_function %F, @F(%struct_type.m.n) [concrete] -// CHECK:STDOUT: %inst.as_compatible.ea0: = inst_value [concrete] { -// CHECK:STDOUT: %.bcf: %C = as_compatible @F.%x.ref +// CHECK:STDOUT: %inst.as_compatible.d98: = inst_value [concrete] { +// CHECK:STDOUT: %.f8c: %C = as_compatible @F.%x.ref // CHECK:STDOUT: } -// CHECK:STDOUT: %inst.splice_block.738: = inst_value [concrete] { -// CHECK:STDOUT: %.556: %i32 = splice_block %.33b { +// CHECK:STDOUT: %inst.splice_block.351: = inst_value [concrete] { +// CHECK:STDOUT: %.5f2: %i32 = splice_block %.1e9 { // CHECK:STDOUT: %n.ref: %C.elem = name_ref n, @C.%.loc10 [concrete = @C.%.loc10] -// CHECK:STDOUT: %.cb0: ref %i32 = class_element_access %.bcf, element0 -// CHECK:STDOUT: %.33b: %i32 = acquire_value %.cb0 +// CHECK:STDOUT: %.a48: ref %i32 = class_element_access %.f8c, element0 +// CHECK:STDOUT: %.1e9: %i32 = acquire_value %.a48 // CHECK:STDOUT: } // CHECK:STDOUT: } -// CHECK:STDOUT: %inst.splice_block.3cc: = inst_value [concrete] { -// CHECK:STDOUT: %.98d: %i32 = splice_block %.556 {} +// CHECK:STDOUT: %inst.splice_block.f4f: = inst_value [concrete] { +// CHECK:STDOUT: %.ea2: %i32 = splice_block %.5f2 {} // CHECK:STDOUT: } // CHECK:STDOUT: %complete_type.08f: = complete_type_witness %struct_type.m.n [concrete] -// CHECK:STDOUT: %inst.as_compatible.8b7: = inst_value [concrete] { -// CHECK:STDOUT: %.63c: %struct_type.m.n = as_compatible @F.%x.ref +// CHECK:STDOUT: %inst.as_compatible.bba: = inst_value [concrete] { +// CHECK:STDOUT: %.a89: %struct_type.m.n = as_compatible @F.%x.ref // CHECK:STDOUT: } // CHECK:STDOUT: %inst.struct_access: = inst_value [concrete] { -// CHECK:STDOUT: %.29c: %i32 = struct_access %.63c, element1 +// CHECK:STDOUT: %.ebd: %i32 = struct_access %.a89, element1 // CHECK:STDOUT: } -// CHECK:STDOUT: %inst.splice_block.a6c: = inst_value [concrete] { -// CHECK:STDOUT: %.110: %i32 = splice_block %.29c {} +// CHECK:STDOUT: %inst.splice_block.1b4: = inst_value [concrete] { +// CHECK:STDOUT: %.214: %i32 = splice_block %.ebd {} // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -201,7 +201,7 @@ fn Test(e: E) { // CHECK:STDOUT: %T.loc4_16.2: type = symbolic_binding T, 0, template [template = %T.loc4_16.1 (constants.%T.67db0b.1)] // CHECK:STDOUT: %x.param: @F.%T.loc4_16.1 (%T.67db0b.1) = value_param call_param0 // CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc4_16.2 [template = %T.loc4_16.1 (constants.%T.67db0b.1)] -// CHECK:STDOUT: %x: @F.%T.loc4_16.1 (%T.67db0b.1) = value_binding x, %x.param +// CHECK:STDOUT: %x: @F.%T.loc4_16.1 (%T.67db0b.1) = wrapper_binding x, %x.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -212,7 +212,7 @@ fn Test(e: E) { // CHECK:STDOUT: } { // CHECK:STDOUT: %c.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %c: %C = value_binding c, %c.param +// CHECK:STDOUT: %c: %C = wrapper_binding c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: %Test2.decl: %Test2.type = fn_decl @Test2 [concrete = constants.%Test2] { // CHECK:STDOUT: %x.param_patt: %pattern_type.860 = value_param_pattern [concrete = constants.%x.param_patt.c8a] @@ -224,7 +224,7 @@ fn Test(e: E) { // CHECK:STDOUT: %i32.loc17_27: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.m.n: type = struct_type {.m: %i32, .n: %i32} [concrete = constants.%struct_type.m.n] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %struct_type.m.n = value_binding x, %x.param +// CHECK:STDOUT: %x: %struct_type.m.n = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -262,7 +262,7 @@ fn Test(e: E) { // CHECK:STDOUT: %.loc5_17.2: @F.%.loc5_17.6 (@F.%.loc5_17.6) = splice_inst %.loc5_17.5 // CHECK:STDOUT: %.loc5_17.3: %i32 = splice_inst %.loc5_17.7 // CHECK:STDOUT: %i32.loc5: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: %i32 = value_binding n, %.loc5_17.3 +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, %.loc5_17.3 // CHECK:STDOUT: %n.ref: %i32 = name_ref n, %n // CHECK:STDOUT: %impl.elem0: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] // CHECK:STDOUT: %bound_method.loc6_10.1: = bound_method %n.ref, %impl.elem0 @@ -308,10 +308,10 @@ fn Test(e: E) { // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %require_complete => constants.%complete_type.cdf -// CHECK:STDOUT: %.loc5_17.4 => constants.%inst.as_compatible.ea0 -// CHECK:STDOUT: %.loc5_17.5 => constants.%inst.splice_block.738 +// CHECK:STDOUT: %.loc5_17.4 => constants.%inst.as_compatible.d98 +// CHECK:STDOUT: %.loc5_17.5 => constants.%inst.splice_block.351 // CHECK:STDOUT: %.loc5_17.6 => constants.%i32 -// CHECK:STDOUT: %.loc5_17.7 => constants.%inst.splice_block.3cc +// CHECK:STDOUT: %.loc5_17.7 => constants.%inst.splice_block.f4f // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @F(constants.%struct_type.m.n) { @@ -323,10 +323,10 @@ fn Test(e: E) { // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %require_complete => constants.%complete_type.08f -// CHECK:STDOUT: %.loc5_17.4 => constants.%inst.as_compatible.8b7 +// CHECK:STDOUT: %.loc5_17.4 => constants.%inst.as_compatible.bba // CHECK:STDOUT: %.loc5_17.5 => constants.%inst.struct_access // CHECK:STDOUT: %.loc5_17.6 => constants.%i32 -// CHECK:STDOUT: %.loc5_17.7 => constants.%inst.splice_block.a6c +// CHECK:STDOUT: %.loc5_17.7 => constants.%inst.splice_block.1b4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_no_such_member.carbon @@ -376,7 +376,7 @@ fn Test(e: E) { // CHECK:STDOUT: %x.patt.75f: %pattern_type.d8d = at_binding_pattern x, %x.param_patt.23b [concrete] // CHECK:STDOUT: %F.specific_fn: = specific_function %F, @F(%D) [concrete] // CHECK:STDOUT: %inst.as_compatible: = inst_value [concrete] { -// CHECK:STDOUT: %.af0: %D = as_compatible @F.%x.ref +// CHECK:STDOUT: %.602: %D = as_compatible @F.%x.ref // CHECK:STDOUT: } // CHECK:STDOUT: %inst.name_ref: = inst_value [concrete] { // CHECK:STDOUT: %n.ref: = name_ref n, [concrete = ] @@ -423,7 +423,7 @@ fn Test(e: E) { // CHECK:STDOUT: %T.loc4_16.2: type = symbolic_binding T, 0, template [template = %T.loc4_16.1 (constants.%T.67db0b.1)] // CHECK:STDOUT: %x.param: @F.%T.loc4_16.1 (%T.67db0b.1) = value_param call_param0 // CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc4_16.2 [template = %T.loc4_16.1 (constants.%T.67db0b.1)] -// CHECK:STDOUT: %x: @F.%T.loc4_16.1 (%T.67db0b.1) = value_binding x, %x.param +// CHECK:STDOUT: %x: @F.%T.loc4_16.1 (%T.67db0b.1) = wrapper_binding x, %x.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -434,7 +434,7 @@ fn Test(e: E) { // CHECK:STDOUT: } { // CHECK:STDOUT: %d.param: %D = value_param call_param0 // CHECK:STDOUT: %D.ref: type = name_ref D, file.%D.decl [concrete = constants.%D] -// CHECK:STDOUT: %d: %D = value_binding d, %d.param +// CHECK:STDOUT: %d: %D = wrapper_binding d, %d.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -473,7 +473,7 @@ fn Test(e: E) { // CHECK:STDOUT: %.loc5_17.2: @F.%.loc5_17.6 (@F.%.loc5_17.6) = splice_inst %.loc5_17.5 // CHECK:STDOUT: %.loc5_17.3: %i32 = splice_inst %.loc5_17.7 // CHECK:STDOUT: %i32.loc5: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: %i32 = value_binding n, %.loc5_17.3 +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, %.loc5_17.3 // CHECK:STDOUT: %n.ref: %i32 = name_ref n, %n // CHECK:STDOUT: %impl.elem0: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] // CHECK:STDOUT: %bound_method.loc6_10.1: = bound_method %n.ref, %impl.elem0 @@ -566,20 +566,20 @@ fn Test(e: E) { // CHECK:STDOUT: %x.patt.b95: %pattern_type.849 = at_binding_pattern x, %x.param_patt.209 [concrete] // CHECK:STDOUT: %F.specific_fn: = specific_function %F.708, @F.loc4(%E) [concrete] // CHECK:STDOUT: %inst.as_compatible: = inst_value [concrete] { -// CHECK:STDOUT: %.660: %E = as_compatible @F.loc4.%x.ref +// CHECK:STDOUT: %.4a8: %E = as_compatible @F.loc4.%x.ref // CHECK:STDOUT: } -// CHECK:STDOUT: %inst.splice_block.124: = inst_value [concrete] { -// CHECK:STDOUT: %.cdf: %F.76a = splice_block %.6fd { +// CHECK:STDOUT: %inst.splice_block.e5a: = inst_value [concrete] { +// CHECK:STDOUT: %.39a: %F.76a = splice_block %.088 { // CHECK:STDOUT: %n.ref: %E.elem = name_ref n, @E.%.loc11 [concrete = @E.%.loc11] -// CHECK:STDOUT: %.cce: ref %F.76a = class_element_access %.660, element0 -// CHECK:STDOUT: %.6fd: %F.76a = acquire_value %.cce +// CHECK:STDOUT: %.c40: ref %F.76a = class_element_access %.4a8, element0 +// CHECK:STDOUT: %.088: %F.76a = acquire_value %.c40 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: %ImplicitAs.type.0ff: type = generic_interface_type @ImplicitAs [concrete] // CHECK:STDOUT: %ImplicitAs.generic: %ImplicitAs.type.0ff = struct_value () [concrete] -// CHECK:STDOUT: %inst.splice_block.db7: = inst_value [concrete] { -// CHECK:STDOUT: %.cbb: = splice_block [concrete = ] { -// CHECK:STDOUT: %.eb0: %i32 = converted %.cdf, [concrete = ] +// CHECK:STDOUT: %inst.splice_block.d6b: = inst_value [concrete] { +// CHECK:STDOUT: %.ccd: = splice_block [concrete = ] { +// CHECK:STDOUT: %.abd: %i32 = converted %.39a, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -623,7 +623,7 @@ fn Test(e: E) { // CHECK:STDOUT: %T.loc4_16.2: type = symbolic_binding T, 0, template [template = %T.loc4_16.1 (constants.%T.67db0b.1)] // CHECK:STDOUT: %x.param: @F.loc4.%T.loc4_16.1 (%T.67db0b.1) = value_param call_param0 // CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc4_16.2 [template = %T.loc4_16.1 (constants.%T.67db0b.1)] -// CHECK:STDOUT: %x: @F.loc4.%T.loc4_16.1 (%T.67db0b.1) = value_binding x, %x.param +// CHECK:STDOUT: %x: @F.loc4.%T.loc4_16.1 (%T.67db0b.1) = wrapper_binding x, %x.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -634,7 +634,7 @@ fn Test(e: E) { // CHECK:STDOUT: } { // CHECK:STDOUT: %e.param: %E = value_param call_param0 // CHECK:STDOUT: %E.ref: type = name_ref E, file.%E.decl [concrete = constants.%E] -// CHECK:STDOUT: %e: %E = value_binding e, %e.param +// CHECK:STDOUT: %e: %E = wrapper_binding e, %e.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -682,7 +682,7 @@ fn Test(e: E) { // CHECK:STDOUT: %.loc5_17.2: @F.loc4.%.loc5_17.6 (@F.loc4.%.loc5_17.6) = splice_inst %.loc5_17.5 // CHECK:STDOUT: %.loc5_17.3: %i32 = splice_inst %.loc5_17.7 // CHECK:STDOUT: %i32.loc5: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: %i32 = value_binding n, %.loc5_17.3 +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, %.loc5_17.3 // CHECK:STDOUT: %n.ref: %i32 = name_ref n, %n // CHECK:STDOUT: %impl.elem0: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] // CHECK:STDOUT: %bound_method.loc6_10.1: = bound_method %n.ref, %impl.elem0 @@ -720,8 +720,8 @@ fn Test(e: E) { // CHECK:STDOUT: !definition: // CHECK:STDOUT: %require_complete => constants.%complete_type.15a // CHECK:STDOUT: %.loc5_17.4 => constants.%inst.as_compatible -// CHECK:STDOUT: %.loc5_17.5 => constants.%inst.splice_block.124 +// CHECK:STDOUT: %.loc5_17.5 => constants.%inst.splice_block.e5a // CHECK:STDOUT: %.loc5_17.6 => constants.%F.76a -// CHECK:STDOUT: %.loc5_17.7 => constants.%inst.splice_block.db7 +// CHECK:STDOUT: %.loc5_17.7 => constants.%inst.splice_block.d6b // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/generic/template/unimplemented.carbon b/toolchain/check/testdata/generic/template/unimplemented.carbon index bbe6f6b134c4..262c7e44d4cd 100644 --- a/toolchain/check/testdata/generic/template/unimplemented.carbon +++ b/toolchain/check/testdata/generic/template/unimplemented.carbon @@ -131,7 +131,7 @@ fn F[template T:! Core.Destroy](x: T) { // CHECK:STDOUT: %T.loc6_16.2: type = symbolic_binding T, 0, template [template = %T.loc6_16.1 (constants.%T)] // CHECK:STDOUT: %x.param: @F.%T.loc6_16.1 (%T) = value_param call_param0 // CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc6_16.2 [template = %T.loc6_16.1 (constants.%T)] -// CHECK:STDOUT: %x: @F.%T.loc6_16.1 (%T) = value_binding x, %x.param +// CHECK:STDOUT: %x: @F.%T.loc6_16.1 (%T) = wrapper_binding x, %x.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -339,7 +339,7 @@ fn F[template T:! Core.Destroy](x: T) { // CHECK:STDOUT: %T.as_type.loc4_36.2: type = facet_access_type %T.ref.loc4 [template = %T.as_type.loc4_36.1 (constants.%T.as_type.700)] // CHECK:STDOUT: %.loc4_36.2: type = converted %T.ref.loc4, %T.as_type.loc4_36.2 [template = %T.as_type.loc4_36.1 (constants.%T.as_type.700)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @F.%T.as_type.loc4_36.1 (%T.as_type.700) = value_binding x, %x.param +// CHECK:STDOUT: %x: @F.%T.as_type.loc4_36.1 (%T.as_type.700) = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -381,7 +381,7 @@ fn F[template T:! Core.Destroy](x: T) { // CHECK:STDOUT: %T.as_type.loc14: type = facet_access_type %T.ref.loc14 [template = %T.as_type.loc4_36.1 (constants.%T.as_type.700)] // CHECK:STDOUT: %.loc14_17.2: type = converted %T.ref.loc14, %T.as_type.loc14 [template = %T.as_type.loc4_36.1 (constants.%T.as_type.700)] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: ref @F.%T.as_type.loc4_36.1 (%T.as_type.700) = ref_binding v, %v.var +// CHECK:STDOUT: %v: ref @F.%T.as_type.loc4_36.1 (%T.as_type.700) = wrapper_binding v, %v.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %w.patt: %pattern_type.6b6 = ref_binding_pattern w [concrete = constants.%w.patt] // CHECK:STDOUT: %w.var_patt: %pattern_type.6b6 = var_pattern %w.patt [concrete = constants.%w.var_patt] @@ -391,7 +391,7 @@ fn F[template T:! Core.Destroy](x: T) { // CHECK:STDOUT: %.loc22: %i32 = converted %x.ref, [concrete = ] // CHECK:STDOUT: assign %w.var, // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %w: ref %i32 = ref_binding w, %w.var +// CHECK:STDOUT: %w: ref %i32 = wrapper_binding w, %w.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %w.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%w.var) // CHECK:STDOUT: %impl.elem0.loc14_3.1: @F.%.loc14_3.7 (%.53a) = impl_witness_access constants.%Destroy.lookup_impl_witness, element0 [template = %impl.elem0.loc14_3.2 (constants.%impl.elem0.0f9)] diff --git a/toolchain/check/testdata/generic/template_dependence.carbon b/toolchain/check/testdata/generic/template_dependence.carbon index 0c6721dbab82..6239288dfe33 100644 --- a/toolchain/check/testdata/generic/template_dependence.carbon +++ b/toolchain/check/testdata/generic/template_dependence.carbon @@ -84,7 +84,7 @@ fn F(template T:! type, U:! type) -> (T, U) { // CHECK:STDOUT: %ptr.loc5_29.2: type = ptr_type %T.ref.loc5_28 [template = %ptr.loc5_29.1 (constants.%ptr.e8f8f9.1)] // CHECK:STDOUT: %ptr.loc5_30.2: type = ptr_type %ptr.loc5_29.2 [template = %ptr.loc5_30.1 (constants.%ptr.125)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @F.%ptr.loc5_30.1 (%ptr.125) = value_binding x, %x.param +// CHECK:STDOUT: %x: @F.%ptr.loc5_30.1 (%ptr.125) = wrapper_binding x, %x.param // CHECK:STDOUT: %return.param: ref @F.%ptr.loc5_29.1 (%ptr.e8f8f9.1) = out_param call_param1 // CHECK:STDOUT: %return: ref @F.%ptr.loc5_29.1 (%ptr.e8f8f9.1) = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/generic/var_param.carbon b/toolchain/check/testdata/generic/var_param.carbon index 358ee1e31d7d..f8d8b8c786f6 100644 --- a/toolchain/check/testdata/generic/var_param.carbon +++ b/toolchain/check/testdata/generic/var_param.carbon @@ -92,7 +92,7 @@ fn Test(x: i32) { // CHECK:STDOUT: %T.as_type.loc22_32.2: type = facet_access_type %T.ref [symbolic = %T.as_type.loc22_32.1 (constants.%T.as_type.b38)] // CHECK:STDOUT: %.loc22_32.2: type = converted %T.ref, %T.as_type.loc22_32.2 [symbolic = %T.as_type.loc22_32.1 (constants.%T.as_type.b38)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref @TestOp.%T.as_type.loc22_32.1 (%T.as_type.b38) = ref_binding x, %x.param +// CHECK:STDOUT: %x: ref @TestOp.%T.as_type.loc22_32.1 (%T.as_type.b38) = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/global/basics.carbon b/toolchain/check/testdata/global/basics.carbon index a7e1105e5e9a..f8e6b7840d54 100644 --- a/toolchain/check/testdata/global/basics.carbon +++ b/toolchain/check/testdata/global/basics.carbon @@ -84,7 +84,7 @@ var a: A = Make(); // CHECK:STDOUT: %.loc4_9.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc4_9.3: type = converted %.loc4_9.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %empty_struct_type = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %empty_struct_type = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -119,7 +119,7 @@ var a: A = Make(); // CHECK:STDOUT: %.loc4_9.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc4_9.3: type = converted %.loc4_9.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %empty_struct_type = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %empty_struct_type = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -153,7 +153,7 @@ var a: A = Make(); // CHECK:STDOUT: %.loc6_9.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc6_9.3: type = converted %.loc6_9.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %empty_struct_type = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %empty_struct_type = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -183,7 +183,7 @@ var a: A = Make(); // CHECK:STDOUT: } // CHECK:STDOUT: %a.var: ref %A = var %a.var_patt [concrete] // CHECK:STDOUT: %A.ref: type = name_ref A, %A.decl [concrete = constants.%A] -// CHECK:STDOUT: %a: ref %A = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %A = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -213,7 +213,7 @@ var a: A = Make(); // CHECK:STDOUT: } // CHECK:STDOUT: %a.var: ref %A = var %a.var_patt [concrete] // CHECK:STDOUT: %A.ref: type = name_ref A, %A.decl [concrete = constants.%A] -// CHECK:STDOUT: %a: ref %A = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %A = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/if/basics.carbon b/toolchain/check/testdata/if/basics.carbon index 1e5368ab8527..b44d8012cc66 100644 --- a/toolchain/check/testdata/if/basics.carbon +++ b/toolchain/check/testdata/if/basics.carbon @@ -131,7 +131,7 @@ fn VarScope(b: bool) -> bool { // CHECK:STDOUT: } { // CHECK:STDOUT: %b.param: bool = value_param call_param0 // CHECK:STDOUT: %.loc8: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %b: bool = value_binding b, %b.param +// CHECK:STDOUT: %b: bool = wrapper_binding b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -178,7 +178,7 @@ fn VarScope(b: bool) -> bool { // CHECK:STDOUT: } { // CHECK:STDOUT: %b.param: bool = value_param call_param0 // CHECK:STDOUT: %.loc7: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %b: bool = value_binding b, %b.param +// CHECK:STDOUT: %b: bool = wrapper_binding b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -238,7 +238,7 @@ fn VarScope(b: bool) -> bool { // CHECK:STDOUT: %.loc4_19.2: Core.Form = init_form %.loc4_19.1 [concrete = constants.%.f34] // CHECK:STDOUT: %b.param: bool = value_param call_param0 // CHECK:STDOUT: %.loc4_10: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %b: bool = value_binding b, %b.param +// CHECK:STDOUT: %b: bool = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param1 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/if_expr/basic.carbon b/toolchain/check/testdata/if_expr/basic.carbon index ac4d788ecf04..7113d6959e4c 100644 --- a/toolchain/check/testdata/if_expr/basic.carbon +++ b/toolchain/check/testdata/if_expr/basic.carbon @@ -121,13 +121,13 @@ fn F(b: bool, n: i32, m: i32) -> i32 { // CHECK:STDOUT: %.loc15_34: Core.Form = init_form %i32.loc15_34 [concrete = constants.%.795] // CHECK:STDOUT: %b.param: bool = value_param call_param0 // CHECK:STDOUT: %.loc15_9: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %b: bool = value_binding b, %b.param +// CHECK:STDOUT: %b: bool = wrapper_binding b, %b.param // CHECK:STDOUT: %n.param: %i32 = value_param call_param1 // CHECK:STDOUT: %i32.loc15_18: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: %i32 = value_binding n, %n.param +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, %n.param // CHECK:STDOUT: %m.param: %i32 = value_param call_param2 // CHECK:STDOUT: %i32.loc15_26: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %m: %i32 = value_binding m, %m.param +// CHECK:STDOUT: %m: %i32 = wrapper_binding m, %m.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param3 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -159,7 +159,7 @@ fn F(b: bool, n: i32, m: i32) -> i32 { // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1] // CHECK:STDOUT: %array_type: type = array_type %int_1, %i32.loc16 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %array_type = ref_binding x, %x.var +// CHECK:STDOUT: %x: ref %array_type = wrapper_binding x, %x.var // CHECK:STDOUT: %b.ref: bool = name_ref b, %b // CHECK:STDOUT: if %b.ref br !if.expr.then else br !if.expr.else // CHECK:STDOUT: diff --git a/toolchain/check/testdata/if_expr/constant_condition.carbon b/toolchain/check/testdata/if_expr/constant_condition.carbon index 238779948f40..ff8b0322dfc3 100644 --- a/toolchain/check/testdata/if_expr/constant_condition.carbon +++ b/toolchain/check/testdata/if_expr/constant_condition.carbon @@ -207,7 +207,7 @@ fn PartiallyConstant(t: type) -> i32 { // CHECK:STDOUT: %.loc32_34: Core.Form = init_form %i32.loc32 [concrete = constants.%.795] // CHECK:STDOUT: %t.param: type = value_param call_param0 // CHECK:STDOUT: %.loc32_25: type = type_literal type [concrete = type] -// CHECK:STDOUT: %t: type = value_binding t, %t.param +// CHECK:STDOUT: %t: type = wrapper_binding t, %t.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -330,7 +330,7 @@ fn PartiallyConstant(t: type) -> i32 { // CHECK:STDOUT: br !.loc27_8 // CHECK:STDOUT: // CHECK:STDOUT: !.loc27_8: -// CHECK:STDOUT: %v: ref %i32 = ref_binding v, %v.var +// CHECK:STDOUT: %v: ref %i32 = wrapper_binding v, %v.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %w.patt: %pattern_type.f00 = ref_binding_pattern w [concrete = constants.%w.patt] // CHECK:STDOUT: %w.var_patt: %pattern_type.f00 = var_pattern %w.patt [concrete = constants.%w.var_patt] @@ -364,7 +364,7 @@ fn PartiallyConstant(t: type) -> i32 { // CHECK:STDOUT: br !.loc28_8 // CHECK:STDOUT: // CHECK:STDOUT: !.loc28_8: -// CHECK:STDOUT: %w: ref %ptr.d08 = ref_binding w, %w.var +// CHECK:STDOUT: %w: ref %ptr.d08 = wrapper_binding w, %w.var // CHECK:STDOUT: %w.ref: ref %ptr.d08 = name_ref w, %w // CHECK:STDOUT: %.loc29_11: %ptr.d08 = acquire_value %w.ref // CHECK:STDOUT: %.loc29_10.1: ref %i32 = deref %.loc29_11 @@ -424,7 +424,7 @@ fn PartiallyConstant(t: type) -> i32 { // CHECK:STDOUT: br !.loc33_8 // CHECK:STDOUT: // CHECK:STDOUT: !.loc33_8: -// CHECK:STDOUT: %v: ref %i32 = ref_binding v, %v.var +// CHECK:STDOUT: %v: ref %i32 = wrapper_binding v, %v.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %w.patt: %pattern_type.f00 = ref_binding_pattern w [concrete = constants.%w.patt] // CHECK:STDOUT: %w.var_patt: %pattern_type.f00 = var_pattern %w.patt [concrete = constants.%w.var_patt] @@ -458,7 +458,7 @@ fn PartiallyConstant(t: type) -> i32 { // CHECK:STDOUT: br !.loc34_8 // CHECK:STDOUT: // CHECK:STDOUT: !.loc34_8: -// CHECK:STDOUT: %w: ref %ptr.d08 = ref_binding w, %w.var +// CHECK:STDOUT: %w: ref %ptr.d08 = wrapper_binding w, %w.var // CHECK:STDOUT: %w.ref: ref %ptr.d08 = name_ref w, %w // CHECK:STDOUT: %.loc35_11: %ptr.d08 = acquire_value %w.ref // CHECK:STDOUT: %.loc35_10.1: ref %i32 = deref %.loc35_11 diff --git a/toolchain/check/testdata/if_expr/control_flow.carbon b/toolchain/check/testdata/if_expr/control_flow.carbon index 7c44620bebad..a06b92725789 100644 --- a/toolchain/check/testdata/if_expr/control_flow.carbon +++ b/toolchain/check/testdata/if_expr/control_flow.carbon @@ -128,7 +128,7 @@ fn F(b: bool) -> i32 { // CHECK:STDOUT: %.loc18_18: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %b.param: bool = value_param call_param0 // CHECK:STDOUT: %.loc18_9: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %b: bool = value_binding b, %b.param +// CHECK:STDOUT: %b: bool = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/if_expr/fail_partial_constant.carbon b/toolchain/check/testdata/if_expr/fail_partial_constant.carbon index 827acad48315..94cad6633dec 100644 --- a/toolchain/check/testdata/if_expr/fail_partial_constant.carbon +++ b/toolchain/check/testdata/if_expr/fail_partial_constant.carbon @@ -85,7 +85,7 @@ fn ChosenBranchIsNonConstant(t: type) { // CHECK:STDOUT: } { // CHECK:STDOUT: %b.param: bool = value_param call_param0 // CHECK:STDOUT: %.loc4: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %b: bool = value_binding b, %b.param +// CHECK:STDOUT: %b: bool = wrapper_binding b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -117,7 +117,7 @@ fn ChosenBranchIsNonConstant(t: type) { // CHECK:STDOUT: br !.loc12_15 // CHECK:STDOUT: // CHECK:STDOUT: !.loc12_15: -// CHECK:STDOUT: %v: ref = ref_binding v, [concrete = ] +// CHECK:STDOUT: %v: = wrapper_binding v, [concrete = ] // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: @@ -162,7 +162,7 @@ fn ChosenBranchIsNonConstant(t: type) { // CHECK:STDOUT: } { // CHECK:STDOUT: %t.param: type = value_param call_param0 // CHECK:STDOUT: %.loc4: type = type_literal type [concrete = type] -// CHECK:STDOUT: %t: type = value_binding t, %t.param +// CHECK:STDOUT: %t: type = wrapper_binding t, %t.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -194,7 +194,7 @@ fn ChosenBranchIsNonConstant(t: type) { // CHECK:STDOUT: br !.loc9_15 // CHECK:STDOUT: // CHECK:STDOUT: !.loc9_15: -// CHECK:STDOUT: %v: ref = ref_binding v, [concrete = ] +// CHECK:STDOUT: %v: = wrapper_binding v, [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %w.patt: = ref_binding_pattern w [concrete = ] // CHECK:STDOUT: %w.var_patt: = var_pattern %w.patt [concrete = ] @@ -221,7 +221,7 @@ fn ChosenBranchIsNonConstant(t: type) { // CHECK:STDOUT: br !.loc14_15 // CHECK:STDOUT: // CHECK:STDOUT: !.loc14_15: -// CHECK:STDOUT: %w: ref = ref_binding w, [concrete = ] +// CHECK:STDOUT: %w: = wrapper_binding w, [concrete = ] // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/if_expr/nested.carbon b/toolchain/check/testdata/if_expr/nested.carbon index 72a0c69130a1..d7038c282672 100644 --- a/toolchain/check/testdata/if_expr/nested.carbon +++ b/toolchain/check/testdata/if_expr/nested.carbon @@ -117,13 +117,13 @@ fn F(a: bool, b: bool, c: bool) -> i32 { // CHECK:STDOUT: %.loc15_36: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %a.param: bool = value_param call_param0 // CHECK:STDOUT: %.loc15_9: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %a: bool = value_binding a, %a.param +// CHECK:STDOUT: %a: bool = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: bool = value_param call_param1 // CHECK:STDOUT: %.loc15_18: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %b: bool = value_binding b, %b.param +// CHECK:STDOUT: %b: bool = wrapper_binding b, %b.param // CHECK:STDOUT: %c.param: bool = value_param call_param2 // CHECK:STDOUT: %.loc15_27: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %c: bool = value_binding c, %c.param +// CHECK:STDOUT: %c: bool = wrapper_binding c, %c.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param3 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/if_expr/struct.carbon b/toolchain/check/testdata/if_expr/struct.carbon index 0b189cf00c52..08a9c951a964 100644 --- a/toolchain/check/testdata/if_expr/struct.carbon +++ b/toolchain/check/testdata/if_expr/struct.carbon @@ -104,7 +104,7 @@ fn F(cond: bool) { // CHECK:STDOUT: %i32.loc15_23: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a.b: type = struct_type {.a: %i32, .b: %i32} [concrete = constants.%struct_type.a.b.b4c] // CHECK:STDOUT: } -// CHECK:STDOUT: %s: %struct_type.a.b.b4c = value_binding s, %s.param +// CHECK:STDOUT: %s: %struct_type.a.b.b4c = wrapper_binding s, %s.param // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [concrete = constants.%F] { // CHECK:STDOUT: %cond.param_patt: %pattern_type.831 = value_param_pattern [concrete = constants.%cond.param_patt] @@ -112,7 +112,7 @@ fn F(cond: bool) { // CHECK:STDOUT: } { // CHECK:STDOUT: %cond.param: bool = value_param call_param0 // CHECK:STDOUT: %.loc17: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %cond: bool = value_binding cond, %cond.param +// CHECK:STDOUT: %cond: bool = wrapper_binding cond, %cond.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -152,7 +152,7 @@ fn F(cond: bool) { // CHECK:STDOUT: %i32.loc18_24: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a.b: type = struct_type {.a: %i32, .b: %i32} [concrete = constants.%struct_type.a.b.b4c] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %struct_type.a.b.b4c = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %struct_type.a.b.b4c = wrapper_binding a, %a.var // CHECK:STDOUT: %G.ref: %G.type = name_ref G, file.%G.decl [concrete = constants.%G] // CHECK:STDOUT: %cond.ref: bool = name_ref cond, %cond // CHECK:STDOUT: if %cond.ref br !if.expr.then else br !if.expr.else diff --git a/toolchain/check/testdata/impl/assoc_const_self.carbon b/toolchain/check/testdata/impl/assoc_const_self.carbon index 4bd6cf34a6c8..acf507d2fd91 100644 --- a/toolchain/check/testdata/impl/assoc_const_self.carbon +++ b/toolchain/check/testdata/impl/assoc_const_self.carbon @@ -511,7 +511,7 @@ fn CallF() { // CHECK:STDOUT: %.loc11_28.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc11_28.3: type = converted %.loc11_28.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: %empty_tuple.type = value_binding self, %self.param +// CHECK:STDOUT: %self: %empty_tuple.type = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref %C = out_param call_param1 // CHECK:STDOUT: %return: ref %C = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/compound.carbon b/toolchain/check/testdata/impl/compound.carbon index 539e701d4bdf..afbab1ff9177 100644 --- a/toolchain/check/testdata/impl/compound.carbon +++ b/toolchain/check/testdata/impl/compound.carbon @@ -190,7 +190,7 @@ fn InstanceCallFail() { // CHECK:STDOUT: %Self.as_type.loc4_14.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc4_14.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc4_14.3: type = converted %Self.ref, %Self.as_type.loc4_14.2 [symbolic = %Self.as_type.loc4_14.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @ImplicitAs.WithSelf.Convert.%Self.as_type.loc4_14.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @ImplicitAs.WithSelf.Convert.%Self.as_type.loc4_14.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref @ImplicitAs.WithSelf.Convert.%Dest (%Dest) = out_param call_param1 // CHECK:STDOUT: %return: ref @ImplicitAs.WithSelf.Convert.%Dest (%Dest) = return_slot %return.param // CHECK:STDOUT: } @@ -440,7 +440,7 @@ fn InstanceCallFail() { // CHECK:STDOUT: %.loc13_30.2: type = converted %.loc13_30.1, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: %struct_type.b: type = struct_type {.b: %empty_tuple.type} [concrete = constants.%struct_type.b] // CHECK:STDOUT: } -// CHECK:STDOUT: %n: %struct_type.b = value_binding n, %n.param +// CHECK:STDOUT: %n: %struct_type.b = wrapper_binding n, %n.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -674,7 +674,7 @@ fn InstanceCallFail() { // CHECK:STDOUT: %struct_type.c: type = struct_type {.c: %empty_tuple.type} [concrete = constants.%struct_type.c] // CHECK:STDOUT: %ptr: type = ptr_type %struct_type.c [concrete = constants.%ptr] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr = value_binding p, %p.param +// CHECK:STDOUT: %p: %ptr = wrapper_binding p, %p.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -879,7 +879,7 @@ fn InstanceCallFail() { // CHECK:STDOUT: %.loc11_26.2: type = converted %.loc11_26.1, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: %struct_type.d: type = struct_type {.d: %empty_tuple.type} [concrete = constants.%struct_type.d] // CHECK:STDOUT: } -// CHECK:STDOUT: %n: %struct_type.d = value_binding n, %n.param +// CHECK:STDOUT: %n: %struct_type.d = wrapper_binding n, %n.param // CHECK:STDOUT: } // CHECK:STDOUT: %InstanceCallIndirect.decl: %InstanceCallIndirect.type = fn_decl @InstanceCallIndirect [concrete = constants.%InstanceCallIndirect] { // CHECK:STDOUT: %p.param_patt: %pattern_type.8d6 = value_param_pattern [concrete = constants.%p.param_patt] @@ -892,7 +892,7 @@ fn InstanceCallFail() { // CHECK:STDOUT: %struct_type.d: type = struct_type {.d: %empty_tuple.type} [concrete = constants.%struct_type.d] // CHECK:STDOUT: %ptr: type = ptr_type %struct_type.d [concrete = constants.%ptr] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr = value_binding p, %p.param +// CHECK:STDOUT: %p: %ptr = wrapper_binding p, %p.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -911,7 +911,7 @@ fn InstanceCallFail() { // CHECK:STDOUT: %Self.as_type.loc4_9.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc4_9.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc4_9.2: type = converted %Self.ref, %Self.as_type.loc4_9.2 [symbolic = %Self.as_type.loc4_9.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @Instance1.WithSelf.G1.%Self.as_type.loc4_9.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @Instance1.WithSelf.G1.%Self.as_type.loc4_9.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0: %Instance1.assoc_type = assoc_entity element0, %Instance1.WithSelf.G1.decl [concrete = constants.%assoc0] // CHECK:STDOUT: @@ -930,7 +930,7 @@ fn InstanceCallFail() { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %struct_type.d = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @struct_type.d.as.Instance1.impl.%struct_type.d [concrete = constants.%struct_type.d] -// CHECK:STDOUT: %self: %struct_type.d = value_binding self, %self.param +// CHECK:STDOUT: %self: %struct_type.d = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %Instance1.impl_witness_table = impl_witness_table (%struct_type.d.as.Instance1.impl.G1.decl), @struct_type.d.as.Instance1.impl [concrete] // CHECK:STDOUT: %Instance1.impl_witness: = impl_witness %Instance1.impl_witness_table [concrete = constants.%Instance1.impl_witness] @@ -1073,7 +1073,7 @@ fn InstanceCallFail() { // CHECK:STDOUT: %Self.as_type.loc4_9.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc4_9.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc4_9.2: type = converted %Self.ref, %Self.as_type.loc4_9.2 [symbolic = %Self.as_type.loc4_9.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @Instance2.WithSelf.G2.%Self.as_type.loc4_9.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @Instance2.WithSelf.G2.%Self.as_type.loc4_9.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0: %Instance2.assoc_type = assoc_entity element0, %Instance2.WithSelf.G2.decl [concrete = constants.%assoc0] // CHECK:STDOUT: @@ -1092,7 +1092,7 @@ fn InstanceCallFail() { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %struct_type.e = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @struct_type.e.as.Instance2.impl.%struct_type.e [concrete = constants.%struct_type.e] -// CHECK:STDOUT: %self: %struct_type.e = value_binding self, %self.param +// CHECK:STDOUT: %self: %struct_type.e = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %Instance2.impl_witness_table = impl_witness_table (%struct_type.e.as.Instance2.impl.G2.decl), @struct_type.e.as.Instance2.impl [concrete] // CHECK:STDOUT: %Instance2.impl_witness: = impl_witness %Instance2.impl_witness_table [concrete = constants.%Instance2.impl_witness] diff --git a/toolchain/check/testdata/impl/extend_impl_generic.carbon b/toolchain/check/testdata/impl/extend_impl_generic.carbon index f57d48488388..6f9b8ebd3556 100644 --- a/toolchain/check/testdata/impl/extend_impl_generic.carbon +++ b/toolchain/check/testdata/impl/extend_impl_generic.carbon @@ -197,7 +197,7 @@ class X(U:! type) { // CHECK:STDOUT: } { // CHECK:STDOUT: %c.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc20: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %c: %C = value_binding c, %c.param +// CHECK:STDOUT: %c: %C = wrapper_binding c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -328,7 +328,7 @@ class X(U:! type) { // CHECK:STDOUT: %.loc21_28.1: ref %i32 = class_element_access %.loc21_27.2, element0 // CHECK:STDOUT: %.loc21_28.2: %i32 = acquire_value %.loc21_28.1 // CHECK:STDOUT: %i32.loc21: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %.loc21_28.2 +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %.loc21_28.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] @@ -351,7 +351,7 @@ class X(U:! type) { // CHECK:STDOUT: %Int.as.Copy.impl.Op.call: init %i32 = call %bound_method.loc22_28.2(%.loc22_28.2) // CHECK:STDOUT: assign %b.var, %Int.as.Copy.impl.Op.call // CHECK:STDOUT: %i32.loc22: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: ref %i32 = ref_binding b, %b.var +// CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var // CHECK:STDOUT: %Destroy.Op.bound.loc22_27: = bound_method %.loc22_27.2, constants.%Destroy.Op.1a2547.4 // CHECK:STDOUT: %Destroy.Op.call.loc22_27: init %empty_tuple.type = call %Destroy.Op.bound.loc22_27(%.loc22_27.2) // CHECK:STDOUT: %Destroy.Op.bound.loc22_3: = bound_method %b.var, constants.%Destroy.Op.1a2547.2 @@ -556,10 +556,10 @@ class X(U:! type) { // CHECK:STDOUT: %Self.as_type.loc5_8.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc5_8.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc5_8.3: type = converted %Self.ref, %Self.as_type.loc5_8.2 [symbolic = %Self.as_type.loc5_8.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @I.WithSelf.F.%Self.as_type.loc5_8.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @I.WithSelf.F.%Self.as_type.loc5_8.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: %t.param: @I.WithSelf.F.%T (%T) = value_param call_param1 // CHECK:STDOUT: %T.ref: type = name_ref T, @I.%T.loc4_14.2 [symbolic = %T (constants.%T)] -// CHECK:STDOUT: %t: @I.WithSelf.F.%T (%T) = value_binding t, %t.param +// CHECK:STDOUT: %t: @I.WithSelf.F.%T (%T) = wrapper_binding t, %t.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0.loc5_19.1: @I.WithSelf.%I.assoc_type (%I.assoc_type.b71f2b.1) = assoc_entity element0, %I.WithSelf.F.decl [symbolic = %assoc0.loc5_19.2 (constants.%assoc0.13b5f8.1)] // CHECK:STDOUT: @@ -598,10 +598,10 @@ class X(U:! type) { // CHECK:STDOUT: %.loc10_17.2: type = specific_constant constants.%X, @X(constants.%U) [symbolic = %X (constants.%X)] // CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc10_17.2 [symbolic = %X (constants.%X)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @X.as.I.impl.F.%X (%X) = value_binding self, %self.param +// CHECK:STDOUT: %self: @X.as.I.impl.F.%X (%X) = wrapper_binding self, %self.param // CHECK:STDOUT: %t.param: @X.as.I.impl.F.%U (%U) = value_param call_param1 // CHECK:STDOUT: %U.ref: type = name_ref U, @X.%U.loc8_10.2 [symbolic = %U (constants.%U)] -// CHECK:STDOUT: %t: @X.as.I.impl.F.%U (%U) = value_binding t, %t.param +// CHECK:STDOUT: %t: @X.as.I.impl.F.%U (%U) = wrapper_binding t, %t.param // CHECK:STDOUT: } // CHECK:STDOUT: %I.impl_witness_table = impl_witness_table (%X.as.I.impl.F.decl), @X.as.I.impl [concrete] // CHECK:STDOUT: %I.impl_witness.loc9_23.1: = impl_witness %I.impl_witness_table, @X.as.I.impl(constants.%U) [symbolic = %I.impl_witness.loc9_23.2 (constants.%I.impl_witness)] diff --git a/toolchain/check/testdata/impl/fail_call_invalid.carbon b/toolchain/check/testdata/impl/fail_call_invalid.carbon index b43abd343976..dbaf6fcafd8a 100644 --- a/toolchain/check/testdata/impl/fail_call_invalid.carbon +++ b/toolchain/check/testdata/impl/fail_call_invalid.carbon @@ -93,7 +93,7 @@ fn InstanceCall(n: i32) { // CHECK:STDOUT: } { // CHECK:STDOUT: %n.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: %i32 = value_binding n, %n.param +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, %n.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -112,7 +112,7 @@ fn InstanceCall(n: i32) { // CHECK:STDOUT: %Self.as_type.loc16_8.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc16_8.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc16_8.2: type = converted %Self.ref, %Self.as_type.loc16_8.2 [symbolic = %Self.as_type.loc16_8.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @Simple.WithSelf.G.%Self.as_type.loc16_8.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @Simple.WithSelf.G.%Self.as_type.loc16_8.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0: %Simple.assoc_type = assoc_entity element0, %Simple.WithSelf.G.decl [concrete = constants.%assoc0] // CHECK:STDOUT: @@ -132,14 +132,14 @@ fn InstanceCall(n: i32) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: = value_param call_param0 // CHECK:STDOUT: %Undeclared.ref: = name_ref Undeclared, [concrete = ] -// CHECK:STDOUT: %self: = value_binding self, [concrete = ] +// CHECK:STDOUT: %self: = wrapper_binding self, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: %i32.as.Simple.impl.G.decl.loc24_25.2: %i32.as.Simple.impl.G.type.321a2c.2 = fn_decl @i32.as.Simple.impl.G.loc24_25.2 [concrete = constants.%i32.as.Simple.impl.G.d407b2.2] { // CHECK:STDOUT: %.1: %pattern_type.6b6 = specific_constant constants.%self.param_patt.049, @Simple.WithSelf.G(constants.%Simple.facet) [concrete = constants.%self.param_patt.049] // CHECK:STDOUT: %self.patt: %pattern_type.6b6 = at_binding_pattern self, %.1 [concrete = constants.%self.patt.f6c] // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %i32 = value_param call_param0 -// CHECK:STDOUT: %self: %i32 = value_binding self, %self.param +// CHECK:STDOUT: %self: %i32 = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %Simple.impl_witness_table = impl_witness_table (%i32.as.Simple.impl.G.decl.loc24_25.2), @i32.as.Simple.impl [concrete] // CHECK:STDOUT: %Simple.impl_witness: = impl_witness %Simple.impl_witness_table [concrete = constants.%Simple.impl_witness] diff --git a/toolchain/check/testdata/impl/fail_extend_impl_forall.carbon b/toolchain/check/testdata/impl/fail_extend_impl_forall.carbon index a48f6d118796..f035fd81582c 100644 --- a/toolchain/check/testdata/impl/fail_extend_impl_forall.carbon +++ b/toolchain/check/testdata/impl/fail_extend_impl_forall.carbon @@ -90,7 +90,7 @@ class C { // CHECK:STDOUT: } { // CHECK:STDOUT: %x.param: @GenericInterface.WithSelf.F.%T (%T) = value_param call_param0 // CHECK:STDOUT: %T.ref: type = name_ref T, @GenericInterface.%T.loc15_29.2 [symbolic = %T (constants.%T)] -// CHECK:STDOUT: %x: @GenericInterface.WithSelf.F.%T (%T) = value_binding x, %x.param +// CHECK:STDOUT: %x: @GenericInterface.WithSelf.F.%T (%T) = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0.loc16_13.1: @GenericInterface.WithSelf.%GenericInterface.assoc_type (%GenericInterface.assoc_type) = assoc_entity element0, %GenericInterface.WithSelf.F.decl [symbolic = %assoc0.loc16_13.2 (constants.%assoc0)] // CHECK:STDOUT: @@ -122,7 +122,7 @@ class C { // CHECK:STDOUT: } { // CHECK:STDOUT: %x.param: @C.as.GenericInterface.impl.F.%T (%T) = value_param call_param0 // CHECK:STDOUT: %T.ref: type = name_ref T, @C.as.GenericInterface.impl.%T.loc24_24.2 [symbolic = %T (constants.%T)] -// CHECK:STDOUT: %x: @C.as.GenericInterface.impl.F.%T (%T) = value_binding x, %x.param +// CHECK:STDOUT: %x: @C.as.GenericInterface.impl.F.%T (%T) = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %GenericInterface.impl_witness_table = impl_witness_table (), @C.as.GenericInterface.impl [concrete] // CHECK:STDOUT: %GenericInterface.impl_witness.loc24_56.1: = impl_witness %GenericInterface.impl_witness_table, @C.as.GenericInterface.impl(constants.%T) [symbolic = %GenericInterface.impl_witness.loc24_56.2 (constants.%GenericInterface.impl_witness)] diff --git a/toolchain/check/testdata/impl/fail_extend_undefined_interface.carbon b/toolchain/check/testdata/impl/fail_extend_undefined_interface.carbon index ba366df2f481..3b2f4e973f14 100644 --- a/toolchain/check/testdata/impl/fail_extend_undefined_interface.carbon +++ b/toolchain/check/testdata/impl/fail_extend_undefined_interface.carbon @@ -58,7 +58,7 @@ fn F(c: C) { // CHECK:STDOUT: } { // CHECK:STDOUT: %c.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc28: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %c: %C = value_binding c, %c.param +// CHECK:STDOUT: %c: %C = wrapper_binding c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/fail_impl_as_scope.carbon b/toolchain/check/testdata/impl/fail_impl_as_scope.carbon index 696248e635d2..898e9c272834 100644 --- a/toolchain/check/testdata/impl/fail_impl_as_scope.carbon +++ b/toolchain/check/testdata/impl/fail_impl_as_scope.carbon @@ -323,7 +323,7 @@ class X { // CHECK:STDOUT: %Self.as_type.loc5_13.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc5_13.1 (constants.%Self.as_type.0cf)] // CHECK:STDOUT: %.loc5_13.2: type = converted %Self.ref, %Self.as_type.loc5_13.2 [symbolic = %Self.as_type.loc5_13.1 (constants.%Self.as_type.0cf)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @Z.WithSelf.Method.%Self.as_type.loc5_13.1 (%Self.as_type.0cf) = value_binding self, %self.param +// CHECK:STDOUT: %self: @Z.WithSelf.Method.%Self.as_type.loc5_13.1 (%Self.as_type.0cf) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc1: %Z.assoc_type = assoc_entity element1, %Z.WithSelf.Method.decl [concrete = constants.%assoc1] // CHECK:STDOUT: impl_decl @.as.Z.impl [concrete] {} { @@ -361,7 +361,7 @@ class X { // CHECK:STDOUT: %Self.as_type.loc13_22.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc13_22.1 (constants.%Self.as_type.0cf)] // CHECK:STDOUT: %.loc13_22.2: type = converted %Self.ref, %Self.as_type.loc13_22.2 [symbolic = %Self.as_type.loc13_22.1 (constants.%Self.as_type.0cf)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @.as.Z.impl.Method.%Self.as_type.loc13_22.1 (%Self.as_type.0cf) = value_binding self, %self.param +// CHECK:STDOUT: %self: @.as.Z.impl.Method.%Self.as_type.loc13_22.1 (%Self.as_type.0cf) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -380,7 +380,7 @@ class X { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %Point = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Point [concrete = constants.%Point] -// CHECK:STDOUT: %self: %Point = value_binding self, %self.param +// CHECK:STDOUT: %self: %Point = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %Z.impl_witness_table = impl_witness_table (%Point.as.Z.impl.Zero.decl, %Point.as.Z.impl.Method.decl), @Point.as.Z.impl [concrete] // CHECK:STDOUT: %Z.impl_witness: = impl_witness %Z.impl_witness_table [concrete = constants.%Z.impl_witness] diff --git a/toolchain/check/testdata/impl/fail_impl_bad_assoc_fn.carbon b/toolchain/check/testdata/impl/fail_impl_bad_assoc_fn.carbon index 006f1e41e64b..9b75f0191808 100644 --- a/toolchain/check/testdata/impl/fail_impl_bad_assoc_fn.carbon +++ b/toolchain/check/testdata/impl/fail_impl_bad_assoc_fn.carbon @@ -551,10 +551,10 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %.loc103_44.2: Core.Form = init_form %.loc103_44.1 [concrete = constants.%.f34] // CHECK:STDOUT: %self.param: bool = value_param call_param0 // CHECK:STDOUT: %.loc103_26: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %self: bool = value_binding self, %self.param +// CHECK:STDOUT: %self: bool = wrapper_binding self, %self.param // CHECK:STDOUT: %b.param: bool = value_param call_param1 // CHECK:STDOUT: %.loc103_35: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %b: bool = value_binding b, %b.param +// CHECK:STDOUT: %b: bool = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -599,7 +599,7 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %.loc199_38.2: %tuple.type.24b = tuple_literal (%ptr.loc199_16.2, %struct_type.x.y.loc199_37.2) [symbolic = %tuple (constants.%tuple.b6a)] // CHECK:STDOUT: %.loc199_38.3: type = converted %.loc199_38.2, constants.%tuple.type.c49 [symbolic = %tuple.type (constants.%tuple.type.c49)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @SelfNested.WithSelf.F.%tuple.type (%tuple.type.c49) = value_binding x, %x.param +// CHECK:STDOUT: %x: @SelfNested.WithSelf.F.%tuple.type (%tuple.type.c49) = wrapper_binding x, %x.param // CHECK:STDOUT: %return.param: ref @SelfNested.WithSelf.F.%array_type.loc199_57.1 (%array_type.4e4) = out_param call_param1 // CHECK:STDOUT: %return: ref @SelfNested.WithSelf.F.%array_type.loc199_57.1 (%array_type.4e4) = return_slot %return.param // CHECK:STDOUT: } @@ -656,7 +656,7 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: } { // CHECK:STDOUT: %b.param: bool = value_param call_param0 // CHECK:STDOUT: %.loc69: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %b: bool = value_binding b, %b.param +// CHECK:STDOUT: %b: bool = wrapper_binding b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: %FExtraParam.as.I.impl.F.decl.loc69_18.2: %FExtraParam.as.I.impl.F.type.ec7b0b.2 = fn_decl @FExtraParam.as.I.impl.F.loc69_18.2 [concrete = constants.%FExtraParam.as.I.impl.F.ef9801.2] {} {} // CHECK:STDOUT: %I.impl_witness_table = impl_witness_table (%FExtraParam.as.I.impl.F.decl.loc69_18.2), @FExtraParam.as.I.impl [concrete] @@ -675,7 +675,7 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %FExtraImplicitParam = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%FExtraImplicitParam [concrete = constants.%FExtraImplicitParam] -// CHECK:STDOUT: %self: %FExtraImplicitParam = value_binding self, %self.param +// CHECK:STDOUT: %self: %FExtraImplicitParam = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %FExtraImplicitParam.as.I.impl.F.decl.loc85_15.2: %FExtraImplicitParam.as.I.impl.F.type.54cac2.2 = fn_decl @FExtraImplicitParam.as.I.impl.F.loc85_15.2 [concrete = constants.%FExtraImplicitParam.as.I.impl.F.a42f35.2] {} {} // CHECK:STDOUT: %I.impl_witness_table = impl_witness_table (%FExtraImplicitParam.as.I.impl.F.decl.loc85_15.2), @FExtraImplicitParam.as.I.impl [concrete] @@ -717,7 +717,7 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %.loc117_25.2: Core.Form = init_form %.loc117_25.1 [concrete = constants.%.f34] // CHECK:STDOUT: %self.param: bool = value_param call_param0 // CHECK:STDOUT: %.loc117_16: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %self: bool = value_binding self, %self.param +// CHECK:STDOUT: %self: bool = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param1 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -731,9 +731,9 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %.3: %pattern_type.831 = specific_constant constants.%return.patt.c0c, @J.WithSelf.F(constants.%J.facet.d77) [concrete = constants.%return.patt.c0c] // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: bool = value_param call_param0 -// CHECK:STDOUT: %self: bool = value_binding self, %self.param +// CHECK:STDOUT: %self: bool = wrapper_binding self, %self.param // CHECK:STDOUT: %b.param: bool = value_param call_param1 -// CHECK:STDOUT: %b: bool = value_binding b, %b.param +// CHECK:STDOUT: %b: bool = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -757,7 +757,7 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %.loc130_22.2: Core.Form = init_form %.loc130_22.1 [concrete = constants.%.f34] // CHECK:STDOUT: %b.param: bool = value_param call_param0 // CHECK:STDOUT: %.loc130_13: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %b: bool = value_binding b, %b.param +// CHECK:STDOUT: %b: bool = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param1 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -771,9 +771,9 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %.3: %pattern_type.831 = specific_constant constants.%return.patt.c0c, @J.WithSelf.F(constants.%J.facet.3f0) [concrete = constants.%return.patt.c0c] // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: bool = value_param call_param0 -// CHECK:STDOUT: %self: bool = value_binding self, %self.param +// CHECK:STDOUT: %self: bool = wrapper_binding self, %self.param // CHECK:STDOUT: %b.param: bool = value_param call_param1 -// CHECK:STDOUT: %b: bool = value_binding b, %b.param +// CHECK:STDOUT: %b: bool = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -795,10 +795,10 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: bool = value_param call_param0 // CHECK:STDOUT: %.loc148_16: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %self: bool = value_binding self, %self.param +// CHECK:STDOUT: %self: bool = wrapper_binding self, %self.param // CHECK:STDOUT: %b.param: bool = value_param call_param1 // CHECK:STDOUT: %.loc148_25: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %b: bool = value_binding b, %b.param +// CHECK:STDOUT: %b: bool = wrapper_binding b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: %.loc103_44.1: type = specific_constant @J.WithSelf.F.%.loc103_44.1, @J.WithSelf.F(constants.%J.facet.c42) [concrete = bool] // CHECK:STDOUT: %.loc103_44.2: Core.Form = specific_constant @J.WithSelf.F.%.loc103_44.2, @J.WithSelf.F(constants.%J.facet.c42) [concrete = constants.%.f34] @@ -810,9 +810,9 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %.3: %pattern_type.831 = specific_constant constants.%return.patt.c0c, @J.WithSelf.F(constants.%J.facet.c42) [concrete = constants.%return.patt.c0c] // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: bool = value_param call_param0 -// CHECK:STDOUT: %self: bool = value_binding self, %self.param +// CHECK:STDOUT: %self: bool = wrapper_binding self, %self.param // CHECK:STDOUT: %b.param: bool = value_param call_param1 -// CHECK:STDOUT: %b: bool = value_binding b, %b.param +// CHECK:STDOUT: %b: bool = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -838,10 +838,10 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %.loc163_34.2: Core.Form = init_form %.loc163_34.1 [concrete = constants.%.f34] // CHECK:STDOUT: %self.param: bool = value_param call_param0 // CHECK:STDOUT: %.loc163_16: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %self: bool = value_binding self, %self.param +// CHECK:STDOUT: %self: bool = wrapper_binding self, %self.param // CHECK:STDOUT: %b.param: %FDifferentParamType = value_param call_param1 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%FDifferentParamType [concrete = constants.%FDifferentParamType] -// CHECK:STDOUT: %b: %FDifferentParamType = value_binding b, %b.param +// CHECK:STDOUT: %b: %FDifferentParamType = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -855,9 +855,9 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %.3: %pattern_type.831 = specific_constant constants.%return.patt.c0c, @J.WithSelf.F(constants.%J.facet.47a) [concrete = constants.%return.patt.c0c] // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: bool = value_param call_param0 -// CHECK:STDOUT: %self: bool = value_binding self, %self.param +// CHECK:STDOUT: %self: bool = wrapper_binding self, %self.param // CHECK:STDOUT: %b.param: bool = value_param call_param1 -// CHECK:STDOUT: %b: bool = value_binding b, %b.param +// CHECK:STDOUT: %b: bool = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -883,10 +883,10 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %.loc176_28.2: Core.Form = init_form %.loc176_28.1 [concrete = constants.%.f34] // CHECK:STDOUT: %self.param: %FDifferentImplicitParamType = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%FDifferentImplicitParamType [concrete = constants.%FDifferentImplicitParamType] -// CHECK:STDOUT: %self: %FDifferentImplicitParamType = value_binding self, %self.param +// CHECK:STDOUT: %self: %FDifferentImplicitParamType = wrapper_binding self, %self.param // CHECK:STDOUT: %b.param: bool = value_param call_param1 // CHECK:STDOUT: %.loc176_19: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %b: bool = value_binding b, %b.param +// CHECK:STDOUT: %b: bool = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -900,9 +900,9 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %.3: %pattern_type.831 = specific_constant constants.%return.patt.c0c, @J.WithSelf.F(constants.%J.facet.929) [concrete = constants.%return.patt.c0c] // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: bool = value_param call_param0 -// CHECK:STDOUT: %self: bool = value_binding self, %self.param +// CHECK:STDOUT: %self: bool = wrapper_binding self, %self.param // CHECK:STDOUT: %b.param: bool = value_param call_param1 -// CHECK:STDOUT: %b: bool = value_binding b, %b.param +// CHECK:STDOUT: %b: bool = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -928,10 +928,10 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %.loc194_34: Core.Form = init_form %Self.ref [concrete = constants.%.1f5] // CHECK:STDOUT: %self.param: bool = value_param call_param0 // CHECK:STDOUT: %.loc194_16: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %self: bool = value_binding self, %self.param +// CHECK:STDOUT: %self: bool = wrapper_binding self, %self.param // CHECK:STDOUT: %b.param: bool = value_param call_param1 // CHECK:STDOUT: %.loc194_25: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %b: bool = value_binding b, %b.param +// CHECK:STDOUT: %b: bool = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref %FDifferentReturnType = out_param call_param2 // CHECK:STDOUT: %return: ref %FDifferentReturnType = return_slot %return.param // CHECK:STDOUT: } @@ -945,9 +945,9 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %.3: %pattern_type.831 = specific_constant constants.%return.patt.c0c, @J.WithSelf.F(constants.%J.facet.b85) [concrete = constants.%return.patt.c0c] // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: bool = value_param call_param0 -// CHECK:STDOUT: %self: bool = value_binding self, %self.param +// CHECK:STDOUT: %self: bool = wrapper_binding self, %self.param // CHECK:STDOUT: %b.param: bool = value_param call_param1 -// CHECK:STDOUT: %b: bool = value_binding b, %b.param +// CHECK:STDOUT: %b: bool = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -981,7 +981,7 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %.loc211_53.2: %tuple.type.24b = tuple_literal (%ptr, %struct_type.x.y) [concrete = constants.%tuple.991] // CHECK:STDOUT: %.loc211_53.3: type = converted %.loc211_53.2, constants.%tuple.type.e57 [concrete = constants.%tuple.type.e57] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %tuple.type.e57 = value_binding x, %x.param +// CHECK:STDOUT: %x: %tuple.type.e57 = wrapper_binding x, %x.param // CHECK:STDOUT: %return.param: ref %array_type.291 = out_param call_param1 // CHECK:STDOUT: %return: ref %array_type.291 = return_slot %return.param // CHECK:STDOUT: } @@ -993,7 +993,7 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %.2: %pattern_type.3a0 = specific_constant constants.%return.patt.98a, @SelfNested.WithSelf.F(constants.%SelfNested.facet.fc6) [concrete = constants.%return.patt.98a] // CHECK:STDOUT: } { // CHECK:STDOUT: %x.param: %tuple.type.9ab = value_param call_param0 -// CHECK:STDOUT: %x: %tuple.type.9ab = value_binding x, %x.param +// CHECK:STDOUT: %x: %tuple.type.9ab = wrapper_binding x, %x.param // CHECK:STDOUT: %return.param: ref %array_type.291 = out_param call_param1 // CHECK:STDOUT: %return: ref %array_type.291 = return_slot %return.param // CHECK:STDOUT: } @@ -1028,7 +1028,7 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %.loc227_78.2: %tuple.type.24b = tuple_literal (%ptr, %struct_type.x.y) [concrete = constants.%tuple.96d] // CHECK:STDOUT: %.loc227_78.3: type = converted %.loc227_78.2, constants.%tuple.type.829 [concrete = constants.%tuple.type.829] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %tuple.type.829 = value_binding x, %x.param +// CHECK:STDOUT: %x: %tuple.type.829 = wrapper_binding x, %x.param // CHECK:STDOUT: %return.param: ref %array_type.291 = out_param call_param1 // CHECK:STDOUT: %return: ref %array_type.291 = return_slot %return.param // CHECK:STDOUT: } @@ -1040,7 +1040,7 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %.2: %pattern_type.f0d = specific_constant constants.%return.patt.3c4, @SelfNested.WithSelf.F(constants.%SelfNested.facet.68c) [concrete = constants.%return.patt.3c4] // CHECK:STDOUT: } { // CHECK:STDOUT: %x.param: %tuple.type.829 = value_param call_param0 -// CHECK:STDOUT: %x: %tuple.type.829 = value_binding x, %x.param +// CHECK:STDOUT: %x: %tuple.type.829 = wrapper_binding x, %x.param // CHECK:STDOUT: %return.param: ref %array_type.a08 = out_param call_param1 // CHECK:STDOUT: %return: ref %array_type.a08 = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/fail_self_type_mismatch.carbon b/toolchain/check/testdata/impl/fail_self_type_mismatch.carbon index d9a039a282e6..a47994eff707 100644 --- a/toolchain/check/testdata/impl/fail_self_type_mismatch.carbon +++ b/toolchain/check/testdata/impl/fail_self_type_mismatch.carbon @@ -177,7 +177,7 @@ impl i32 as I { // CHECK:STDOUT: %Self.ref: %I.type = name_ref Self, @I.%Self [symbolic = %Self (constants.%Self.37e)] // CHECK:STDOUT: %C.loc21_17.2: type = class_type @C, @C(constants.%I.type, constants.%Self.37e) [symbolic = %C.loc21_17.1 (constants.%C.a21)] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: @I.WithSelf.F.%C.loc21_17.1 (%C.a21) = value_binding c, %c.param +// CHECK:STDOUT: %c: @I.WithSelf.F.%C.loc21_17.1 (%C.a21) = wrapper_binding c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0: %I.assoc_type = assoc_entity element0, %I.WithSelf.F.decl [concrete = constants.%assoc0.6c9] // CHECK:STDOUT: @@ -206,7 +206,7 @@ impl i32 as I { // CHECK:STDOUT: %.loc28_18: %I.type = converted %.loc28_13, %I.facet [concrete = constants.%I.facet.11c] // CHECK:STDOUT: %C: type = class_type @C, @C(constants.%I.type, constants.%I.facet.11c) [concrete = constants.%C.071] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %C.071 = value_binding c, %c.param +// CHECK:STDOUT: %c: %C.071 = wrapper_binding c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: %I.impl_witness_table = impl_witness_table (%bool.as.I.impl.F.decl), @bool.as.I.impl [concrete] // CHECK:STDOUT: %I.impl_witness: = impl_witness %I.impl_witness_table [concrete = constants.%I.impl_witness.020] @@ -230,14 +230,14 @@ impl i32 as I { // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %C: type = class_type @C, @C(type, constants.%i32) [concrete = constants.%C.8dc] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %C.8dc = value_binding c, %c.param +// CHECK:STDOUT: %c: %C.8dc = wrapper_binding c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: %i32.as.I.impl.F.decl.loc39_18.2: %i32.as.I.impl.F.type.48cdab.2 = fn_decl @i32.as.I.impl.F.loc39_18.2 [concrete = constants.%i32.as.I.impl.F.bd5be1.2] { // CHECK:STDOUT: %.1: %pattern_type.b7c = specific_constant constants.%c.param_patt.fb1, @I.WithSelf.F(constants.%I.facet.858) [concrete = constants.%c.param_patt.fb1] // CHECK:STDOUT: %c.patt: %pattern_type.b7c = at_binding_pattern c, %.1 [concrete = constants.%c.patt.d03] // CHECK:STDOUT: } { // CHECK:STDOUT: %c.param: %C.efa = value_param call_param0 -// CHECK:STDOUT: %c: %C.efa = value_binding c, %c.param +// CHECK:STDOUT: %c: %C.efa = wrapper_binding c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: %I.impl_witness_table = impl_witness_table (%i32.as.I.impl.F.decl.loc39_18.2), @i32.as.I.impl [concrete] // CHECK:STDOUT: %I.impl_witness: = impl_witness %I.impl_witness_table [concrete = constants.%I.impl_witness.903] diff --git a/toolchain/check/testdata/impl/forward_decls.carbon b/toolchain/check/testdata/impl/forward_decls.carbon index eddb3c688c31..f7bd66087a30 100644 --- a/toolchain/check/testdata/impl/forward_decls.carbon +++ b/toolchain/check/testdata/impl/forward_decls.carbon @@ -666,7 +666,7 @@ impl C as Y {} // CHECK:STDOUT: %.loc9_9.2: %I.type = converted %C.ref, %I.facet [concrete = constants.%I.facet] // CHECK:STDOUT: %impl.elem0: type = impl_witness_access constants.%I.impl_witness, element0 [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %empty_tuple.type = value_binding x, %.loc9_19 +// CHECK:STDOUT: %x: %empty_tuple.type = wrapper_binding x, %.loc9_19 // CHECK:STDOUT: impl_decl @C.as.I.impl [concrete] {} { // CHECK:STDOUT: %C.ref.loc11: type = name_ref C, file.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %I.ref.loc11: type = name_ref I, file.%I.decl [concrete = constants.%I.type] @@ -809,7 +809,7 @@ impl C as Y {} // CHECK:STDOUT: %T.ref: %I.assoc_type = name_ref T, @T.%assoc0 [concrete = constants.%assoc0] // CHECK:STDOUT: %impl.elem0: type = impl_witness_access constants.%I.impl_witness, element0 [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %empty_tuple.type = value_binding x, %.loc9_22 +// CHECK:STDOUT: %x: %empty_tuple.type = wrapper_binding x, %.loc9_22 // CHECK:STDOUT: impl_decl @C.as.I.impl [concrete] {} { // CHECK:STDOUT: %C.ref.loc11: type = name_ref C, file.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %I.ref.loc11: type = name_ref I, file.%I.decl [concrete = constants.%I.type] @@ -931,7 +931,7 @@ impl C as Y {} // CHECK:STDOUT: %T.ref: %I.assoc_type = name_ref T, @T.%assoc0 [concrete = constants.%assoc0] // CHECK:STDOUT: %impl.elem0: type = impl_witness_access constants.%I.impl_witness, element0 [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: = value_binding x, [concrete = ] +// CHECK:STDOUT: %x: = wrapper_binding x, [concrete = ] // CHECK:STDOUT: impl_decl @C.as.I.impl [concrete] {} { // CHECK:STDOUT: %C.ref.loc22: type = name_ref C, file.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %I.ref.loc22: type = name_ref I, file.%I.decl [concrete = constants.%I.type] @@ -1345,7 +1345,7 @@ impl C as Y {} // CHECK:STDOUT: %.loc8_12.2: %I.type = converted %D.ref.loc8, %I.facet.loc8 [concrete = constants.%I.facet] // CHECK:STDOUT: %C.loc8: type = class_type @C, @C(constants.%I.facet) [concrete = constants.%C.fd5] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.loc8: %C.fd5 = value_binding x, %x.param.loc8 +// CHECK:STDOUT: %x.loc8: %C.fd5 = wrapper_binding x, %x.param.loc8 // CHECK:STDOUT: } // CHECK:STDOUT: %I.decl.loc10: type = interface_decl @I [concrete = constants.%I.type] {} {} // CHECK:STDOUT: impl_decl @D.as.I.impl [concrete] {} { @@ -1373,7 +1373,7 @@ impl C as Y {} // CHECK:STDOUT: %.loc14_19.2: %I.type = converted %D.ref.loc14, %I.facet.loc14 [concrete = constants.%I.facet] // CHECK:STDOUT: %C.loc14: type = class_type @C, @C(constants.%I.facet) [concrete = constants.%C.fd5] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.loc14: %C.fd5 = value_binding x, %x.param.loc14 +// CHECK:STDOUT: %x.loc14: %C.fd5 = wrapper_binding x, %x.param.loc14 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1739,7 +1739,7 @@ impl C as Y {} // CHECK:STDOUT: %U.as_type.loc7_16.2: type = facet_access_type %U.ref.loc7 [symbolic = %U.as_type.loc7_16.1 (constants.%U.as_type)] // CHECK:STDOUT: %.loc7_16.2: type = converted %U.ref.loc7, %U.as_type.loc7_16.2 [symbolic = %U.as_type.loc7_16.1 (constants.%U.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %u.loc7: @G.%U.as_type.loc7_16.1 (%U.as_type) = value_binding u, %u.param.loc7 +// CHECK:STDOUT: %u.loc7: @G.%U.as_type.loc7_16.1 (%U.as_type) = wrapper_binding u, %u.param.loc7 // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl.loc9: type = class_decl @C [concrete = constants.%C] {} {} // CHECK:STDOUT: impl_decl @C.as.X.impl [concrete] {} { @@ -1755,7 +1755,7 @@ impl C as Y {} // CHECK:STDOUT: } { // CHECK:STDOUT: %c.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc25: type = name_ref C, file.%C.decl.loc9 [concrete = constants.%C] -// CHECK:STDOUT: %c: %C = value_binding c, %c.param +// CHECK:STDOUT: %c: %C = wrapper_binding c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: %Y.decl.loc33: type = interface_decl @Y [concrete = constants.%Y.type] {} {} // CHECK:STDOUT: %F.decl.loc34: %F.type = fn_decl @F [concrete = constants.%F] { @@ -1783,7 +1783,7 @@ impl C as Y {} // CHECK:STDOUT: %U.as_type.loc35: type = facet_access_type %U.ref.loc35 [symbolic = %U.as_type.loc7_16.1 (constants.%U.as_type)] // CHECK:STDOUT: %.loc35_23.2: type = converted %U.ref.loc35, %U.as_type.loc35 [symbolic = %U.as_type.loc7_16.1 (constants.%U.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %u.loc35: @G.%U.as_type.loc7_16.1 (%U.as_type) = value_binding u, %u.param.loc35 +// CHECK:STDOUT: %u.loc35: @G.%U.as_type.loc7_16.1 (%U.as_type) = wrapper_binding u, %u.param.loc35 // CHECK:STDOUT: } // CHECK:STDOUT: impl_decl @C.as.Y.impl [concrete] {} { // CHECK:STDOUT: %C.ref.loc36: type = name_ref C, file.%C.decl.loc9 [concrete = constants.%C] diff --git a/toolchain/check/testdata/impl/impl_as.carbon b/toolchain/check/testdata/impl/impl_as.carbon index 3c31f2383dfd..8921fe2a365d 100644 --- a/toolchain/check/testdata/impl/impl_as.carbon +++ b/toolchain/check/testdata/impl/impl_as.carbon @@ -133,7 +133,7 @@ class C { // CHECK:STDOUT: %.loc23_7: init %C = converted %.loc23_26.1, %.loc23_26.2 [concrete = constants.%C.val] // CHECK:STDOUT: assign %c.var, %.loc23_7 // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %c.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%c.var) // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/impl/impl_thunk.carbon b/toolchain/check/testdata/impl/impl_thunk.carbon index 605fa9029626..809d946b5428 100644 --- a/toolchain/check/testdata/impl/impl_thunk.carbon +++ b/toolchain/check/testdata/impl/impl_thunk.carbon @@ -397,7 +397,7 @@ impl () as I({}) { // CHECK:STDOUT: %.loc10_25.2: type = converted %.loc10_25.1, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: %struct_type.b.a: type = struct_type {.b: %empty_struct_type, .a: %empty_tuple.type} [concrete = constants.%struct_type.b.a.40c] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: %struct_type.b.a.40c = value_binding y, %y.param +// CHECK:STDOUT: %y: %struct_type.b.a.40c = wrapper_binding y, %y.param // CHECK:STDOUT: %return.param: ref %struct_type.d.c.b36 = out_param call_param1 // CHECK:STDOUT: %return: ref %struct_type.d.c.b36 = return_slot %return.param // CHECK:STDOUT: } @@ -508,13 +508,13 @@ impl () as I({}) { // CHECK:STDOUT: %.loc14_36: Core.Form = init_form %ptr.loc14_36 [concrete = constants.%.8fa] // CHECK:STDOUT: %self.param: ref %A = ref_param call_param0 // CHECK:STDOUT: %A.ref.loc14_18: type = name_ref A, file.%A.decl [concrete = constants.%A] -// CHECK:STDOUT: %self: ref %A = ref_binding self, %self.param +// CHECK:STDOUT: %self: ref %A = wrapper_binding self, %self.param // CHECK:STDOUT: %other.param: %ptr.d43 = value_param call_param1 // CHECK:STDOUT: %.loc14_29: type = splice_block %ptr.loc14_29 [concrete = constants.%ptr.d43] { // CHECK:STDOUT: %A.ref.loc14_28: type = name_ref A, file.%A.decl [concrete = constants.%A] // CHECK:STDOUT: %ptr.loc14_29: type = ptr_type %A.ref.loc14_28 [concrete = constants.%ptr.d43] // CHECK:STDOUT: } -// CHECK:STDOUT: %other: %ptr.d43 = value_binding other, %other.param +// CHECK:STDOUT: %other: %ptr.d43 = wrapper_binding other, %other.param // CHECK:STDOUT: %return.param: ref %ptr.6b6 = out_param call_param2 // CHECK:STDOUT: %return: ref %ptr.6b6 = return_slot %return.param // CHECK:STDOUT: } @@ -585,10 +585,10 @@ impl () as I({}) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %A = value_param call_param0 // CHECK:STDOUT: %A.ref.loc13_14: type = name_ref A, file.%A.decl [concrete = constants.%A] -// CHECK:STDOUT: %self: %A = value_binding self, %self.param +// CHECK:STDOUT: %self: %A = wrapper_binding self, %self.param // CHECK:STDOUT: %other.param: %A = value_param call_param1 // CHECK:STDOUT: %A.ref.loc13_24: type = name_ref A, file.%A.decl [concrete = constants.%A] -// CHECK:STDOUT: %other: %A = value_binding other, %other.param +// CHECK:STDOUT: %other: %A = wrapper_binding other, %other.param // CHECK:STDOUT: } // CHECK:STDOUT: %B.as.X.impl.F.decl.loc13_26.2: %B.as.X.impl.F.type.48cdab.2 = fn_decl @B.as.X.impl.F.loc13_26.2 [concrete = constants.%B.as.X.impl.F.bd5be1.2] { // CHECK:STDOUT: @@ -673,13 +673,13 @@ impl () as I({}) { // CHECK:STDOUT: %.loc14_36: Core.Form = init_form %ptr.loc14_36 [concrete = constants.%.8fa] // CHECK:STDOUT: %self.param: ref %A = ref_param call_param0 // CHECK:STDOUT: %A.ref.loc14_18: type = name_ref A, file.%A.decl [concrete = constants.%A] -// CHECK:STDOUT: %self: ref %A = ref_binding self, %self.param +// CHECK:STDOUT: %self: ref %A = wrapper_binding self, %self.param // CHECK:STDOUT: %other.param: %ptr.d43 = value_param call_param1 // CHECK:STDOUT: %.loc14_29: type = splice_block %ptr.loc14_29 [concrete = constants.%ptr.d43] { // CHECK:STDOUT: %A.ref.loc14_28: type = name_ref A, file.%A.decl [concrete = constants.%A] // CHECK:STDOUT: %ptr.loc14_29: type = ptr_type %A.ref.loc14_28 [concrete = constants.%ptr.d43] // CHECK:STDOUT: } -// CHECK:STDOUT: %other: %ptr.d43 = value_binding other, %other.param +// CHECK:STDOUT: %other: %ptr.d43 = wrapper_binding other, %other.param // CHECK:STDOUT: %return.param: ref %ptr.6b6 = out_param call_param2 // CHECK:STDOUT: %return: ref %ptr.6b6 = return_slot %return.param // CHECK:STDOUT: } @@ -779,13 +779,13 @@ impl () as I({}) { // CHECK:STDOUT: %.loc14_36: Core.Form = init_form %ptr.loc14_36 [concrete = constants.%.8fa] // CHECK:STDOUT: %self.param: ref %A = ref_param call_param0 // CHECK:STDOUT: %A.ref.loc14_18: type = name_ref A, file.%A.decl [concrete = constants.%A] -// CHECK:STDOUT: %self: ref %A = ref_binding self, %self.param +// CHECK:STDOUT: %self: ref %A = wrapper_binding self, %self.param // CHECK:STDOUT: %other.param: %ptr.d43 = value_param call_param1 // CHECK:STDOUT: %.loc14_29: type = splice_block %ptr.loc14_29 [concrete = constants.%ptr.d43] { // CHECK:STDOUT: %A.ref.loc14_28: type = name_ref A, file.%A.decl [concrete = constants.%A] // CHECK:STDOUT: %ptr.loc14_29: type = ptr_type %A.ref.loc14_28 [concrete = constants.%ptr.d43] // CHECK:STDOUT: } -// CHECK:STDOUT: %other: %ptr.d43 = value_binding other, %other.param +// CHECK:STDOUT: %other: %ptr.d43 = wrapper_binding other, %other.param // CHECK:STDOUT: %return.param: ref %ptr.6b6 = out_param call_param2 // CHECK:STDOUT: %return: ref %ptr.6b6 = return_slot %return.param // CHECK:STDOUT: } @@ -856,10 +856,10 @@ impl () as I({}) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %A = value_param call_param0 // CHECK:STDOUT: %A.ref.loc13_14: type = name_ref A, file.%A.decl [concrete = constants.%A] -// CHECK:STDOUT: %self: %A = value_binding self, %self.param +// CHECK:STDOUT: %self: %A = wrapper_binding self, %self.param // CHECK:STDOUT: %other.param: ref %A = ref_param call_param1 // CHECK:STDOUT: %A.ref.loc13_28: type = name_ref A, file.%A.decl [concrete = constants.%A] -// CHECK:STDOUT: %other: ref %A = ref_binding other, %other.param +// CHECK:STDOUT: %other: ref %A = wrapper_binding other, %other.param // CHECK:STDOUT: } // CHECK:STDOUT: %B.as.X.impl.F.decl.loc13_30.2: %B.as.X.impl.F.type.48cdab.2 = fn_decl @B.as.X.impl.F.loc13_30.2 [concrete = constants.%B.as.X.impl.F.bd5be1.2] { // CHECK:STDOUT: @@ -924,7 +924,7 @@ impl () as I({}) { // CHECK:STDOUT: %.loc11_19.2: Core.Form = ref_form %.loc11_24.2 [concrete = constants.%.9f9] // CHECK:STDOUT: %.loc11_19.3: type = type_component_of %.loc11_19.2 [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %empty_tuple.type = ref_binding x, %x.param +// CHECK:STDOUT: %x: ref %empty_tuple.type = wrapper_binding x, %x.param // CHECK:STDOUT: %y.param: %struct_type.b.a = value_param call_param1 // CHECK:STDOUT: %.loc11_46: type = splice_block %struct_type.b.a [concrete = constants.%struct_type.b.a] { // CHECK:STDOUT: %.loc11_37.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] @@ -933,7 +933,7 @@ impl () as I({}) { // CHECK:STDOUT: %.loc11_45.2: type = converted %.loc11_45.1, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: %struct_type.b.a: type = struct_type {.b: %empty_tuple.type, .a: %empty_tuple.type} [concrete = constants.%struct_type.b.a] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: %struct_type.b.a = value_binding y, %y.param +// CHECK:STDOUT: %y: %struct_type.b.a = wrapper_binding y, %y.param // CHECK:STDOUT: } // CHECK:STDOUT: %C.as.I.impl.F.decl.loc11_48.2: %C.as.I.impl.F.type.a24f58.2 = fn_decl @C.as.I.impl.F.loc11_48.2 [concrete = constants.%C.as.I.impl.F.4c1488.2] { // CHECK:STDOUT: @@ -1122,7 +1122,7 @@ impl () as I({}) { // CHECK:STDOUT: %U.as_type.loc10_26.2: type = facet_access_type %U.ref.loc10_26 [symbolic = %U.as_type.loc10_26.1 (constants.%U.as_type.c1c)] // CHECK:STDOUT: %.loc10_26.2: type = converted %U.ref.loc10_26, %U.as_type.loc10_26.2 [symbolic = %U.as_type.loc10_26.1 (constants.%U.as_type.c1c)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @empty_tuple.type.as.I.impl.F.loc10_34.1.%U.as_type.loc10_26.1 (%U.as_type.c1c) = value_binding x, %x.param +// CHECK:STDOUT: %x: @empty_tuple.type.as.I.impl.F.loc10_34.1.%U.as_type.loc10_26.1 (%U.as_type.c1c) = wrapper_binding x, %x.param // CHECK:STDOUT: %return.param: ref @empty_tuple.type.as.I.impl.F.loc10_34.1.%U.as_type.loc10_26.1 (%U.as_type.c1c) = out_param call_param1 // CHECK:STDOUT: %return: ref @empty_tuple.type.as.I.impl.F.loc10_34.1.%U.as_type.loc10_26.1 (%U.as_type.c1c) = return_slot %return.param // CHECK:STDOUT: } @@ -1330,14 +1330,14 @@ impl () as I({}) { // CHECK:STDOUT: %.loc10_37.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc10_37.3: type = converted %.loc10_37.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: %empty_tuple.type = value_binding self, %self.param +// CHECK:STDOUT: %self: %empty_tuple.type = wrapper_binding self, %self.param // CHECK:STDOUT: %x.param: @empty_tuple.type.as.I.impl.F.loc10_51.1.%U.as_type.loc10_43.1 (%U.as_type.c1c) = value_param call_param1 // CHECK:STDOUT: %.loc10_43.1: type = splice_block %.loc10_43.2 [symbolic = %U.as_type.loc10_43.1 (constants.%U.as_type.c1c)] { // CHECK:STDOUT: %U.ref.loc10_43: %Copy.type = name_ref U, %U.loc10_9.2 [symbolic = %U.loc10_9.1 (constants.%U.f84)] // CHECK:STDOUT: %U.as_type.loc10_43.2: type = facet_access_type %U.ref.loc10_43 [symbolic = %U.as_type.loc10_43.1 (constants.%U.as_type.c1c)] // CHECK:STDOUT: %.loc10_43.2: type = converted %U.ref.loc10_43, %U.as_type.loc10_43.2 [symbolic = %U.as_type.loc10_43.1 (constants.%U.as_type.c1c)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @empty_tuple.type.as.I.impl.F.loc10_51.1.%U.as_type.loc10_43.1 (%U.as_type.c1c) = value_binding x, %x.param +// CHECK:STDOUT: %x: @empty_tuple.type.as.I.impl.F.loc10_51.1.%U.as_type.loc10_43.1 (%U.as_type.c1c) = wrapper_binding x, %x.param // CHECK:STDOUT: %return.param: ref @empty_tuple.type.as.I.impl.F.loc10_51.1.%U.as_type.loc10_43.1 (%U.as_type.c1c) = out_param call_param2 // CHECK:STDOUT: %return: ref @empty_tuple.type.as.I.impl.F.loc10_51.1.%U.as_type.loc10_43.1 (%U.as_type.c1c) = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/import_builtin_call.carbon b/toolchain/check/testdata/impl/import_builtin_call.carbon index c91fcffd27d4..0b96b3b223ab 100644 --- a/toolchain/check/testdata/impl/import_builtin_call.carbon +++ b/toolchain/check/testdata/impl/import_builtin_call.carbon @@ -157,7 +157,7 @@ var n: Int(64) = MakeFromClass(FromLiteral(64) as OtherInt); // CHECK:STDOUT: %.loc7_14.2: type = value_of_initializer %Int.call.loc7 [concrete = constants.%i64.builtin] // CHECK:STDOUT: %.loc7_14.3: type = converted %Int.call.loc7, %.loc7_14.2 [concrete = constants.%i64.builtin] // CHECK:STDOUT: } -// CHECK:STDOUT: %m: ref %i64.builtin = ref_binding m, %m.var [concrete = %m.var] +// CHECK:STDOUT: %m: ref %i64.builtin = wrapper_binding m, %m.var [concrete = %m.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %n.patt: %pattern_type.e13 = ref_binding_pattern n [concrete = constants.%n.patt.914] // CHECK:STDOUT: %n.var_patt: %pattern_type.e13 = var_pattern %n.patt [concrete = constants.%n.var_patt] @@ -170,7 +170,7 @@ var n: Int(64) = MakeFromClass(FromLiteral(64) as OtherInt); // CHECK:STDOUT: %.loc8_14.2: type = value_of_initializer %Int.call.loc8 [concrete = constants.%i64.builtin] // CHECK:STDOUT: %.loc8_14.3: type = converted %Int.call.loc8, %.loc8_14.2 [concrete = constants.%i64.builtin] // CHECK:STDOUT: } -// CHECK:STDOUT: %n: ref %i64.builtin = ref_binding n, %n.var [concrete = %n.var] +// CHECK:STDOUT: %n: ref %i64.builtin = wrapper_binding n, %n.var [concrete = %n.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/impl/import_compound.carbon b/toolchain/check/testdata/impl/import_compound.carbon index 0777c685dbf3..43b78a957c47 100644 --- a/toolchain/check/testdata/impl/import_compound.carbon +++ b/toolchain/check/testdata/impl/import_compound.carbon @@ -199,7 +199,7 @@ fn InstanceCallImportFail() { // CHECK:STDOUT: %Self.as_type.loc12_8.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc12_8.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc12_8.2: type = converted %Self.ref, %Self.as_type.loc12_8.2 [symbolic = %Self.as_type.loc12_8.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @Instance.WithSelf.G.%Self.as_type.loc12_8.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @Instance.WithSelf.G.%Self.as_type.loc12_8.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0: %Instance.assoc_type = assoc_entity element0, %Instance.WithSelf.G.decl [concrete = constants.%assoc0.94f] // CHECK:STDOUT: @@ -229,7 +229,7 @@ fn InstanceCallImportFail() { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %struct_type.i = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @struct_type.i.as.Instance.impl.%struct_type.i [concrete = constants.%struct_type.i] -// CHECK:STDOUT: %self: %struct_type.i = value_binding self, %self.param +// CHECK:STDOUT: %self: %struct_type.i = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %Instance.impl_witness_table = impl_witness_table (%struct_type.i.as.Instance.impl.G.decl), @struct_type.i.as.Instance.impl [concrete] // CHECK:STDOUT: %Instance.impl_witness: = impl_witness %Instance.impl_witness_table [concrete = constants.%Instance.impl_witness] @@ -472,7 +472,7 @@ fn InstanceCallImportFail() { // CHECK:STDOUT: %.loc5_39.2: type = converted %.loc5_39.1, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: %struct_type.i: type = struct_type {.i: %empty_tuple.type} [concrete = constants.%struct_type.i] // CHECK:STDOUT: } -// CHECK:STDOUT: %n: %struct_type.i = value_binding n, %n.param +// CHECK:STDOUT: %n: %struct_type.i = wrapper_binding n, %n.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -565,7 +565,7 @@ fn InstanceCallImportFail() { // CHECK:STDOUT: %struct_type.i: type = struct_type {.i: %empty_tuple.type} [concrete = constants.%struct_type.i] // CHECK:STDOUT: %ptr: type = ptr_type %struct_type.i [concrete = constants.%ptr] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr = value_binding p, %p.param +// CHECK:STDOUT: %p: %ptr = wrapper_binding p, %p.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -677,7 +677,7 @@ fn InstanceCallImportFail() { // CHECK:STDOUT: %.loc5_32.2: type = converted %.loc5_32.1, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: %struct_type.i: type = struct_type {.i: %empty_tuple.type} [concrete = constants.%struct_type.i] // CHECK:STDOUT: } -// CHECK:STDOUT: %n: %struct_type.i = value_binding n, %n.param +// CHECK:STDOUT: %n: %struct_type.i = wrapper_binding n, %n.param // CHECK:STDOUT: } // CHECK:STDOUT: %InstanceCallIndirectImport.decl: %InstanceCallIndirectImport.type = fn_decl @InstanceCallIndirectImport [concrete = constants.%InstanceCallIndirectImport] { // CHECK:STDOUT: %p.param_patt: %pattern_type.72c = value_param_pattern [concrete = constants.%p.param_patt] @@ -690,7 +690,7 @@ fn InstanceCallImportFail() { // CHECK:STDOUT: %struct_type.i: type = struct_type {.i: %empty_tuple.type} [concrete = constants.%struct_type.i] // CHECK:STDOUT: %ptr: type = ptr_type %struct_type.i [concrete = constants.%ptr] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr = value_binding p, %p.param +// CHECK:STDOUT: %p: %ptr = wrapper_binding p, %p.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/import_extend_impl.carbon b/toolchain/check/testdata/impl/import_extend_impl.carbon index aa1cab36e9e1..c014c2443462 100644 --- a/toolchain/check/testdata/impl/import_extend_impl.carbon +++ b/toolchain/check/testdata/impl/import_extend_impl.carbon @@ -196,7 +196,7 @@ fn G(c: C) { // CHECK:STDOUT: } { // CHECK:STDOUT: %c.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc6: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %c: %C = value_binding c, %c.param +// CHECK:STDOUT: %c: %C = wrapper_binding c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/import_self.carbon b/toolchain/check/testdata/impl/import_self.carbon index ffa6445efe76..84ce5d2dbc60 100644 --- a/toolchain/check/testdata/impl/import_self.carbon +++ b/toolchain/check/testdata/impl/import_self.carbon @@ -96,14 +96,14 @@ fn F(x: C, y: C) -> C { // CHECK:STDOUT: %Self.as_type.loc5_9.2: type = facet_access_type %Self.ref.loc5_9 [symbolic = %Self.as_type.loc5_9.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc5_9.2: type = converted %Self.ref.loc5_9, %Self.as_type.loc5_9.2 [symbolic = %Self.as_type.loc5_9.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @Add.WithSelf.Op.%Self.as_type.loc5_9.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @Add.WithSelf.Op.%Self.as_type.loc5_9.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: %other.param: @Add.WithSelf.Op.%Self.as_type.loc5_9.1 (%Self.as_type) = value_param call_param1 // CHECK:STDOUT: %.loc5_22.1: type = splice_block %.loc5_22.2 [symbolic = %Self.as_type.loc5_9.1 (constants.%Self.as_type)] { // CHECK:STDOUT: %Self.ref.loc5_22: %Add.type = name_ref Self, @Add.%Self [symbolic = %Self (constants.%Self)] // CHECK:STDOUT: %Self.as_type.loc5_22: type = facet_access_type %Self.ref.loc5_22 [symbolic = %Self.as_type.loc5_9.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc5_22.2: type = converted %Self.ref.loc5_22, %Self.as_type.loc5_22 [symbolic = %Self.as_type.loc5_9.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %other: @Add.WithSelf.Op.%Self.as_type.loc5_9.1 (%Self.as_type) = value_binding other, %other.param +// CHECK:STDOUT: %other: @Add.WithSelf.Op.%Self.as_type.loc5_9.1 (%Self.as_type) = wrapper_binding other, %other.param // CHECK:STDOUT: %return.param: ref @Add.WithSelf.Op.%Self.as_type.loc5_9.1 (%Self.as_type) = out_param call_param2 // CHECK:STDOUT: %return: ref @Add.WithSelf.Op.%Self.as_type.loc5_9.1 (%Self.as_type) = return_slot %return.param // CHECK:STDOUT: } @@ -233,10 +233,10 @@ fn F(x: C, y: C) -> C { // CHECK:STDOUT: %.loc12: Core.Form = init_form %C.ref.loc12_21 [concrete = constants.%.a44] // CHECK:STDOUT: %x.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc12_9: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %x: %C = value_binding x, %x.param +// CHECK:STDOUT: %x: %C = wrapper_binding x, %x.param // CHECK:STDOUT: %y.param: %C = value_param call_param1 // CHECK:STDOUT: %C.ref.loc12_15: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %y: %C = value_binding y, %y.param +// CHECK:STDOUT: %y: %C = wrapper_binding y, %y.param // CHECK:STDOUT: %return.param: ref %C = out_param call_param2 // CHECK:STDOUT: %return: ref %C = return_slot %return.param // CHECK:STDOUT: } @@ -265,10 +265,10 @@ fn F(x: C, y: C) -> C { // CHECK:STDOUT: %.loc9_45: Core.Form = init_form %Self.ref.loc9_45 [concrete = constants.%.a44] // CHECK:STDOUT: %self.param: %C = value_param call_param0 // CHECK:STDOUT: %Self.ref.loc9_16: type = name_ref Self, @C.as.Add.impl.%C.ref [concrete = constants.%C] -// CHECK:STDOUT: %self: %C = value_binding self, %self.param +// CHECK:STDOUT: %self: %C = wrapper_binding self, %self.param // CHECK:STDOUT: %other.param: %C = value_param call_param1 // CHECK:STDOUT: %Self.ref.loc9_36: type = name_ref Self, @C.as.Add.impl.%C.ref [concrete = constants.%C] -// CHECK:STDOUT: %other: %C = value_binding other, %other.param +// CHECK:STDOUT: %other: %C = wrapper_binding other, %other.param // CHECK:STDOUT: %return.param: ref %C = out_param call_param2 // CHECK:STDOUT: %return: ref %C = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/import_self_specific.carbon b/toolchain/check/testdata/impl/import_self_specific.carbon index 3feb99a1e56f..97b7cf2ba359 100644 --- a/toolchain/check/testdata/impl/import_self_specific.carbon +++ b/toolchain/check/testdata/impl/import_self_specific.carbon @@ -196,7 +196,7 @@ impl forall [N:! E] D(N) as I where .Assoc = () { // CHECK:STDOUT: %.loc24_18.3: %Z.type = converted %Assoc.ref, %Z.facet.loc24_18.2 [symbolic = %Z.facet.loc24_18.1 (constants.%Z.facet.4d3)] // CHECK:STDOUT: %C.loc24_18.2: type = class_type @C, @C(constants.%Z.facet.4d3) [symbolic = %C.loc24_18.1 (constants.%C.e8d)] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: @I.WithSelf.F.%C.loc24_18.1 (%C.e8d) = value_binding c, %c.param +// CHECK:STDOUT: %c: @I.WithSelf.F.%C.loc24_18.1 (%C.e8d) = wrapper_binding c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc1: %I.assoc_type = assoc_entity element1, %I.WithSelf.F.decl [concrete = constants.%assoc1] // CHECK:STDOUT: @@ -571,7 +571,7 @@ impl forall [N:! E] D(N) as I where .Assoc = () { // CHECK:STDOUT: %.loc21_22.2: %Z.type = converted %.loc21_21, %Z.facet [concrete = constants.%Z.facet.39d] // CHECK:STDOUT: %C: type = class_type @C, @C(constants.%Z.facet.39d) [concrete = constants.%C.00e] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %C.00e = value_binding c, %c.param +// CHECK:STDOUT: %c: %C.00e = wrapper_binding c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: %I.impl_witness_table = impl_witness_table (%impl_witness_assoc_constant, %D.as.I.impl.F.decl), @D.as.I.impl [concrete] // CHECK:STDOUT: %I.impl_witness.loc20_49.1: = impl_witness %I.impl_witness_table, @D.as.I.impl(constants.%N) [symbolic = %I.impl_witness.loc20_49.2 (constants.%I.impl_witness)] diff --git a/toolchain/check/testdata/impl/import_thunk.carbon b/toolchain/check/testdata/impl/import_thunk.carbon index 77d9ff8ce1c0..ed2f607a31fa 100644 --- a/toolchain/check/testdata/impl/import_thunk.carbon +++ b/toolchain/check/testdata/impl/import_thunk.carbon @@ -88,7 +88,7 @@ fn G() { // CHECK:STDOUT: %.loc5_12.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc5_12.3: type = converted %.loc5_12.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %empty_struct_type = value_binding x, %x.param +// CHECK:STDOUT: %x: %empty_struct_type = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0: %I.assoc_type = assoc_entity element0, %I.WithSelf.F.decl [concrete = constants.%assoc0] // CHECK:STDOUT: @@ -249,14 +249,14 @@ fn G() { // CHECK:STDOUT: %Y.ref: %empty_tuple.type = name_ref Y, @C.as.I.impl.%Y.loc7_15.2 [symbolic = %Y (constants.%Y)] // CHECK:STDOUT: %C.loc8_21.2: type = class_type @C, @C(constants.%Y) [symbolic = %C.loc8_21.1 (constants.%C.6b1ed7.2)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @C.as.I.impl.F.loc8_24.1.%C.loc8_21.1 (%C.6b1ed7.2) = value_binding x, %x.param +// CHECK:STDOUT: %x: @C.as.I.impl.F.loc8_24.1.%C.loc8_21.1 (%C.6b1ed7.2) = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %C.as.I.impl.F.decl.loc8_24.2: @C.as.I.impl.%C.as.I.impl.F.type.loc8_24.2 (%C.as.I.impl.F.type.9a27ec.2) = fn_decl @C.as.I.impl.F.loc8_24.2 [symbolic = @C.as.I.impl.%C.as.I.impl.F.loc8_24.2 (constants.%C.as.I.impl.F.84dd70.2)] { // CHECK:STDOUT: %.1: %pattern_type.a96 = specific_constant constants.%x.param_patt.c77, @I.WithSelf.F(constants.%I.facet) [concrete = constants.%x.param_patt.c77] // CHECK:STDOUT: %x.patt: %pattern_type.a96 = at_binding_pattern x, %.1 [concrete = constants.%x.patt.05f] // CHECK:STDOUT: } { // CHECK:STDOUT: %x.param: %empty_struct_type = value_param call_param0 -// CHECK:STDOUT: %x: %empty_struct_type = value_binding x, %x.param +// CHECK:STDOUT: %x: %empty_struct_type = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %I.impl_witness_table = impl_witness_table (%C.as.I.impl.F.decl.loc8_24.2), @C.as.I.impl [concrete] // CHECK:STDOUT: %I.impl_witness.loc7_32.1: = impl_witness %I.impl_witness_table, @C.as.I.impl(constants.%Y) [symbolic = %I.impl_witness.loc7_32.2 (constants.%I.impl_witness)] diff --git a/toolchain/check/testdata/impl/import_use_generic.carbon b/toolchain/check/testdata/impl/import_use_generic.carbon index 9e854b663eaa..a17a5a07bbf2 100644 --- a/toolchain/check/testdata/impl/import_use_generic.carbon +++ b/toolchain/check/testdata/impl/import_use_generic.carbon @@ -293,7 +293,7 @@ fn H() -> C({}).(I.F)() {} // CHECK:STDOUT: %.loc6_12.2: type = converted %.loc6_11, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: %C: type = class_type @C, @C(constants.%empty_struct_type) [concrete = constants.%C.d8e] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %C.d8e = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C.d8e = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [concrete = constants.%G] { // CHECK:STDOUT: %return.patt: = return_slot_pattern , [concrete = ] // CHECK:STDOUT: } { diff --git a/toolchain/check/testdata/impl/interface_args.carbon b/toolchain/check/testdata/impl/interface_args.carbon index 3b9cb33a2eeb..cf660c7639c9 100644 --- a/toolchain/check/testdata/impl/interface_args.carbon +++ b/toolchain/check/testdata/impl/interface_args.carbon @@ -177,7 +177,7 @@ fn InstanceC(a: A) -> C { // CHECK:STDOUT: %Self.as_type.loc4_14.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc4_14.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc4_14.3: type = converted %Self.ref, %Self.as_type.loc4_14.2 [symbolic = %Self.as_type.loc4_14.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @ImplicitAs.WithSelf.Convert.%Self.as_type.loc4_14.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @ImplicitAs.WithSelf.Convert.%Self.as_type.loc4_14.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref @ImplicitAs.WithSelf.Convert.%Dest (%Dest) = out_param call_param1 // CHECK:STDOUT: %return: ref @ImplicitAs.WithSelf.Convert.%Dest (%Dest) = return_slot %return.param // CHECK:STDOUT: } @@ -320,7 +320,7 @@ fn InstanceC(a: A) -> C { // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %A = value_param call_param0 // CHECK:STDOUT: %A.ref: type = name_ref A, file.%A.decl [concrete = constants.%A] -// CHECK:STDOUT: %a: %A = value_binding a, %a.param +// CHECK:STDOUT: %a: %A = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -348,7 +348,7 @@ fn InstanceC(a: A) -> C { // CHECK:STDOUT: %Self.as_type.loc5_9.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc5_9.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc5_9.3: type = converted %Self.ref, %Self.as_type.loc5_9.2 [symbolic = %Self.as_type.loc5_9.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @Action.WithSelf.Op.%Self.as_type.loc5_9.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @Action.WithSelf.Op.%Self.as_type.loc5_9.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0.loc5_14.1: @Action.WithSelf.%Action.assoc_type (%Action.assoc_type.1c3) = assoc_entity element0, %Action.WithSelf.Op.decl [symbolic = %assoc0.loc5_14.2 (constants.%assoc0.26f)] // CHECK:STDOUT: @@ -368,7 +368,7 @@ fn InstanceC(a: A) -> C { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %A = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @A.as.Action.impl.%A.ref [concrete = constants.%A] -// CHECK:STDOUT: %self: %A = value_binding self, %self.param +// CHECK:STDOUT: %self: %A = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %Action.impl_witness_table = impl_witness_table (%A.as.Action.impl.Op.decl), @A.as.Action.impl [concrete] // CHECK:STDOUT: %Action.impl_witness: = impl_witness %Action.impl_witness_table [concrete = constants.%Action.impl_witness] @@ -585,7 +585,7 @@ fn InstanceC(a: A) -> C { // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %A = value_param call_param0 // CHECK:STDOUT: %A.ref: type = name_ref A, imports.%Main.A [concrete = constants.%A] -// CHECK:STDOUT: %a: %A = value_binding a, %a.param +// CHECK:STDOUT: %a: %A = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -792,7 +792,7 @@ fn InstanceC(a: A) -> C { // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %A = value_param call_param0 // CHECK:STDOUT: %A.ref: type = name_ref A, imports.%Main.A [concrete = constants.%A] -// CHECK:STDOUT: %a: %A = value_binding a, %a.param +// CHECK:STDOUT: %a: %A = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1042,7 +1042,7 @@ fn InstanceC(a: A) -> C { // CHECK:STDOUT: %Self.as_type.loc8_13.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc8_13.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc8_13.3: type = converted %Self.ref, %Self.as_type.loc8_13.2 [symbolic = %Self.as_type.loc8_13.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @Factory.WithSelf.Method.%Self.as_type.loc8_13.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @Factory.WithSelf.Method.%Self.as_type.loc8_13.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref @Factory.WithSelf.Method.%T (%T) = out_param call_param1 // CHECK:STDOUT: %return: ref @Factory.WithSelf.Method.%T (%T) = return_slot %return.param // CHECK:STDOUT: } @@ -1081,7 +1081,7 @@ fn InstanceC(a: A) -> C { // CHECK:STDOUT: %.loc16: Core.Form = init_form %B.ref [concrete = constants.%.d83] // CHECK:STDOUT: %self.param: %A = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @A.as.Factory.impl.%A.ref [concrete = constants.%A] -// CHECK:STDOUT: %self: %A = value_binding self, %self.param +// CHECK:STDOUT: %self: %A = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref %B = out_param call_param1 // CHECK:STDOUT: %return: ref %B = return_slot %return.param // CHECK:STDOUT: } @@ -1361,7 +1361,7 @@ fn InstanceC(a: A) -> C { // CHECK:STDOUT: %.loc7_23.2: Core.Form = init_form %B.ref.loc7 [concrete = constants.%.d83] // CHECK:STDOUT: %a.param: %A = value_param call_param0 // CHECK:STDOUT: %A.ref: type = name_ref A, imports.%Main.A [concrete = constants.%A] -// CHECK:STDOUT: %a: %A = value_binding a, %a.param +// CHECK:STDOUT: %a: %A = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref %B = out_param call_param1 // CHECK:STDOUT: %return: ref %B = return_slot %return.param // CHECK:STDOUT: } @@ -1657,7 +1657,7 @@ fn InstanceC(a: A) -> C { // CHECK:STDOUT: %.loc16: Core.Form = init_form %C.ref.loc16 [concrete = constants.%.a44] // CHECK:STDOUT: %a.param: %A = value_param call_param0 // CHECK:STDOUT: %A.ref: type = name_ref A, imports.%Main.A [concrete = constants.%A] -// CHECK:STDOUT: %a: %A = value_binding a, %a.param +// CHECK:STDOUT: %a: %A = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref %C = out_param call_param1 // CHECK:STDOUT: %return: ref %C = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/lookup/alias.carbon b/toolchain/check/testdata/impl/lookup/alias.carbon index ba6293792b1f..d89b13181bbb 100644 --- a/toolchain/check/testdata/impl/lookup/alias.carbon +++ b/toolchain/check/testdata/impl/lookup/alias.carbon @@ -74,7 +74,7 @@ fn G(c: C) { // CHECK:STDOUT: } { // CHECK:STDOUT: %c.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc27: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %c: %C = value_binding c, %c.param +// CHECK:STDOUT: %c: %C = wrapper_binding c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/lookup/canonical_query_self.carbon b/toolchain/check/testdata/impl/lookup/canonical_query_self.carbon index 45eadeed56c3..1481aaab7789 100644 --- a/toolchain/check/testdata/impl/lookup/canonical_query_self.carbon +++ b/toolchain/check/testdata/impl/lookup/canonical_query_self.carbon @@ -195,7 +195,7 @@ fn G() { // CHECK:STDOUT: %T.as_type.loc22_20.2: type = facet_access_type %T.ref.loc22 [symbolic = %T.as_type.loc22_20.1 (constants.%T.as_type)] // CHECK:STDOUT: %.loc22_20.2: type = converted %T.ref.loc22, %T.as_type.loc22_20.2 [symbolic = %T.as_type.loc22_20.1 (constants.%T.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %t: @F.%T.as_type.loc22_20.1 (%T.as_type) = value_binding t, %t.param +// CHECK:STDOUT: %t: @F.%T.as_type.loc22_20.1 (%T.as_type) = wrapper_binding t, %t.param // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [concrete = constants.%G] {} {} // CHECK:STDOUT: } @@ -215,7 +215,7 @@ fn G() { // CHECK:STDOUT: %Self.as_type.loc16_9.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc16_9.1 (constants.%Self.as_type.c84)] // CHECK:STDOUT: %.loc16_9.2: type = converted %Self.ref, %Self.as_type.loc16_9.2 [symbolic = %Self.as_type.loc16_9.1 (constants.%Self.as_type.c84)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @I.WithSelf.II.%Self.as_type.loc16_9.1 (%Self.as_type.c84) = value_binding self, %self.param +// CHECK:STDOUT: %self: @I.WithSelf.II.%Self.as_type.loc16_9.1 (%Self.as_type.c84) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0: %I.assoc_type = assoc_entity element0, %I.WithSelf.II.decl [concrete = constants.%assoc0.153] // CHECK:STDOUT: @@ -244,7 +244,7 @@ fn G() { // CHECK:STDOUT: %Self.as_type.loc19_9.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc19_9.1 (constants.%Self.as_type.976)] // CHECK:STDOUT: %.loc19_9.2: type = converted %Self.ref, %Self.as_type.loc19_9.2 [symbolic = %Self.as_type.loc19_9.1 (constants.%Self.as_type.976)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @J.WithSelf.JJ.%Self.as_type.loc19_9.1 (%Self.as_type.976) = value_binding self, %self.param +// CHECK:STDOUT: %self: @J.WithSelf.JJ.%Self.as_type.loc19_9.1 (%Self.as_type.976) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0: %J.assoc_type = assoc_entity element0, %J.WithSelf.JJ.decl [concrete = constants.%assoc0.7d8] // CHECK:STDOUT: @@ -263,7 +263,7 @@ fn G() { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %C = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%C [concrete = constants.%C] -// CHECK:STDOUT: %self: %C = value_binding self, %self.param +// CHECK:STDOUT: %self: %C = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %I.impl_witness_table = impl_witness_table (%C.as.I.impl.II.decl), @C.as.I.impl [concrete] // CHECK:STDOUT: %I.impl_witness: = impl_witness %I.impl_witness_table [concrete = constants.%I.impl_witness] @@ -281,7 +281,7 @@ fn G() { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %C = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%C [concrete = constants.%C] -// CHECK:STDOUT: %self: %C = value_binding self, %self.param +// CHECK:STDOUT: %self: %C = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %J.impl_witness_table = impl_witness_table (%C.as.J.impl.JJ.decl), @C.as.J.impl [concrete] // CHECK:STDOUT: %J.impl_witness: = impl_witness %J.impl_witness_table [concrete = constants.%J.impl_witness] diff --git a/toolchain/check/testdata/impl/lookup/fail_alias_impl_not_found.carbon b/toolchain/check/testdata/impl/lookup/fail_alias_impl_not_found.carbon index af38166f093d..95c2253140d5 100644 --- a/toolchain/check/testdata/impl/lookup/fail_alias_impl_not_found.carbon +++ b/toolchain/check/testdata/impl/lookup/fail_alias_impl_not_found.carbon @@ -66,7 +66,7 @@ fn F(c: C) { // CHECK:STDOUT: } { // CHECK:STDOUT: %c.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc23: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %c: %C = value_binding c, %c.param +// CHECK:STDOUT: %c: %C = wrapper_binding c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/lookup/generic.carbon b/toolchain/check/testdata/impl/lookup/generic.carbon index 69200dfeaee4..b281769f223d 100644 --- a/toolchain/check/testdata/impl/lookup/generic.carbon +++ b/toolchain/check/testdata/impl/lookup/generic.carbon @@ -212,7 +212,7 @@ fn G(x: A) { // CHECK:STDOUT: %.loc12_10.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc12_10.3: type = converted %.loc12_10.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %empty_struct_type = value_binding x, %x.param +// CHECK:STDOUT: %x: %empty_struct_type = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -231,7 +231,7 @@ fn G(x: A) { // CHECK:STDOUT: %Self.as_type.loc5_8.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc5_8.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc5_8.2: type = converted %Self.ref, %Self.as_type.loc5_8.2 [symbolic = %Self.as_type.loc5_8.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @HasF.WithSelf.F.%Self.as_type.loc5_8.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @HasF.WithSelf.F.%Self.as_type.loc5_8.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0: %HasF.assoc_type = assoc_entity element0, %HasF.WithSelf.F.decl [concrete = constants.%assoc0] // CHECK:STDOUT: @@ -259,7 +259,7 @@ fn G(x: A) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: @T.as.HasF.impl.F.%T (%T) = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @T.as.HasF.impl.%T.ref [symbolic = %T (constants.%T)] -// CHECK:STDOUT: %self: @T.as.HasF.impl.F.%T (%T) = value_binding self, %self.param +// CHECK:STDOUT: %self: @T.as.HasF.impl.F.%T (%T) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %HasF.impl_witness_table = impl_witness_table (%T.as.HasF.impl.F.decl), @T.as.HasF.impl [concrete] // CHECK:STDOUT: %HasF.impl_witness.loc8_34.1: = impl_witness %HasF.impl_witness_table, @T.as.HasF.impl(constants.%T) [symbolic = %HasF.impl_witness.loc8_34.2 (constants.%HasF.impl_witness.ebe)] @@ -507,7 +507,7 @@ fn G(x: A) { // CHECK:STDOUT: %.loc12_11.2: type = converted %.loc12_10, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: %ptr.loc12_11: type = ptr_type %.loc12_11.2 [concrete = constants.%ptr.c28] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %ptr.c28 = value_binding x, %x.param +// CHECK:STDOUT: %x: %ptr.c28 = wrapper_binding x, %x.param // CHECK:STDOUT: %return.param: ref %ptr.c28 = out_param call_param1 // CHECK:STDOUT: %return: ref %ptr.c28 = return_slot %return.param // CHECK:STDOUT: } @@ -534,7 +534,7 @@ fn G(x: A) { // CHECK:STDOUT: %Self.as_type.loc5_8.2: type = facet_access_type %Self.ref.loc5_8 [symbolic = %Self.as_type.loc5_8.1 (constants.%Self.as_type.5c2)] // CHECK:STDOUT: %.loc5_8.2: type = converted %Self.ref.loc5_8, %Self.as_type.loc5_8.2 [symbolic = %Self.as_type.loc5_8.1 (constants.%Self.as_type.5c2)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @HasF.WithSelf.F.%Self.as_type.loc5_8.1 (%Self.as_type.5c2) = value_binding self, %self.param +// CHECK:STDOUT: %self: @HasF.WithSelf.F.%Self.as_type.loc5_8.1 (%Self.as_type.5c2) = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref @HasF.WithSelf.F.%Self.as_type.loc5_8.1 (%Self.as_type.5c2) = out_param call_param1 // CHECK:STDOUT: %return: ref @HasF.WithSelf.F.%Self.as_type.loc5_8.1 (%Self.as_type.5c2) = return_slot %return.param // CHECK:STDOUT: } @@ -571,7 +571,7 @@ fn G(x: A) { // CHECK:STDOUT: %.loc9_18.2: Core.Form = init_form %ptr.loc9_18 [symbolic = %.loc9_18.1 (constants.%.cb6)] // CHECK:STDOUT: %self.param: @ptr.as.HasF.impl.F.%ptr.loc9_8 (%ptr.e8f) = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @ptr.as.HasF.impl.%ptr.loc8_25.2 [symbolic = %ptr.loc9_8 (constants.%ptr.e8f)] -// CHECK:STDOUT: %self: @ptr.as.HasF.impl.F.%ptr.loc9_8 (%ptr.e8f) = value_binding self, %self.param +// CHECK:STDOUT: %self: @ptr.as.HasF.impl.F.%ptr.loc9_8 (%ptr.e8f) = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref @ptr.as.HasF.impl.F.%ptr.loc9_8 (%ptr.e8f) = out_param call_param1 // CHECK:STDOUT: %return: ref @ptr.as.HasF.impl.F.%ptr.loc9_8 (%ptr.e8f) = return_slot %return.param // CHECK:STDOUT: } @@ -847,7 +847,7 @@ fn G(x: A) { // CHECK:STDOUT: %.loc14_13.2: type = converted %.loc14_12, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: %C: type = class_type @C, @C(constants.%empty_struct_type) [concrete = constants.%C.d8e] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %C.d8e = value_binding x, %x.param +// CHECK:STDOUT: %x: %C.d8e = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -866,7 +866,7 @@ fn G(x: A) { // CHECK:STDOUT: %Self.as_type.loc5_8.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc5_8.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc5_8.2: type = converted %Self.ref, %Self.as_type.loc5_8.2 [symbolic = %Self.as_type.loc5_8.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @HasF.WithSelf.F.%Self.as_type.loc5_8.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @HasF.WithSelf.F.%Self.as_type.loc5_8.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0: %HasF.assoc_type = assoc_entity element0, %HasF.WithSelf.F.decl [concrete = constants.%assoc0] // CHECK:STDOUT: @@ -895,7 +895,7 @@ fn G(x: A) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: @C.as.HasF.impl.F.%C (%C.1d0) = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @C.as.HasF.impl.%C.loc10_27.2 [symbolic = %C (constants.%C.1d0)] -// CHECK:STDOUT: %self: @C.as.HasF.impl.F.%C (%C.1d0) = value_binding self, %self.param +// CHECK:STDOUT: %self: @C.as.HasF.impl.F.%C (%C.1d0) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %HasF.impl_witness_table = impl_witness_table (%C.as.HasF.impl.F.decl), @C.as.HasF.impl [concrete] // CHECK:STDOUT: %HasF.impl_witness.loc10_37.1: = impl_witness %HasF.impl_witness_table, @C.as.HasF.impl(constants.%T) [symbolic = %HasF.impl_witness.loc10_37.2 (constants.%HasF.impl_witness.4e6)] @@ -1153,7 +1153,7 @@ fn G(x: A) { // CHECK:STDOUT: %.loc12_10.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc12_10.3: type = converted %.loc12_10.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %empty_struct_type = value_binding x, %x.param +// CHECK:STDOUT: %x: %empty_struct_type = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1181,7 +1181,7 @@ fn G(x: A) { // CHECK:STDOUT: %Self.as_type.loc5_8.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc5_8.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc5_8.3: type = converted %Self.ref, %Self.as_type.loc5_8.2 [symbolic = %Self.as_type.loc5_8.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @HasF.WithSelf.F.%Self.as_type.loc5_8.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @HasF.WithSelf.F.%Self.as_type.loc5_8.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0.loc5_13.1: @HasF.WithSelf.%HasF.assoc_type (%HasF.assoc_type.ddf) = assoc_entity element0, %HasF.WithSelf.F.decl [symbolic = %assoc0.loc5_13.2 (constants.%assoc0.e9a)] // CHECK:STDOUT: @@ -1212,7 +1212,7 @@ fn G(x: A) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %empty_struct_type = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @empty_struct_type.as.HasF.impl.%.loc8_25.2 [concrete = constants.%empty_struct_type] -// CHECK:STDOUT: %self: %empty_struct_type = value_binding self, %self.param +// CHECK:STDOUT: %self: %empty_struct_type = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %HasF.impl_witness_table = impl_witness_table (%empty_struct_type.as.HasF.impl.F.decl), @empty_struct_type.as.HasF.impl [concrete] // CHECK:STDOUT: %HasF.impl_witness.loc8_38.1: = impl_witness %HasF.impl_witness_table, @empty_struct_type.as.HasF.impl(constants.%T) [symbolic = %HasF.impl_witness.loc8_38.2 (constants.%HasF.impl_witness.932)] @@ -1451,7 +1451,7 @@ fn G(x: A) { // CHECK:STDOUT: %.loc16_10.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc16_10.3: type = converted %.loc16_10.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %empty_struct_type = value_binding x, %x.param +// CHECK:STDOUT: %x: %empty_struct_type = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1470,7 +1470,7 @@ fn G(x: A) { // CHECK:STDOUT: %Self.as_type.loc5_8.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc5_8.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc5_8.2: type = converted %Self.ref, %Self.as_type.loc5_8.2 [symbolic = %Self.as_type.loc5_8.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @HasF.WithSelf.F.%Self.as_type.loc5_8.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @HasF.WithSelf.F.%Self.as_type.loc5_8.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0: %HasF.assoc_type = assoc_entity element0, %HasF.WithSelf.F.decl [concrete = constants.%assoc0] // CHECK:STDOUT: @@ -1500,7 +1500,7 @@ fn G(x: A) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: @T.as.HasF.impl.F.%T (%T) = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @T.as.HasF.impl.%T.ref [symbolic = %T (constants.%T)] -// CHECK:STDOUT: %self: @T.as.HasF.impl.F.%T (%T) = value_binding self, %self.param +// CHECK:STDOUT: %self: @T.as.HasF.impl.F.%T (%T) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %HasF.impl_witness_table = impl_witness_table (), @T.as.HasF.impl [concrete] // CHECK:STDOUT: %HasF.impl_witness.loc12_44.1: = impl_witness %HasF.impl_witness_table, @T.as.HasF.impl(constants.%T, constants.%U) [symbolic = %HasF.impl_witness.loc12_44.2 (constants.%HasF.impl_witness)] @@ -1673,7 +1673,7 @@ fn G(x: A) { // CHECK:STDOUT: } { // CHECK:STDOUT: %x.param: %A = value_param call_param0 // CHECK:STDOUT: %A.ref: type = name_ref A, file.%A.decl [concrete = constants.%A] -// CHECK:STDOUT: %x: %A = value_binding x, %x.param +// CHECK:STDOUT: %x: %A = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1701,7 +1701,7 @@ fn G(x: A) { // CHECK:STDOUT: %Self.as_type.loc5_8.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc5_8.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc5_8.3: type = converted %Self.ref, %Self.as_type.loc5_8.2 [symbolic = %Self.as_type.loc5_8.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @HasF.WithSelf.F.%Self.as_type.loc5_8.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @HasF.WithSelf.F.%Self.as_type.loc5_8.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0.loc5_13.1: @HasF.WithSelf.%HasF.assoc_type (%HasF.assoc_type.ddf) = assoc_entity element0, %HasF.WithSelf.F.decl [symbolic = %assoc0.loc5_13.2 (constants.%assoc0.e9a)] // CHECK:STDOUT: @@ -1732,7 +1732,7 @@ fn G(x: A) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: @T.as.HasF.impl.F.%T (%T) = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @T.as.HasF.impl.%T.ref.loc8_24 [symbolic = %T (constants.%T)] -// CHECK:STDOUT: %self: @T.as.HasF.impl.F.%T (%T) = value_binding self, %self.param +// CHECK:STDOUT: %self: @T.as.HasF.impl.F.%T (%T) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %HasF.impl_witness_table = impl_witness_table (%T.as.HasF.impl.F.decl), @T.as.HasF.impl [concrete] // CHECK:STDOUT: %HasF.impl_witness.loc8_37.1: = impl_witness %HasF.impl_witness_table, @T.as.HasF.impl(constants.%T) [symbolic = %HasF.impl_witness.loc8_37.2 (constants.%HasF.impl_witness)] diff --git a/toolchain/check/testdata/impl/lookup/impl_forall.carbon b/toolchain/check/testdata/impl/lookup/impl_forall.carbon index 4b9c0de0805c..e50cf161489f 100644 --- a/toolchain/check/testdata/impl/lookup/impl_forall.carbon +++ b/toolchain/check/testdata/impl/lookup/impl_forall.carbon @@ -195,7 +195,7 @@ fn TestSpecific(a: A({})*) -> {}* { // CHECK:STDOUT: %.loc13_22.2: Core.Form = init_form %ptr.loc13_22.2 [symbolic = %.loc13_22.1 (constants.%.cb6cb9.2)] // CHECK:STDOUT: %self.param: ref @A.as.I.impl.F.%A (%A.47a1de.2) = ref_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @A.as.I.impl.%A.loc12_27.2 [symbolic = %A (constants.%A.47a1de.2)] -// CHECK:STDOUT: %self: ref @A.as.I.impl.F.%A (%A.47a1de.2) = ref_binding self, %self.param +// CHECK:STDOUT: %self: ref @A.as.I.impl.F.%A (%A.47a1de.2) = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref @A.as.I.impl.F.%ptr.loc13_22.1 (%ptr.e8f8f9.2) = out_param call_param1 // CHECK:STDOUT: %return: ref @A.as.I.impl.F.%ptr.loc13_22.1 (%ptr.e8f8f9.2) = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/lookup/import.carbon b/toolchain/check/testdata/impl/lookup/import.carbon index 538044894316..8dffb8fc4598 100644 --- a/toolchain/check/testdata/impl/lookup/import.carbon +++ b/toolchain/check/testdata/impl/lookup/import.carbon @@ -288,7 +288,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %Self.as_type.loc5_8.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc5_8.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc5_8.2: type = converted %Self.ref, %Self.as_type.loc5_8.2 [symbolic = %Self.as_type.loc5_8.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @HasF.WithSelf.F.%Self.as_type.loc5_8.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @HasF.WithSelf.F.%Self.as_type.loc5_8.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0: %HasF.assoc_type = assoc_entity element0, %HasF.WithSelf.F.decl [concrete = constants.%assoc0] // CHECK:STDOUT: @@ -307,7 +307,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %C = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @C.as.HasF.impl.%C.ref [concrete = constants.%C] -// CHECK:STDOUT: %self: %C = value_binding self, %self.param +// CHECK:STDOUT: %self: %C = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %HasF.impl_witness_table = impl_witness_table (%C.as.HasF.impl.F.decl), @C.as.HasF.impl [concrete] // CHECK:STDOUT: %HasF.impl_witness: = impl_witness %HasF.impl_witness_table [concrete = constants.%HasF.impl_witness] @@ -484,7 +484,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %Self.as_type.loc7_8.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc7_8.1 (constants.%Self.as_type.dd3)] // CHECK:STDOUT: %.loc7_8.2: type = converted %Self.ref, %Self.as_type.loc7_8.2 [symbolic = %Self.as_type.loc7_8.1 (constants.%Self.as_type.dd3)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @HasG.WithSelf.G.%Self.as_type.loc7_8.1 (%Self.as_type.dd3) = value_binding self, %self.param +// CHECK:STDOUT: %self: @HasG.WithSelf.G.%Self.as_type.loc7_8.1 (%Self.as_type.dd3) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0: %HasG.assoc_type = assoc_entity element0, %HasG.WithSelf.G.decl [concrete = constants.%assoc0] // CHECK:STDOUT: @@ -512,7 +512,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %C = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @C.as.HasG.impl.%C.ref [concrete = constants.%C] -// CHECK:STDOUT: %self: %C = value_binding self, %self.param +// CHECK:STDOUT: %self: %C = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %HasG.impl_witness_table = impl_witness_table (%C.as.HasG.impl.G.decl), @C.as.HasG.impl [concrete] // CHECK:STDOUT: %HasG.impl_witness: = impl_witness %HasG.impl_witness_table [concrete = constants.%HasG.impl_witness.992] @@ -530,7 +530,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %D = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @D.as.HasF.impl.%D.ref [concrete = constants.%D] -// CHECK:STDOUT: %self: %D = value_binding self, %self.param +// CHECK:STDOUT: %self: %D = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %HasF.impl_witness_table = impl_witness_table (%D.as.HasF.impl.F.decl), @D.as.HasF.impl [concrete] // CHECK:STDOUT: %HasF.impl_witness: = impl_witness %HasF.impl_witness_table [concrete = constants.%HasF.impl_witness] @@ -548,7 +548,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %D = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @D.as.HasG.impl.%D.ref [concrete = constants.%D] -// CHECK:STDOUT: %self: %D = value_binding self, %self.param +// CHECK:STDOUT: %self: %D = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %HasG.impl_witness_table = impl_witness_table (%D.as.HasG.impl.G.decl), @D.as.HasG.impl [concrete] // CHECK:STDOUT: %HasG.impl_witness: = impl_witness %HasG.impl_witness_table [concrete = constants.%HasG.impl_witness.e55] @@ -758,7 +758,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %PackageA.ref.loc6: = name_ref PackageA, imports.%PackageA [concrete = imports.%PackageA] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%PackageA.C [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %C = value_binding c, %c.param +// CHECK:STDOUT: %c: %C = wrapper_binding c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -914,7 +914,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %PackageB.ref: = name_ref PackageB, imports.%PackageB [concrete = imports.%PackageB] // CHECK:STDOUT: %D.ref: type = name_ref D, imports.%PackageB.D [concrete = constants.%D] // CHECK:STDOUT: } -// CHECK:STDOUT: %d: %D = value_binding d, %d.param +// CHECK:STDOUT: %d: %D = wrapper_binding d, %d.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1082,7 +1082,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %PackageA.ref: = name_ref PackageA, imports.%PackageA [concrete = imports.%PackageA] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%PackageA.C [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %C = value_binding c, %c.param +// CHECK:STDOUT: %c: %C = wrapper_binding c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1245,7 +1245,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %PackageB.ref.loc6: = name_ref PackageB, imports.%PackageB [concrete = imports.%PackageB] // CHECK:STDOUT: %D.ref: type = name_ref D, imports.%PackageB.D [concrete = constants.%D] // CHECK:STDOUT: } -// CHECK:STDOUT: %d: %D = value_binding d, %d.param +// CHECK:STDOUT: %d: %D = wrapper_binding d, %d.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1390,7 +1390,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %Self.as_type.loc5_8.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc5_8.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc5_8.2: type = converted %Self.ref, %Self.as_type.loc5_8.2 [symbolic = %Self.as_type.loc5_8.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @Z.WithSelf.H.%Self.as_type.loc5_8.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @Z.WithSelf.H.%Self.as_type.loc5_8.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0: %Z.assoc_type = assoc_entity element0, %Z.WithSelf.H.decl [concrete = constants.%assoc0] // CHECK:STDOUT: @@ -1409,7 +1409,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %empty_tuple.type = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @empty_tuple.type.as.Z.impl.%.loc8_7.2 [concrete = constants.%empty_tuple.type] -// CHECK:STDOUT: %self: %empty_tuple.type = value_binding self, %self.param +// CHECK:STDOUT: %self: %empty_tuple.type = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %Z.impl_witness_table = impl_witness_table (%empty_tuple.type.as.Z.impl.H.decl), @empty_tuple.type.as.Z.impl [concrete] // CHECK:STDOUT: %Z.impl_witness: = impl_witness %Z.impl_witness_table [concrete = constants.%Z.impl_witness] @@ -1663,7 +1663,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %Self.as_type.loc7_15.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc7_15.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc7_15.2: type = converted %Self.ref, %Self.as_type.loc7_15.2 [symbolic = %Self.as_type.loc7_15.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @Y.WithSelf.K.%Self.as_type.loc7_15.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @Y.WithSelf.K.%Self.as_type.loc7_15.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0: %Y.assoc_type = assoc_entity element0, %Y.WithSelf.K.decl [concrete = constants.%assoc0] // CHECK:STDOUT: @@ -1879,7 +1879,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %AnyParam.591 = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @AnyParam.as.Y.impl.%AnyParam [concrete = constants.%AnyParam.591] -// CHECK:STDOUT: %self: %AnyParam.591 = value_binding self, %self.param +// CHECK:STDOUT: %self: %AnyParam.591 = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %Y.impl_witness_table = impl_witness_table (%AnyParam.as.Y.impl.K.decl), @AnyParam.as.Y.impl [concrete] // CHECK:STDOUT: %Y.impl_witness: = impl_witness %Y.impl_witness_table [concrete = constants.%Y.impl_witness] @@ -1942,7 +1942,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %GenericInterface.ref: %GenericInterface.type.cd1 = name_ref GenericInterface, file.%GenericInterface.decl [concrete = constants.%GenericInterface.generic] // CHECK:STDOUT: %AnyParam: type = class_type @AnyParam, @AnyParam(constants.%GenericInterface.type.cd1, constants.%GenericInterface.generic) [concrete = constants.%AnyParam.591] // CHECK:STDOUT: } -// CHECK:STDOUT: %obj: ref %AnyParam.591 = ref_binding obj, %obj.var +// CHECK:STDOUT: %obj: ref %AnyParam.591 = wrapper_binding obj, %obj.var // CHECK:STDOUT: %obj.ref: ref %AnyParam.591 = name_ref obj, %obj // CHECK:STDOUT: %PackageHasParam.ref.loc14: = name_ref PackageHasParam, imports.%PackageHasParam [concrete = imports.%PackageHasParam] // CHECK:STDOUT: %Y.ref: type = name_ref Y, imports.%PackageHasParam.Y [concrete = constants.%Y.type] @@ -2187,7 +2187,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %GenericInterface.ref: %GenericInterface.type.cd1 = name_ref GenericInterface, imports.%PackageGenericInterface.GenericInterface [concrete = constants.%GenericInterface.generic] // CHECK:STDOUT: %AnyParam: type = class_type @AnyParam, @AnyParam(constants.%GenericInterface.type.cd1, constants.%GenericInterface.generic) [concrete = constants.%AnyParam.591] // CHECK:STDOUT: } -// CHECK:STDOUT: %obj: ref %AnyParam.591 = ref_binding obj, %obj.var +// CHECK:STDOUT: %obj: ref %AnyParam.591 = wrapper_binding obj, %obj.var // CHECK:STDOUT: %obj.ref: ref %AnyParam.591 = name_ref obj, %obj // CHECK:STDOUT: %PackageHasParam.ref.loc10: = name_ref PackageHasParam, imports.%PackageHasParam [concrete = imports.%PackageHasParam] // CHECK:STDOUT: %Y.ref: type = name_ref Y, imports.%PackageHasParam.Y [concrete = constants.%Y.type] @@ -2396,7 +2396,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %AnyParam.21c = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @AnyParam.as.Y.impl.%AnyParam [concrete = constants.%AnyParam.21c] -// CHECK:STDOUT: %self: %AnyParam.21c = value_binding self, %self.param +// CHECK:STDOUT: %self: %AnyParam.21c = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %Y.impl_witness_table = impl_witness_table (%AnyParam.as.Y.impl.K.decl), @AnyParam.as.Y.impl [concrete] // CHECK:STDOUT: %Y.impl_witness: = impl_witness %Y.impl_witness_table [concrete = constants.%Y.impl_witness] @@ -2474,7 +2474,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %GenericClass.ref: %GenericClass.type = name_ref GenericClass, file.%GenericClass.decl [concrete = constants.%GenericClass.generic] // CHECK:STDOUT: %AnyParam: type = class_type @AnyParam, @AnyParam(constants.%GenericClass.type, constants.%GenericClass.generic) [concrete = constants.%AnyParam.21c] // CHECK:STDOUT: } -// CHECK:STDOUT: %obj: ref %AnyParam.21c = ref_binding obj, %obj.var +// CHECK:STDOUT: %obj: ref %AnyParam.21c = wrapper_binding obj, %obj.var // CHECK:STDOUT: %obj.ref: ref %AnyParam.21c = name_ref obj, %obj // CHECK:STDOUT: %PackageHasParam.ref.loc14: = name_ref PackageHasParam, imports.%PackageHasParam [concrete = imports.%PackageHasParam] // CHECK:STDOUT: %Y.ref: type = name_ref Y, imports.%PackageHasParam.Y [concrete = constants.%Y.type] @@ -2713,7 +2713,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %GenericClass.ref: %GenericClass.type = name_ref GenericClass, imports.%PackageGenericClass.GenericClass [concrete = constants.%GenericClass.generic] // CHECK:STDOUT: %AnyParam: type = class_type @AnyParam, @AnyParam(constants.%GenericClass.type, constants.%GenericClass.generic) [concrete = constants.%AnyParam.21c] // CHECK:STDOUT: } -// CHECK:STDOUT: %obj: ref %AnyParam.21c = ref_binding obj, %obj.var +// CHECK:STDOUT: %obj: ref %AnyParam.21c = wrapper_binding obj, %obj.var // CHECK:STDOUT: %obj.ref: ref %AnyParam.21c = name_ref obj, %obj // CHECK:STDOUT: %PackageHasParam.ref.loc9: = name_ref PackageHasParam, imports.%PackageHasParam [concrete = imports.%PackageHasParam] // CHECK:STDOUT: %Y.ref: type = name_ref Y, imports.%PackageHasParam.Y [concrete = constants.%Y.type] @@ -3008,7 +3008,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %Self.as_type.loc14_20.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc14_20.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc14_20.2: type = converted %Self.ref, %Self.as_type.loc14_20.2 [symbolic = %Self.as_type.loc14_20.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @I.WithSelf.F.%Self.as_type.loc14_20.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @I.WithSelf.F.%Self.as_type.loc14_20.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0: %I.assoc_type = assoc_entity element0, %I.WithSelf.F.decl [concrete = constants.%assoc0] // CHECK:STDOUT: @@ -3027,7 +3027,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %C.279 = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @C.as.I.impl.%C [concrete = constants.%C.279] -// CHECK:STDOUT: %self: %C.279 = value_binding self, %self.param +// CHECK:STDOUT: %self: %C.279 = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %I.impl_witness_table = impl_witness_table (%C.as.I.impl.F.decl), @C.as.I.impl [concrete] // CHECK:STDOUT: %I.impl_witness: = impl_witness %I.impl_witness_table [concrete = constants.%I.impl_witness] @@ -3224,7 +3224,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %.loc5_33: type = type_literal type [concrete = type] // CHECK:STDOUT: %C: type = class_type @C, @C(type) [concrete = constants.%C.62c] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %C.62c = value_binding c, %c.param +// CHECK:STDOUT: %c: %C.62c = wrapper_binding c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/lookup/instance_method.carbon b/toolchain/check/testdata/impl/lookup/instance_method.carbon index 39cd754daaa7..ebea5992136c 100644 --- a/toolchain/check/testdata/impl/lookup/instance_method.carbon +++ b/toolchain/check/testdata/impl/lookup/instance_method.carbon @@ -103,7 +103,7 @@ fn F(c: C) -> i32 { // CHECK:STDOUT: %.loc27: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %c.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl.loc15 [concrete = constants.%C] -// CHECK:STDOUT: %c: %C = value_binding c, %c.param +// CHECK:STDOUT: %c: %C = wrapper_binding c, %c.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -128,7 +128,7 @@ fn F(c: C) -> i32 { // CHECK:STDOUT: %Self.as_type.loc18_8.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc18_8.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc18_8.2: type = converted %Self.ref, %Self.as_type.loc18_8.2 [symbolic = %Self.as_type.loc18_8.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @I.WithSelf.F.%Self.as_type.loc18_8.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @I.WithSelf.F.%Self.as_type.loc18_8.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -153,7 +153,7 @@ fn F(c: C) -> i32 { // CHECK:STDOUT: %.loc23: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %self.param: %C = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%C [concrete = constants.%C] -// CHECK:STDOUT: %self: %C = value_binding self, %self.param +// CHECK:STDOUT: %self: %C = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/lookup/specialization_with_symbolic_rewrite.carbon b/toolchain/check/testdata/impl/lookup/specialization_with_symbolic_rewrite.carbon index e46a7dce5998..0629224215d9 100644 --- a/toolchain/check/testdata/impl/lookup/specialization_with_symbolic_rewrite.carbon +++ b/toolchain/check/testdata/impl/lookup/specialization_with_symbolic_rewrite.carbon @@ -258,7 +258,7 @@ fn F[T:! Ptr](var t: T) -> T.(Ptr.Type) { // CHECK:STDOUT: %T.as_type.loc13_19.2: type = facet_access_type %T.ref.loc13 [symbolic = %T.as_type.loc13_19.1 (constants.%T.as_type)] // CHECK:STDOUT: %.loc13_19.2: type = converted %T.ref.loc13, %T.as_type.loc13_19.2 [symbolic = %T.as_type.loc13_19.1 (constants.%T.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %t: @F.%T.as_type.loc13_19.1 (%T.as_type) = value_binding t, %t.param +// CHECK:STDOUT: %t: @F.%T.as_type.loc13_19.1 (%T.as_type) = wrapper_binding t, %t.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -373,7 +373,7 @@ fn F[T:! Ptr](var t: T) -> T.(Ptr.Type) { // CHECK:STDOUT: %X.ref: %Z.assoc_type.f4d = name_ref X, %.loc15_18.3 [concrete = constants.%assoc0.169] // CHECK:STDOUT: %impl.elem0: type = impl_witness_access constants.%Z.impl_witness.597, element0 [symbolic = %T.as_type.loc13_19.1 (constants.%T.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: @F.%T.as_type.loc13_19.1 (%T.as_type) = value_binding a, %t.ref +// CHECK:STDOUT: %a: @F.%T.as_type.loc13_19.1 (%T.as_type) = wrapper_binding a, %t.ref // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -680,7 +680,7 @@ fn F[T:! Ptr](var t: T) -> T.(Ptr.Type) { // CHECK:STDOUT: %T.as_type.loc14_19.2: type = facet_access_type %T.ref.loc14 [symbolic = %T.as_type.loc14_19.1 (constants.%T.as_type)] // CHECK:STDOUT: %.loc14_19.2: type = converted %T.ref.loc14, %T.as_type.loc14_19.2 [symbolic = %T.as_type.loc14_19.1 (constants.%T.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %t: @F.%T.as_type.loc14_19.1 (%T.as_type) = value_binding t, %t.param +// CHECK:STDOUT: %t: @F.%T.as_type.loc14_19.1 (%T.as_type) = wrapper_binding t, %t.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -817,7 +817,7 @@ fn F[T:! Ptr](var t: T) -> T.(Ptr.Type) { // CHECK:STDOUT: %X.ref: %Z.assoc_type.f4d = name_ref X, %.loc22_18.3 [concrete = constants.%assoc0.169] // CHECK:STDOUT: %impl.elem0.loc22_18.1: type = impl_witness_access constants.%Z.lookup_impl_witness.89c, element0 [symbolic = %impl.elem0.loc22_18.2 (constants.%impl.elem0.aab)] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: @F.%impl.elem0.loc22_18.2 (%impl.elem0.aab) = value_binding a, [concrete = ] +// CHECK:STDOUT: %a: @F.%impl.elem0.loc22_18.2 (%impl.elem0.aab) = wrapper_binding a, [concrete = ] // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -1042,7 +1042,7 @@ fn F[T:! Ptr](var t: T) -> T.(Ptr.Type) { // CHECK:STDOUT: %T.loc9_7.2: type = symbolic_binding T, 0 [symbolic = %T.loc9_7.1 (constants.%T.67d)] // CHECK:STDOUT: %t.param: ref @F.%T.loc9_7.1 (%T.67d) = ref_param call_param0 // CHECK:STDOUT: %T.ref.loc9_23: type = name_ref T, %T.loc9_7.2 [symbolic = %T.loc9_7.1 (constants.%T.67d)] -// CHECK:STDOUT: %t: ref @F.%T.loc9_7.1 (%T.67d) = ref_binding t, %t.param +// CHECK:STDOUT: %t: ref @F.%T.loc9_7.1 (%T.67d) = wrapper_binding t, %t.param // CHECK:STDOUT: %return.param: ref @F.%ptr (%ptr.e8f8f9.2) = out_param call_param1 // CHECK:STDOUT: %return: ref @F.%ptr (%ptr.e8f8f9.2) = return_slot %return.param // CHECK:STDOUT: } @@ -1295,7 +1295,7 @@ fn F[T:! Ptr](var t: T) -> T.(Ptr.Type) { // CHECK:STDOUT: %T.as_type.loc9_22.2: type = facet_access_type %T.ref.loc9_22 [symbolic = %T.as_type.loc9_22.1 (constants.%T.as_type.468)] // CHECK:STDOUT: %.loc9_22.2: type = converted %T.ref.loc9_22, %T.as_type.loc9_22.2 [symbolic = %T.as_type.loc9_22.1 (constants.%T.as_type.468)] // CHECK:STDOUT: } -// CHECK:STDOUT: %t: ref @F.%T.as_type.loc9_22.1 (%T.as_type.468) = ref_binding t, %t.param +// CHECK:STDOUT: %t: ref @F.%T.as_type.loc9_22.1 (%T.as_type.468) = wrapper_binding t, %t.param // CHECK:STDOUT: %return.param: ref @F.%ptr (%ptr.ac4) = out_param call_param1 // CHECK:STDOUT: %return: ref @F.%ptr (%ptr.ac4) = return_slot %return.param // CHECK:STDOUT: } @@ -1545,7 +1545,7 @@ fn F[T:! Ptr](var t: T) -> T.(Ptr.Type) { // CHECK:STDOUT: %T.as_type.loc9_22.2: type = facet_access_type %T.ref.loc9_22 [symbolic = %T.as_type.loc9_22.1 (constants.%T.as_type.468)] // CHECK:STDOUT: %.loc9_22.2: type = converted %T.ref.loc9_22, %T.as_type.loc9_22.2 [symbolic = %T.as_type.loc9_22.1 (constants.%T.as_type.468)] // CHECK:STDOUT: } -// CHECK:STDOUT: %t: ref @F.%T.as_type.loc9_22.1 (%T.as_type.468) = ref_binding t, %t.param +// CHECK:STDOUT: %t: ref @F.%T.as_type.loc9_22.1 (%T.as_type.468) = wrapper_binding t, %t.param // CHECK:STDOUT: %return.param: ref @F.%ptr (%ptr.ac4) = out_param call_param1 // CHECK:STDOUT: %return: ref @F.%ptr (%ptr.ac4) = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/lookup/specific_args.carbon b/toolchain/check/testdata/impl/lookup/specific_args.carbon index 817863b9c2d3..09e6703ca050 100644 --- a/toolchain/check/testdata/impl/lookup/specific_args.carbon +++ b/toolchain/check/testdata/impl/lookup/specific_args.carbon @@ -135,7 +135,7 @@ fn H(c: C(InClassArgs)) { c.(I(X).F)(); } // CHECK:STDOUT: %Self.as_type.loc4_30.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc4_30.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc4_30.3: type = converted %Self.ref, %Self.as_type.loc4_30.2 [symbolic = %Self.as_type.loc4_30.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @I.WithSelf.F.%Self.as_type.loc4_30.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @I.WithSelf.F.%Self.as_type.loc4_30.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0.loc4_35.1: @I.WithSelf.%I.assoc_type (%I.assoc_type) = assoc_entity element0, %I.WithSelf.F.decl [symbolic = %assoc0.loc4_35.2 (constants.%assoc0)] // CHECK:STDOUT: @@ -299,7 +299,7 @@ fn H(c: C(InClassArgs)) { c.(I(X).F)(); } // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %X = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @X.as.I.impl.%X.ref [concrete = constants.%X] -// CHECK:STDOUT: %self: %X = value_binding self, %self.param +// CHECK:STDOUT: %self: %X = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %I.impl_witness_table = impl_witness_table (%X.as.I.impl.F.decl), @X.as.I.impl [concrete] // CHECK:STDOUT: %I.impl_witness: = impl_witness %I.impl_witness_table [concrete = constants.%I.impl_witness] @@ -482,7 +482,7 @@ fn H(c: C(InClassArgs)) { c.(I(X).F)(); } // CHECK:STDOUT: } { // CHECK:STDOUT: %x.param: %X = value_param call_param0 // CHECK:STDOUT: %X.ref: type = name_ref X, imports.%Main.X [concrete = constants.%X] -// CHECK:STDOUT: %x: %X = value_binding x, %x.param +// CHECK:STDOUT: %x: %X = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -701,7 +701,7 @@ fn H(c: C(InClassArgs)) { c.(I(X).F)(); } // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %C.165 = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @C.as.I.impl.%C [concrete = constants.%C.165] -// CHECK:STDOUT: %self: %C.165 = value_binding self, %self.param +// CHECK:STDOUT: %self: %C.165 = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %I.impl_witness_table = impl_witness_table (%C.as.I.impl.F.decl), @C.as.I.impl [concrete] // CHECK:STDOUT: %I.impl_witness: = impl_witness %I.impl_witness_table [concrete = constants.%I.impl_witness] @@ -920,7 +920,7 @@ fn H(c: C(InClassArgs)) { c.(I(X).F)(); } // CHECK:STDOUT: %InClassArgs.ref: type = name_ref InClassArgs, imports.%Main.InClassArgs [concrete = constants.%InClassArgs] // CHECK:STDOUT: %C: type = class_type @C, @C(constants.%InClassArgs) [concrete = constants.%C.165] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %C.165 = value_binding c, %c.param +// CHECK:STDOUT: %c: %C.165 = wrapper_binding c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/lookup/transitive.carbon b/toolchain/check/testdata/impl/lookup/transitive.carbon index 7a80752182b1..70beb5cdcbb9 100644 --- a/toolchain/check/testdata/impl/lookup/transitive.carbon +++ b/toolchain/check/testdata/impl/lookup/transitive.carbon @@ -94,7 +94,7 @@ fn Call() { // CHECK:STDOUT: %Self.as_type.loc4_20.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc4_20.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc4_20.2: type = converted %Self.ref, %Self.as_type.loc4_20.2 [symbolic = %Self.as_type.loc4_20.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @I.WithSelf.F.%Self.as_type.loc4_20.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @I.WithSelf.F.%Self.as_type.loc4_20.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0: %I.assoc_type = assoc_entity element0, %I.WithSelf.F.decl [concrete = constants.%assoc0] // CHECK:STDOUT: @@ -194,7 +194,7 @@ fn Call() { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %C = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @C.as.I.impl.%C.ref [concrete = constants.%C] -// CHECK:STDOUT: %self: %C = value_binding self, %self.param +// CHECK:STDOUT: %self: %C = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %I.impl_witness_table = impl_witness_table (%C.as.I.impl.F.decl), @C.as.I.impl [concrete] // CHECK:STDOUT: %I.impl_witness: = impl_witness %I.impl_witness_table [concrete = constants.%I.impl_witness] diff --git a/toolchain/check/testdata/impl/multiple_extend.carbon b/toolchain/check/testdata/impl/multiple_extend.carbon index 7aabaefa500a..fc17c01d8826 100644 --- a/toolchain/check/testdata/impl/multiple_extend.carbon +++ b/toolchain/check/testdata/impl/multiple_extend.carbon @@ -226,7 +226,7 @@ fn P(o: O) { // CHECK:STDOUT: } { // CHECK:STDOUT: %c.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc21: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %c: %C = value_binding c, %c.param +// CHECK:STDOUT: %c: %C = wrapper_binding c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -457,7 +457,7 @@ fn P(o: O) { // CHECK:STDOUT: } { // CHECK:STDOUT: %d.param: %D = value_param call_param0 // CHECK:STDOUT: %D.ref.loc21: type = name_ref D, file.%D.decl [concrete = constants.%D] -// CHECK:STDOUT: %d: %D = value_binding d, %d.param +// CHECK:STDOUT: %d: %D = wrapper_binding d, %d.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -667,7 +667,7 @@ fn P(o: O) { // CHECK:STDOUT: } { // CHECK:STDOUT: %e.param: %E = value_param call_param0 // CHECK:STDOUT: %E.ref.loc19: type = name_ref E, file.%E.decl [concrete = constants.%E] -// CHECK:STDOUT: %e: %E = value_binding e, %e.param +// CHECK:STDOUT: %e: %E = wrapper_binding e, %e.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -841,7 +841,7 @@ fn P(o: O) { // CHECK:STDOUT: } { // CHECK:STDOUT: %l.param: %L = value_param call_param0 // CHECK:STDOUT: %L.ref.loc19: type = name_ref L, file.%L.decl [concrete = constants.%L] -// CHECK:STDOUT: %l: %L = value_binding l, %l.param +// CHECK:STDOUT: %l: %L = wrapper_binding l, %l.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1015,7 +1015,7 @@ fn P(o: O) { // CHECK:STDOUT: } { // CHECK:STDOUT: %o.param: %O = value_param call_param0 // CHECK:STDOUT: %O.ref.loc27: type = name_ref O, file.%O.decl [concrete = constants.%O] -// CHECK:STDOUT: %o: %O = value_binding o, %o.param +// CHECK:STDOUT: %o: %O = wrapper_binding o, %o.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/self_in_signature.carbon b/toolchain/check/testdata/impl/self_in_signature.carbon index 50ae1122ebc0..86663c241e98 100644 --- a/toolchain/check/testdata/impl/self_in_signature.carbon +++ b/toolchain/check/testdata/impl/self_in_signature.carbon @@ -191,14 +191,14 @@ impl D as SelfNested { // CHECK:STDOUT: %Self.as_type.loc16_8.2: type = facet_access_type %Self.ref.loc16_8 [symbolic = %Self.as_type.loc16_8.1 (constants.%Self.as_type.968)] // CHECK:STDOUT: %.loc16_8.2: type = converted %Self.ref.loc16_8, %Self.as_type.loc16_8.2 [symbolic = %Self.as_type.loc16_8.1 (constants.%Self.as_type.968)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @UseSelf.WithSelf.F.%Self.as_type.loc16_8.1 (%Self.as_type.968) = value_binding self, %self.param +// CHECK:STDOUT: %self: @UseSelf.WithSelf.F.%Self.as_type.loc16_8.1 (%Self.as_type.968) = wrapper_binding self, %self.param // CHECK:STDOUT: %x.param: @UseSelf.WithSelf.F.%Self.as_type.loc16_8.1 (%Self.as_type.968) = value_param call_param1 // CHECK:STDOUT: %.loc16_17.1: type = splice_block %.loc16_17.2 [symbolic = %Self.as_type.loc16_8.1 (constants.%Self.as_type.968)] { // CHECK:STDOUT: %Self.ref.loc16_17: %UseSelf.type = name_ref Self, @UseSelf.%Self [symbolic = %Self (constants.%Self.bde)] // CHECK:STDOUT: %Self.as_type.loc16_17: type = facet_access_type %Self.ref.loc16_17 [symbolic = %Self.as_type.loc16_8.1 (constants.%Self.as_type.968)] // CHECK:STDOUT: %.loc16_17.2: type = converted %Self.ref.loc16_17, %Self.as_type.loc16_17 [symbolic = %Self.as_type.loc16_8.1 (constants.%Self.as_type.968)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @UseSelf.WithSelf.F.%Self.as_type.loc16_8.1 (%Self.as_type.968) = value_binding x, %x.param +// CHECK:STDOUT: %x: @UseSelf.WithSelf.F.%Self.as_type.loc16_8.1 (%Self.as_type.968) = wrapper_binding x, %x.param // CHECK:STDOUT: %return.param: ref @UseSelf.WithSelf.F.%Self.as_type.loc16_8.1 (%Self.as_type.968) = out_param call_param2 // CHECK:STDOUT: %return: ref @UseSelf.WithSelf.F.%Self.as_type.loc16_8.1 (%Self.as_type.968) = return_slot %return.param // CHECK:STDOUT: } @@ -237,7 +237,7 @@ impl D as SelfNested { // CHECK:STDOUT: %.loc32_37.2: %tuple.type.24b = tuple_literal (%ptr.loc32_16.2, %struct_type.x.y.loc32_36.2) [symbolic = %tuple (constants.%tuple.876)] // CHECK:STDOUT: %.loc32_37.3: type = converted %.loc32_37.2, constants.%tuple.type.d83 [symbolic = %tuple.type (constants.%tuple.type.d83)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @SelfNested.WithSelf.F.%tuple.type (%tuple.type.d83) = value_binding x, %x.param +// CHECK:STDOUT: %x: @SelfNested.WithSelf.F.%tuple.type (%tuple.type.d83) = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0: %SelfNested.assoc_type = assoc_entity element0, %SelfNested.WithSelf.F.decl [concrete = constants.%assoc0.219] // CHECK:STDOUT: @@ -263,10 +263,10 @@ impl D as SelfNested { // CHECK:STDOUT: %.loc24_40: Core.Form = init_form %C.ref.loc24_40 [concrete = constants.%.a44] // CHECK:STDOUT: %self.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc24_21: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %self: %C = value_binding self, %self.param +// CHECK:STDOUT: %self: %C = wrapper_binding self, %self.param // CHECK:STDOUT: %x.param: %C = value_param call_param1 // CHECK:STDOUT: %C.ref.loc24_34: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %x: %C = value_binding x, %x.param +// CHECK:STDOUT: %x: %C = wrapper_binding x, %x.param // CHECK:STDOUT: %return.param: ref %C = out_param call_param2 // CHECK:STDOUT: %return: ref %C = return_slot %return.param // CHECK:STDOUT: } @@ -293,10 +293,10 @@ impl D as SelfNested { // CHECK:STDOUT: %.loc28_40: Core.Form = init_form %Self.ref.loc28_40 [concrete = constants.%.592] // CHECK:STDOUT: %self.param: %D = value_param call_param0 // CHECK:STDOUT: %Self.ref.loc28_15: type = name_ref Self, @D.as.UseSelf.impl.%D.ref [concrete = constants.%D] -// CHECK:STDOUT: %self: %D = value_binding self, %self.param +// CHECK:STDOUT: %self: %D = wrapper_binding self, %self.param // CHECK:STDOUT: %x.param: %D = value_param call_param1 // CHECK:STDOUT: %Self.ref.loc28_31: type = name_ref Self, @D.as.UseSelf.impl.%D.ref [concrete = constants.%D] -// CHECK:STDOUT: %x: %D = value_binding x, %x.param +// CHECK:STDOUT: %x: %D = wrapper_binding x, %x.param // CHECK:STDOUT: %return.param: ref %D = out_param call_param2 // CHECK:STDOUT: %return: ref %D = return_slot %return.param // CHECK:STDOUT: } @@ -325,7 +325,7 @@ impl D as SelfNested { // CHECK:STDOUT: %.loc36_31.2: %tuple.type.24b = tuple_literal (%ptr, %struct_type.x.y) [concrete = constants.%tuple.562] // CHECK:STDOUT: %.loc36_31.3: type = converted %.loc36_31.2, constants.%tuple.type.746 [concrete = constants.%tuple.type.746] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %tuple.type.746 = value_binding x, %x.param +// CHECK:STDOUT: %x: %tuple.type.746 = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %SelfNested.impl_witness_table = impl_witness_table (%C.as.SelfNested.impl.F.decl), @C.as.SelfNested.impl [concrete] // CHECK:STDOUT: %SelfNested.impl_witness: = impl_witness %SelfNested.impl_witness_table [concrete = constants.%SelfNested.impl_witness.d40] @@ -353,7 +353,7 @@ impl D as SelfNested { // CHECK:STDOUT: %.loc40_37.2: %tuple.type.24b = tuple_literal (%ptr, %struct_type.x.y) [concrete = constants.%tuple.c73] // CHECK:STDOUT: %.loc40_37.3: type = converted %.loc40_37.2, constants.%tuple.type.aaa [concrete = constants.%tuple.type.aaa] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %tuple.type.aaa = value_binding x, %x.param +// CHECK:STDOUT: %x: %tuple.type.aaa = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %SelfNested.impl_witness_table = impl_witness_table (%D.as.SelfNested.impl.F.decl), @D.as.SelfNested.impl [concrete] // CHECK:STDOUT: %SelfNested.impl_witness: = impl_witness %SelfNested.impl_witness_table [concrete = constants.%SelfNested.impl_witness.ad8] diff --git a/toolchain/check/testdata/impl/use_assoc_entity.carbon b/toolchain/check/testdata/impl/use_assoc_entity.carbon index 2974fe5fde90..5ceeac190601 100644 --- a/toolchain/check/testdata/impl/use_assoc_entity.carbon +++ b/toolchain/check/testdata/impl/use_assoc_entity.carbon @@ -606,13 +606,13 @@ fn F() { // CHECK:STDOUT: %Self.as_type.loc6_8.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc6_8.1 (constants.%Self.as_type.976)] // CHECK:STDOUT: %.loc6_8.2: type = converted %Self.ref, %Self.as_type.loc6_8.2 [symbolic = %Self.as_type.loc6_8.1 (constants.%Self.as_type.976)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @J.WithSelf.F.%Self.as_type.loc6_8.1 (%Self.as_type.976) = value_binding self, %self.param +// CHECK:STDOUT: %self: @J.WithSelf.F.%Self.as_type.loc6_8.1 (%Self.as_type.976) = wrapper_binding self, %self.param // CHECK:STDOUT: %u.param: @J.WithSelf.F.%impl.elem0.loc6_17.1 (%impl.elem0.c15) = value_param call_param1 // CHECK:STDOUT: %.loc6_17: type = splice_block %U.ref.loc6_17 [symbolic = %impl.elem0.loc6_17.1 (constants.%impl.elem0.c15)] { // CHECK:STDOUT: %impl.elem0.loc6_17.2: type = impl_witness_access constants.%J.lookup_impl_witness.e57, element0 [symbolic = %impl.elem0.loc6_17.1 (constants.%impl.elem0.c15)] // CHECK:STDOUT: %U.ref.loc6_17: type = name_ref U, %impl.elem0.loc6_17.2 [symbolic = %impl.elem0.loc6_17.1 (constants.%impl.elem0.c15)] // CHECK:STDOUT: } -// CHECK:STDOUT: %u: @J.WithSelf.F.%impl.elem0.loc6_17.1 (%impl.elem0.c15) = value_binding u, %u.param +// CHECK:STDOUT: %u: @J.WithSelf.F.%impl.elem0.loc6_17.1 (%impl.elem0.c15) = wrapper_binding u, %u.param // CHECK:STDOUT: %return.param: ref @J.WithSelf.F.%impl.elem0.loc6_17.1 (%impl.elem0.c15) = out_param call_param2 // CHECK:STDOUT: %return: ref @J.WithSelf.F.%impl.elem0.loc6_17.1 (%impl.elem0.c15) = return_slot %return.param // CHECK:STDOUT: } @@ -641,10 +641,10 @@ fn F() { // CHECK:STDOUT: %.loc12: Core.Form = init_form %i32.loc12_32 [concrete = constants.%.795] // CHECK:STDOUT: %self.param: %empty_tuple.type = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @empty_tuple.type.as.J.impl.%.loc10_7.2 [concrete = constants.%empty_tuple.type] -// CHECK:STDOUT: %self: %empty_tuple.type = value_binding self, %self.param +// CHECK:STDOUT: %self: %empty_tuple.type = wrapper_binding self, %self.param // CHECK:STDOUT: %u.param: %i32 = value_param call_param1 // CHECK:STDOUT: %i32.loc12_24: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %u: %i32 = value_binding u, %u.param +// CHECK:STDOUT: %u: %i32 = wrapper_binding u, %u.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param2 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -669,10 +669,10 @@ fn F() { // CHECK:STDOUT: %.loc29_30: Core.Form = init_form %C.ref.loc29_30 [concrete = constants.%.a44] // CHECK:STDOUT: %self.param: %C = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @C.as.J.impl.%C.ref.loc27_6 [concrete = constants.%C] -// CHECK:STDOUT: %self: %C = value_binding self, %self.param +// CHECK:STDOUT: %self: %C = wrapper_binding self, %self.param // CHECK:STDOUT: %u.param: %C = value_param call_param1 // CHECK:STDOUT: %C.ref.loc29_24: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %u: %C = value_binding u, %u.param +// CHECK:STDOUT: %u: %C = wrapper_binding u, %u.param // CHECK:STDOUT: %return.param: ref %C = out_param call_param2 // CHECK:STDOUT: %return: ref %C = return_slot %return.param // CHECK:STDOUT: } @@ -903,7 +903,7 @@ fn F() { // CHECK:STDOUT: %.loc22_29.1: %i32 = value_of_initializer %E.as.J.impl.F.call.loc22 // CHECK:STDOUT: %.loc22_29.2: %i32 = converted %E.as.J.impl.F.call.loc22, %.loc22_29.1 // CHECK:STDOUT: %i32.loc22: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %e1: %i32 = value_binding e1, %.loc22_29.2 +// CHECK:STDOUT: %e1: %i32 = wrapper_binding e1, %.loc22_29.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %e2.patt: %pattern_type.6b6 = value_binding_pattern e2 [concrete = constants.%e2.patt] // CHECK:STDOUT: } @@ -923,7 +923,7 @@ fn F() { // CHECK:STDOUT: %.loc23_29.1: %i32 = value_of_initializer %E.as.J.impl.G.call.loc23 // CHECK:STDOUT: %.loc23_29.2: %i32 = converted %E.as.J.impl.G.call.loc23, %.loc23_29.1 // CHECK:STDOUT: %i32.loc23: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %e2: %i32 = value_binding e2, %.loc23_29.2 +// CHECK:STDOUT: %e2: %i32 = wrapper_binding e2, %.loc23_29.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %e3.patt: %pattern_type.6b6 = value_binding_pattern e3 [concrete = constants.%e3.patt] // CHECK:STDOUT: } @@ -942,7 +942,7 @@ fn F() { // CHECK:STDOUT: %.loc24_29.1: %i32 = value_of_initializer %E.as.J.impl.F.call.loc24 // CHECK:STDOUT: %.loc24_29.2: %i32 = converted %E.as.J.impl.F.call.loc24, %.loc24_29.1 // CHECK:STDOUT: %i32.loc24: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %e3: %i32 = value_binding e3, %.loc24_29.2 +// CHECK:STDOUT: %e3: %i32 = wrapper_binding e3, %.loc24_29.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %e4.patt: %pattern_type.6b6 = value_binding_pattern e4 [concrete = constants.%e4.patt] // CHECK:STDOUT: } @@ -963,7 +963,7 @@ fn F() { // CHECK:STDOUT: %.loc25_33.1: %i32 = value_of_initializer %E.as.J.impl.G.call.loc25 // CHECK:STDOUT: %.loc25_33.2: %i32 = converted %E.as.J.impl.G.call.loc25, %.loc25_33.1 // CHECK:STDOUT: %i32.loc25: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %e4: %i32 = value_binding e4, %.loc25_33.2 +// CHECK:STDOUT: %e4: %i32 = wrapper_binding e4, %.loc25_33.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %e5.patt: %pattern_type.6b6 = value_binding_pattern e5 [concrete = constants.%e5.patt] // CHECK:STDOUT: } @@ -984,7 +984,7 @@ fn F() { // CHECK:STDOUT: %.loc26_33.1: %i32 = value_of_initializer %E.as.J.impl.G.call.loc26 // CHECK:STDOUT: %.loc26_33.2: %i32 = converted %E.as.J.impl.G.call.loc26, %.loc26_33.1 // CHECK:STDOUT: %i32.loc26: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %e5: %i32 = value_binding e5, %.loc26_33.2 +// CHECK:STDOUT: %e5: %i32 = wrapper_binding e5, %.loc26_33.2 // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1071,7 +1071,7 @@ fn F() { // CHECK:STDOUT: %impl.elem0.loc11_13: type = impl_witness_access constants.%J.impl_witness, element0 [concrete = constants.%i32] // CHECK:STDOUT: %U.ref.loc11_13: type = name_ref U, %impl.elem0.loc11_13 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %u: %i32 = value_binding u, %u.param +// CHECK:STDOUT: %u: %i32 = wrapper_binding u, %u.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/index/array_element_access.carbon b/toolchain/check/testdata/index/array_element_access.carbon index c8595fe8c53d..b196005c4568 100644 --- a/toolchain/check/testdata/index/array_element_access.carbon +++ b/toolchain/check/testdata/index/array_element_access.carbon @@ -117,28 +117,28 @@ var d: i32 = a[b]; // CHECK:STDOUT: %int_2: Core.IntLiteral = int_value 2 [concrete = constants.%int_2] // CHECK:STDOUT: %array_type: type = array_type %int_2, %i32.loc15 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %array_type = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %array_type = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] // CHECK:STDOUT: %i32.loc16: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: ref %i32 = ref_binding b, %b.var [concrete = %b.var] +// CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.6b6 = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.6b6 = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %i32 = var %c.var_patt [concrete] // CHECK:STDOUT: %i32.loc17: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %c: ref %i32 = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %i32 = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.6b6 = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.6b6 = var_pattern %d.patt [concrete = constants.%d.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %d.var: ref %i32 = var %d.var_patt [concrete] // CHECK:STDOUT: %i32.loc18: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %d: ref %i32 = ref_binding d, %d.var [concrete = %d.var] +// CHECK:STDOUT: %d: ref %i32 = wrapper_binding d, %d.var [concrete = %d.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/index/expr_category.carbon b/toolchain/check/testdata/index/expr_category.carbon index df8779d750ce..bfb7f328e2e9 100644 --- a/toolchain/check/testdata/index/expr_category.carbon +++ b/toolchain/check/testdata/index/expr_category.carbon @@ -163,7 +163,7 @@ fn ValueBinding(b: array(i32, 3)) { // CHECK:STDOUT: %int_3.loc17: Core.IntLiteral = int_value 3 [concrete = constants.%int_3.1ba] // CHECK:STDOUT: %array_type.loc17: type = array_type %int_3.loc17, %i32.loc17 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %array_type = value_binding b, %b.param +// CHECK:STDOUT: %b: %array_type = wrapper_binding b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: %ValueBinding.decl: %ValueBinding.type = fn_decl @ValueBinding [concrete = constants.%ValueBinding] { // CHECK:STDOUT: %b.param_patt: %pattern_type.771 = value_param_pattern [concrete = constants.%b.param_patt] @@ -175,7 +175,7 @@ fn ValueBinding(b: array(i32, 3)) { // CHECK:STDOUT: %int_3.loc25: Core.IntLiteral = int_value 3 [concrete = constants.%int_3.1ba] // CHECK:STDOUT: %array_type.loc25: type = array_type %int_3.loc25, %i32.loc25 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %array_type = value_binding b, %b.param +// CHECK:STDOUT: %b: %array_type = wrapper_binding b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -227,7 +227,7 @@ fn ValueBinding(b: array(i32, 3)) { // CHECK:STDOUT: %int_3.loc18_21: Core.IntLiteral = int_value 3 [concrete = constants.%int_3.1ba] // CHECK:STDOUT: %array_type.loc18: type = array_type %int_3.loc18_21, %i32.loc18 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %array_type = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %array_type = wrapper_binding a, %a.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %pa.patt: %pattern_type.f00 = ref_binding_pattern pa [concrete = constants.%pa.patt] // CHECK:STDOUT: %pa.var_patt: %pattern_type.f00 = var_pattern %pa.patt [concrete = constants.%pa.var_patt] @@ -254,7 +254,7 @@ fn ValueBinding(b: array(i32, 3)) { // CHECK:STDOUT: %i32.loc21: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %ptr: type = ptr_type %i32.loc21 [concrete = constants.%ptr.d08] // CHECK:STDOUT: } -// CHECK:STDOUT: %pa: ref %ptr.d08 = ref_binding pa, %pa.var +// CHECK:STDOUT: %pa: ref %ptr.d08 = wrapper_binding pa, %pa.var // CHECK:STDOUT: %a.ref.loc22: ref %array_type = name_ref a, %a // CHECK:STDOUT: %int_0.loc22: Core.IntLiteral = int_value 0 [concrete = constants.%int_0.5c6] // CHECK:STDOUT: %impl.elem0.loc22_5: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] @@ -340,7 +340,7 @@ fn ValueBinding(b: array(i32, 3)) { // CHECK:STDOUT: %int_3.loc26_21: Core.IntLiteral = int_value 3 [concrete = constants.%int_3.1ba] // CHECK:STDOUT: %array_type.loc26: type = array_type %int_3.loc26_21, %i32.loc26 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %array_type = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %array_type = wrapper_binding a, %a.var // CHECK:STDOUT: %a.ref: ref %array_type = name_ref a, %a // CHECK:STDOUT: %int_0.loc30: Core.IntLiteral = int_value 0 [concrete = constants.%int_0.5c6] // CHECK:STDOUT: %impl.elem0.loc30: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] diff --git a/toolchain/check/testdata/index/fail_array_large_index.carbon b/toolchain/check/testdata/index/fail_array_large_index.carbon index 765a973d80df..a2eb8fc33047 100644 --- a/toolchain/check/testdata/index/fail_array_large_index.carbon +++ b/toolchain/check/testdata/index/fail_array_large_index.carbon @@ -119,21 +119,21 @@ var c: i32 = a[0x7FFF_FFFF]; // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %array_type: type = array_type %int_1, %i32.loc15 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %array_type = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %array_type = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] // CHECK:STDOUT: %i32.loc21: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: ref %i32 = ref_binding b, %b.var [concrete = %b.var] +// CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.6b6 = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.6b6 = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %i32 = var %c.var_patt [concrete] // CHECK:STDOUT: %i32.loc27: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %c: ref %i32 = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %i32 = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon b/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon index eb3b9213ede2..d7ed1e9fe9f0 100644 --- a/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon +++ b/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon @@ -106,14 +106,14 @@ var b: i32 = a[2.6]; // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1] // CHECK:STDOUT: %array_type: type = array_type %int_1, %i32.loc15 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %array_type = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %array_type = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] // CHECK:STDOUT: %i32.loc23: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: ref %i32 = ref_binding b, %b.var [concrete = %b.var] +// CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/index/fail_array_out_of_bound_access.carbon b/toolchain/check/testdata/index/fail_array_out_of_bound_access.carbon index 8ec0cb496182..d66a3687a990 100644 --- a/toolchain/check/testdata/index/fail_array_out_of_bound_access.carbon +++ b/toolchain/check/testdata/index/fail_array_out_of_bound_access.carbon @@ -105,14 +105,14 @@ var b: i32 = a[1]; // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %array_type: type = array_type %int_1, %i32.loc15 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %array_type = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %array_type = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] // CHECK:STDOUT: %i32.loc20: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: ref %i32 = ref_binding b, %b.var [concrete = %b.var] +// CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/index/fail_expr_category.carbon b/toolchain/check/testdata/index/fail_expr_category.carbon index 07223ec95c2d..711a0ea65089 100644 --- a/toolchain/check/testdata/index/fail_expr_category.carbon +++ b/toolchain/check/testdata/index/fail_expr_category.carbon @@ -154,7 +154,7 @@ fn G(b: array(i32, 3)) { // CHECK:STDOUT: %int_3: Core.IntLiteral = int_value 3 [concrete = constants.%int_3] // CHECK:STDOUT: %array_type: type = array_type %int_3, %i32.loc17 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %array_type = value_binding b, %b.param +// CHECK:STDOUT: %b: %array_type = wrapper_binding b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -190,7 +190,7 @@ fn G(b: array(i32, 3)) { // CHECK:STDOUT: %i32.loc23: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %ptr.loc23: type = ptr_type %i32.loc23 [concrete = constants.%ptr.d08] // CHECK:STDOUT: } -// CHECK:STDOUT: %pb: ref %ptr.d08 = ref_binding pb, %pb.var +// CHECK:STDOUT: %pb: ref %ptr.d08 = wrapper_binding pb, %pb.var // CHECK:STDOUT: %b.ref.loc28: %array_type = name_ref b, %b // CHECK:STDOUT: %int_0.loc28: Core.IntLiteral = int_value 0 [concrete = constants.%int_0.5c6] // CHECK:STDOUT: %impl.elem0.loc28_5: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] @@ -241,7 +241,7 @@ fn G(b: array(i32, 3)) { // CHECK:STDOUT: %i32.loc36: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %ptr.loc36: type = ptr_type %i32.loc36 [concrete = constants.%ptr.d08] // CHECK:STDOUT: } -// CHECK:STDOUT: %pf: ref %ptr.d08 = ref_binding pf, %pf.var +// CHECK:STDOUT: %pf: ref %ptr.d08 = wrapper_binding pf, %pf.var // CHECK:STDOUT: %F.ref.loc41: %F.type = name_ref F, file.%F.decl [concrete = constants.%F] // CHECK:STDOUT: %.loc41_5.1: ref %array_type = temporary_storage // CHECK:STDOUT: %F.call.loc41: init %array_type to %.loc41_5.1 = call %F.ref.loc41() diff --git a/toolchain/check/testdata/index/fail_invalid_base.carbon b/toolchain/check/testdata/index/fail_invalid_base.carbon index 9b9a752f82a7..e3772270483a 100644 --- a/toolchain/check/testdata/index/fail_invalid_base.carbon +++ b/toolchain/check/testdata/index/fail_invalid_base.carbon @@ -96,7 +96,7 @@ var d: i32 = {.a: i32, .b: i32}[0]; // CHECK:STDOUT: } // CHECK:STDOUT: %a.var: ref %i32 = var %a.var_patt [concrete] // CHECK:STDOUT: %i32.loc21: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: ref %i32 = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %i32 = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [concrete = constants.%F] {} {} // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt] @@ -104,21 +104,21 @@ var d: i32 = {.a: i32, .b: i32}[0]; // CHECK:STDOUT: } // CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] // CHECK:STDOUT: %i32.loc28: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: ref %i32 = ref_binding b, %b.var [concrete = %b.var] +// CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.6b6 = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.6b6 = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %i32 = var %c.var_patt [concrete] // CHECK:STDOUT: %i32.loc34: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %c: ref %i32 = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %i32 = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.6b6 = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.6b6 = var_pattern %d.patt [concrete = constants.%d.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %d.var: ref %i32 = var %d.var_patt [concrete] // CHECK:STDOUT: %i32.loc40: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %d: ref %i32 = ref_binding d, %d.var [concrete = %d.var] +// CHECK:STDOUT: %d: ref %i32 = wrapper_binding d, %d.var [concrete = %d.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(); diff --git a/toolchain/check/testdata/index/fail_name_not_found.carbon b/toolchain/check/testdata/index/fail_name_not_found.carbon index c237ea509367..1ee5918d70cc 100644 --- a/toolchain/check/testdata/index/fail_name_not_found.carbon +++ b/toolchain/check/testdata/index/fail_name_not_found.carbon @@ -72,7 +72,7 @@ fn Main() { // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [concrete = constants.%int_0] // CHECK:STDOUT: assign %b.var, // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: ref %i32 = ref_binding b, %b.var +// CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %b.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%b.var) // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/index/fail_negative_indexing.carbon b/toolchain/check/testdata/index/fail_negative_indexing.carbon index 9a0da5448142..bbd78489c25b 100644 --- a/toolchain/check/testdata/index/fail_negative_indexing.carbon +++ b/toolchain/check/testdata/index/fail_negative_indexing.carbon @@ -122,14 +122,14 @@ var d: i32 = c[-10]; // CHECK:STDOUT: %int_2: Core.IntLiteral = int_value 2 [concrete = constants.%int_2] // CHECK:STDOUT: %array_type: type = array_type %int_2, %i32.loc15 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %array_type = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %array_type = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.6b6 = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.6b6 = var_pattern %d.patt [concrete = constants.%d.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %d.var: ref %i32 = var %d.var_patt [concrete] // CHECK:STDOUT: %i32.loc20: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %d: ref %i32 = ref_binding d, %d.var [concrete = %d.var] +// CHECK:STDOUT: %d: ref %i32 = wrapper_binding d, %d.var [concrete = %d.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/interface/as_type.carbon b/toolchain/check/testdata/interface/as_type.carbon index 942771f9dbf5..b1b634f2d4b7 100644 --- a/toolchain/check/testdata/interface/as_type.carbon +++ b/toolchain/check/testdata/interface/as_type.carbon @@ -40,7 +40,7 @@ fn F(unused e: Empty) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %e.param: %Empty.type = value_param call_param0 // CHECK:STDOUT: %Empty.ref: type = name_ref Empty, file.%Empty.decl [concrete = constants.%Empty.type] -// CHECK:STDOUT: %e: %Empty.type = value_binding e, %e.param +// CHECK:STDOUT: %e: %Empty.type = wrapper_binding e, %e.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interface/as_type_of_type.carbon b/toolchain/check/testdata/interface/as_type_of_type.carbon index 5ffb63e70da9..23bec42eaeab 100644 --- a/toolchain/check/testdata/interface/as_type_of_type.carbon +++ b/toolchain/check/testdata/interface/as_type_of_type.carbon @@ -174,7 +174,7 @@ fn F(T:! Empty) { // CHECK:STDOUT: %.loc22_18.2: type = converted %T.ref, %T.as_type.loc22_18.1 [symbolic = %T.as_type.loc22_18.2 (constants.%T.as_type.22c)] // CHECK:STDOUT: %ptr.loc22_18.1: type = ptr_type %.loc22_18.2 [symbolic = %ptr.loc22_18.2 (constants.%ptr)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref @F.%ptr.loc22_18.2 (%ptr) = ref_binding x, %x.var +// CHECK:STDOUT: %x: ref @F.%ptr.loc22_18.2 (%ptr) = wrapper_binding x, %x.var // CHECK:STDOUT: %impl.elem0.loc22_3.1: @F.%.loc22_3.3 (%.0f5) = impl_witness_access constants.%Destroy.lookup_impl_witness, element0 [symbolic = %impl.elem0.loc22_3.2 (constants.%impl.elem0.584)] // CHECK:STDOUT: %bound_method.loc22_3.1: = bound_method %x.var, %impl.elem0.loc22_3.1 // CHECK:STDOUT: %Destroy.facet.loc22_3.1: %Destroy.type = facet_value constants.%ptr, (constants.%Destroy.lookup_impl_witness) [symbolic = %Destroy.facet.loc22_3.3 (constants.%Destroy.facet)] diff --git a/toolchain/check/testdata/interface/compound_member_access.carbon b/toolchain/check/testdata/interface/compound_member_access.carbon index dccb44f1e53f..4163e7d8cb06 100644 --- a/toolchain/check/testdata/interface/compound_member_access.carbon +++ b/toolchain/check/testdata/interface/compound_member_access.carbon @@ -613,7 +613,7 @@ fn Works() { // CHECK:STDOUT: %T.as_type.loc8_23.2: type = facet_access_type %T.ref [symbolic = %T.as_type.loc8_23.1 (constants.%T.as_type)] // CHECK:STDOUT: %.loc8_23.2: type = converted %T.ref, %T.as_type.loc8_23.2 [symbolic = %T.as_type.loc8_23.1 (constants.%T.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @Simple3.%T.as_type.loc8_23.1 (%T.as_type) = value_binding x, %x.param +// CHECK:STDOUT: %x: @Simple3.%T.as_type.loc8_23.1 (%T.as_type) = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %Compound3.decl: %Compound3.type = fn_decl @Compound3 [concrete = constants.%Compound3] { // CHECK:STDOUT: %V.patt.loc14_15.1: %pattern_type.583 = symbolic_binding_pattern V, 0 [symbolic = %V.patt.loc14_15.2 (constants.%V.patt)] @@ -631,7 +631,7 @@ fn Works() { // CHECK:STDOUT: %V.as_type.loc14_25.2: type = facet_access_type %V.ref [symbolic = %V.as_type.loc14_25.1 (constants.%V.as_type)] // CHECK:STDOUT: %.loc14_25.2: type = converted %V.ref, %V.as_type.loc14_25.2 [symbolic = %V.as_type.loc14_25.1 (constants.%V.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: @Compound3.%V.as_type.loc14_25.1 (%V.as_type) = value_binding y, %y.param +// CHECK:STDOUT: %y: @Compound3.%V.as_type.loc14_25.1 (%V.as_type) = wrapper_binding y, %y.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -855,7 +855,7 @@ fn Works() { // CHECK:STDOUT: %T.as_type.loc9_23.2: type = facet_access_type %T.ref.loc9_23 [symbolic = %T.as_type.loc9_23.1 (constants.%T.as_type)] // CHECK:STDOUT: %.loc9_23.2: type = converted %T.ref.loc9_23, %T.as_type.loc9_23.2 [symbolic = %T.as_type.loc9_23.1 (constants.%T.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: @Simple4.%T.as_type.loc9_23.1 (%T.as_type) = value_binding x, %x.param +// CHECK:STDOUT: %x: @Simple4.%T.as_type.loc9_23.1 (%T.as_type) = wrapper_binding x, %x.param // CHECK:STDOUT: %p.param: @Simple4.%ptr.loc9_30.1 (%ptr.ed22b9.1) = value_param call_param1 // CHECK:STDOUT: %.loc9_30.1: type = splice_block %ptr.loc9_30.2 [symbolic = %ptr.loc9_30.1 (constants.%ptr.ed22b9.1)] { // CHECK:STDOUT: %T.ref.loc9_29: %L1.type = name_ref T, %T.loc9_13.2 [symbolic = %T.loc9_13.1 (constants.%T)] @@ -863,7 +863,7 @@ fn Works() { // CHECK:STDOUT: %.loc9_30.2: type = converted %T.ref.loc9_29, %T.as_type.loc9_30 [symbolic = %T.as_type.loc9_23.1 (constants.%T.as_type)] // CHECK:STDOUT: %ptr.loc9_30.2: type = ptr_type %.loc9_30.2 [symbolic = %ptr.loc9_30.1 (constants.%ptr.ed22b9.1)] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: @Simple4.%ptr.loc9_30.1 (%ptr.ed22b9.1) = value_binding p, %p.param +// CHECK:STDOUT: %p: @Simple4.%ptr.loc9_30.1 (%ptr.ed22b9.1) = wrapper_binding p, %p.param // CHECK:STDOUT: } // CHECK:STDOUT: %Compound4.decl: %Compound4.type = fn_decl @Compound4 [concrete = constants.%Compound4] { // CHECK:STDOUT: %V.patt.loc15_15.1: %pattern_type.b7b = symbolic_binding_pattern V, 0 [symbolic = %V.patt.loc15_15.2 (constants.%V.patt)] @@ -883,7 +883,7 @@ fn Works() { // CHECK:STDOUT: %V.as_type.loc15_25.2: type = facet_access_type %V.ref.loc15_25 [symbolic = %V.as_type.loc15_25.1 (constants.%V.as_type)] // CHECK:STDOUT: %.loc15_25.2: type = converted %V.ref.loc15_25, %V.as_type.loc15_25.2 [symbolic = %V.as_type.loc15_25.1 (constants.%V.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: @Compound4.%V.as_type.loc15_25.1 (%V.as_type) = value_binding y, %y.param +// CHECK:STDOUT: %y: @Compound4.%V.as_type.loc15_25.1 (%V.as_type) = wrapper_binding y, %y.param // CHECK:STDOUT: %p.param: @Compound4.%ptr.loc15_32.1 (%ptr.ed22b9.2) = value_param call_param1 // CHECK:STDOUT: %.loc15_32.1: type = splice_block %ptr.loc15_32.2 [symbolic = %ptr.loc15_32.1 (constants.%ptr.ed22b9.2)] { // CHECK:STDOUT: %V.ref.loc15_31: %L1.type = name_ref V, %V.loc15_15.2 [symbolic = %V.loc15_15.1 (constants.%V)] @@ -891,7 +891,7 @@ fn Works() { // CHECK:STDOUT: %.loc15_32.2: type = converted %V.ref.loc15_31, %V.as_type.loc15_32 [symbolic = %V.as_type.loc15_25.1 (constants.%V.as_type)] // CHECK:STDOUT: %ptr.loc15_32.2: type = ptr_type %.loc15_32.2 [symbolic = %ptr.loc15_32.1 (constants.%ptr.ed22b9.2)] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: @Compound4.%ptr.loc15_32.1 (%ptr.ed22b9.2) = value_binding p, %p.param +// CHECK:STDOUT: %p: @Compound4.%ptr.loc15_32.1 (%ptr.ed22b9.2) = wrapper_binding p, %p.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -910,7 +910,7 @@ fn Works() { // CHECK:STDOUT: %Self.as_type.loc4_9.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc4_9.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc4_9.2: type = converted %Self.ref, %Self.as_type.loc4_9.2 [symbolic = %Self.as_type.loc4_9.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @L1.WithSelf.R1.%Self.as_type.loc4_9.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @L1.WithSelf.R1.%Self.as_type.loc4_9.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0: %L1.assoc_type = assoc_entity element0, %L1.WithSelf.R1.decl [concrete = constants.%assoc0] // CHECK:STDOUT: %L1.WithSelf.S1.decl: @L1.WithSelf.%L1.WithSelf.S1.type (%L1.WithSelf.S1.type.ff3) = fn_decl @L1.WithSelf.S1 [symbolic = @L1.WithSelf.%L1.WithSelf.S1 (constants.%L1.WithSelf.S1.11f)] { @@ -923,7 +923,7 @@ fn Works() { // CHECK:STDOUT: %Self.as_type.loc5_13.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc5_13.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc5_13.2: type = converted %Self.ref, %Self.as_type.loc5_13.2 [symbolic = %Self.as_type.loc5_13.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: ref @L1.WithSelf.S1.%Self.as_type.loc5_13.1 (%Self.as_type) = ref_binding self, %self.param +// CHECK:STDOUT: %self: ref @L1.WithSelf.S1.%Self.as_type.loc5_13.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc1: %L1.assoc_type = assoc_entity element1, %L1.WithSelf.S1.decl [concrete = constants.%assoc1] // CHECK:STDOUT: @@ -1251,7 +1251,7 @@ fn Works() { // CHECK:STDOUT: %Self.as_type.loc5_9.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc5_9.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc5_9.2: type = converted %Self.ref, %Self.as_type.loc5_9.2 [symbolic = %Self.as_type.loc5_9.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @L2.WithSelf.R2.%Self.as_type.loc5_9.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @L2.WithSelf.R2.%Self.as_type.loc5_9.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0: %L2.assoc_type = assoc_entity element0, %L2.WithSelf.R2.decl [concrete = constants.%assoc0] // CHECK:STDOUT: %L2.WithSelf.S2.decl: @L2.WithSelf.%L2.WithSelf.S2.type (%L2.WithSelf.S2.type.51d) = fn_decl @L2.WithSelf.S2 [symbolic = @L2.WithSelf.%L2.WithSelf.S2 (constants.%L2.WithSelf.S2.a11)] { @@ -1264,7 +1264,7 @@ fn Works() { // CHECK:STDOUT: %Self.as_type.loc6_13.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc6_13.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc6_13.2: type = converted %Self.ref, %Self.as_type.loc6_13.2 [symbolic = %Self.as_type.loc6_13.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: ref @L2.WithSelf.S2.%Self.as_type.loc6_13.1 (%Self.as_type) = ref_binding self, %self.param +// CHECK:STDOUT: %self: ref @L2.WithSelf.S2.%Self.as_type.loc6_13.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc1: %L2.assoc_type = assoc_entity element1, %L2.WithSelf.S2.decl [concrete = constants.%assoc1] // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interface/default_fn.carbon b/toolchain/check/testdata/interface/default_fn.carbon index 552bac53ac29..331f77bfc574 100644 --- a/toolchain/check/testdata/interface/default_fn.carbon +++ b/toolchain/check/testdata/interface/default_fn.carbon @@ -99,7 +99,7 @@ class C { // CHECK:STDOUT: %Self.as_type.loc18_17.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc18_17.1 (constants.%Self.as_type.0fa)] // CHECK:STDOUT: %.loc18_17.2: type = converted %Self.ref, %Self.as_type.loc18_17.2 [symbolic = %Self.as_type.loc18_17.1 (constants.%Self.as_type.0fa)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @I.WithSelf.F.%Self.as_type.loc18_17.1 (%Self.as_type.0fa) = value_binding self, %self.param +// CHECK:STDOUT: %self: @I.WithSelf.F.%Self.as_type.loc18_17.1 (%Self.as_type.0fa) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0: %I.assoc_type = assoc_entity element0, %I.WithSelf.F.decl [concrete = constants.%assoc0.08d] // CHECK:STDOUT: @@ -122,7 +122,7 @@ class C { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %C = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @C.as.I.impl.%C.ref [concrete = constants.%C] -// CHECK:STDOUT: %self: %C = value_binding self, %self.param +// CHECK:STDOUT: %self: %C = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %I.impl_witness_table = impl_witness_table (%C.as.I.impl.F.decl), @C.as.I.impl [concrete] // CHECK:STDOUT: %I.impl_witness: = impl_witness %I.impl_witness_table [concrete = constants.%I.impl_witness] @@ -170,7 +170,7 @@ class C { // CHECK:STDOUT: %.loc20_7: init %C = converted %.loc20_19.1, %.loc20_19.2 [concrete = constants.%C.val] // CHECK:STDOUT: assign %c.var, %.loc20_7 // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var // CHECK:STDOUT: %c.ref: ref %C = name_ref c, %c // CHECK:STDOUT: %I.ref: type = name_ref I, @C.%I.decl [concrete = constants.%I.type] // CHECK:STDOUT: %F.ref: %I.assoc_type = name_ref F, @I.WithSelf.%assoc0 [concrete = constants.%assoc0.08d] diff --git a/toolchain/check/testdata/interface/export_name.carbon b/toolchain/check/testdata/interface/export_name.carbon index fff939094bd9..91290937b683 100644 --- a/toolchain/check/testdata/interface/export_name.carbon +++ b/toolchain/check/testdata/interface/export_name.carbon @@ -128,7 +128,7 @@ fn UseEmpty(unused i: I) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %i.param: %I.type = value_param call_param0 // CHECK:STDOUT: %I.ref: type = name_ref I, imports.%Main.I [concrete = constants.%I.type] -// CHECK:STDOUT: %i: %I.type = value_binding i, %i.param +// CHECK:STDOUT: %i: %I.type = wrapper_binding i, %i.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interface/fail_assoc_fn_invalid_use.carbon b/toolchain/check/testdata/interface/fail_assoc_fn_invalid_use.carbon index 1b8e3ffef58f..154c680e1e08 100644 --- a/toolchain/check/testdata/interface/fail_assoc_fn_invalid_use.carbon +++ b/toolchain/check/testdata/interface/fail_assoc_fn_invalid_use.carbon @@ -90,7 +90,7 @@ fn Use(T:! I) { // CHECK:STDOUT: %Self.as_type.loc5_8.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc5_8.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc5_8.2: type = converted %Self.ref, %Self.as_type.loc5_8.2 [symbolic = %Self.as_type.loc5_8.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @I.WithSelf.F.%Self.as_type.loc5_8.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @I.WithSelf.F.%Self.as_type.loc5_8.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0: %I.assoc_type = assoc_entity element0, %I.WithSelf.F.decl [concrete = constants.%assoc0] // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interface/fail_duplicate.carbon b/toolchain/check/testdata/interface/fail_duplicate.carbon index ae89022be3d0..9fbc77449a51 100644 --- a/toolchain/check/testdata/interface/fail_duplicate.carbon +++ b/toolchain/check/testdata/interface/fail_duplicate.carbon @@ -184,7 +184,7 @@ interface Class { } // CHECK:STDOUT: %Self.as_type.loc14_8.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc14_8.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc14_8.2: type = converted %Self.ref, %Self.as_type.loc14_8.2 [symbolic = %Self.as_type.loc14_8.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @Interface.WithSelf.F.%Self.as_type.loc14_8.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @Interface.WithSelf.F.%Self.as_type.loc14_8.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0: %Interface.assoc_type = assoc_entity element0, %Interface.WithSelf.F.decl [concrete = constants.%assoc0] // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interface/fail_lookup_in_type_type.carbon b/toolchain/check/testdata/interface/fail_lookup_in_type_type.carbon index 2bca72a81021..41c02dc26e0c 100644 --- a/toolchain/check/testdata/interface/fail_lookup_in_type_type.carbon +++ b/toolchain/check/testdata/interface/fail_lookup_in_type_type.carbon @@ -47,7 +47,7 @@ let U: (type where .Self impls type).missing = {}; // CHECK:STDOUT: %T.patt: = value_binding_pattern T [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc8: type = type_literal type [concrete = type] -// CHECK:STDOUT: %T: = value_binding T, [concrete = ] +// CHECK:STDOUT: %T: = wrapper_binding T, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -86,7 +86,7 @@ let U: (type where .Self impls type).missing = {}; // CHECK:STDOUT: } // CHECK:STDOUT: %missing.ref: = name_ref missing, [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %U: = value_binding U, [concrete = ] +// CHECK:STDOUT: %U: = wrapper_binding U, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/interface/fail_member_lookup.carbon b/toolchain/check/testdata/interface/fail_member_lookup.carbon index 874722fc829a..6cd6eee9a078 100644 --- a/toolchain/check/testdata/interface/fail_member_lookup.carbon +++ b/toolchain/check/testdata/interface/fail_member_lookup.carbon @@ -163,7 +163,7 @@ fn G(U:! Different) -> U.(Interface.T); // CHECK:STDOUT: %T.ref: %Interface.assoc_type = name_ref T, @T.%assoc1 [concrete = constants.%assoc1] // CHECK:STDOUT: %.loc23: type = converted %T.ref, [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: ref = ref_binding v, [concrete = ] +// CHECK:STDOUT: %v: = wrapper_binding v, [concrete = ] // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interface/fail_modifiers.carbon b/toolchain/check/testdata/interface/fail_modifiers.carbon index 75ad846d6789..70a7cb763cd9 100644 --- a/toolchain/check/testdata/interface/fail_modifiers.carbon +++ b/toolchain/check/testdata/interface/fail_modifiers.carbon @@ -199,7 +199,7 @@ interface I { // CHECK:STDOUT: %Self.as_type.loc9_16.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc9_16.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc9_16.2: type = converted %Self.ref, %Self.as_type.loc9_16.2 [symbolic = %Self.as_type.loc9_16.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @I.WithSelf.F.%Self.as_type.loc9_16.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @I.WithSelf.F.%Self.as_type.loc9_16.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0: %I.assoc_type = assoc_entity element0, %I.WithSelf.F.decl [concrete = constants.%assoc0] // CHECK:STDOUT: @@ -268,7 +268,7 @@ interface I { // CHECK:STDOUT: %Self.as_type.loc9_18.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc9_18.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc9_18.2: type = converted %Self.ref, %Self.as_type.loc9_18.2 [symbolic = %Self.as_type.loc9_18.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @I.WithSelf.F.%Self.as_type.loc9_18.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @I.WithSelf.F.%Self.as_type.loc9_18.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0: %I.assoc_type = assoc_entity element0, %I.WithSelf.F.decl [concrete = constants.%assoc0] // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interface/fail_todo_define_default_fn_inline.carbon b/toolchain/check/testdata/interface/fail_todo_define_default_fn_inline.carbon index f5b443788d79..a3cced1bc30b 100644 --- a/toolchain/check/testdata/interface/fail_todo_define_default_fn_inline.carbon +++ b/toolchain/check/testdata/interface/fail_todo_define_default_fn_inline.carbon @@ -89,10 +89,10 @@ interface Interface { // CHECK:STDOUT: %.loc26: Core.Form = init_form %i32.loc26_35 [concrete = constants.%.795] // CHECK:STDOUT: %a.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc26_19: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %i32 = value_param call_param1 // CHECK:STDOUT: %i32.loc26_27: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: %i32 = value_binding b, %b.param +// CHECK:STDOUT: %b: %i32 = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param2 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/interface/fail_todo_define_default_fn_out_of_line.carbon b/toolchain/check/testdata/interface/fail_todo_define_default_fn_out_of_line.carbon index b0d6e8a805c4..61c09bc4561e 100644 --- a/toolchain/check/testdata/interface/fail_todo_define_default_fn_out_of_line.carbon +++ b/toolchain/check/testdata/interface/fail_todo_define_default_fn_out_of_line.carbon @@ -110,10 +110,10 @@ fn Interface.C.F(unused self, U:! type, u: U*) -> U* { return u; } // CHECK:STDOUT: %.loc18: Core.Form = init_form %i32.loc18_35 [concrete = constants.%.795] // CHECK:STDOUT: %a.param.loc18: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc18_19: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a.loc18: %i32 = value_binding a, %a.param.loc18 +// CHECK:STDOUT: %a.loc18: %i32 = wrapper_binding a, %a.param.loc18 // CHECK:STDOUT: %b.param.loc18: %i32 = value_param call_param1 // CHECK:STDOUT: %i32.loc18_27: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b.loc18: %i32 = value_binding b, %b.param.loc18 +// CHECK:STDOUT: %b.loc18: %i32 = wrapper_binding b, %b.param.loc18 // CHECK:STDOUT: %return.param.loc18: ref %i32 = out_param call_param2 // CHECK:STDOUT: %return.loc18: ref %i32 = return_slot %return.param.loc18 // CHECK:STDOUT: } @@ -138,10 +138,10 @@ fn Interface.C.F(unused self, U:! type, u: U*) -> U* { return u; } // CHECK:STDOUT: %.loc13: Core.Form = init_form %i32.loc13_35 [concrete = constants.%.795] // CHECK:STDOUT: %a.param.loc13: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc13_19: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a.loc13: %i32 = value_binding a, %a.param.loc13 +// CHECK:STDOUT: %a.loc13: %i32 = wrapper_binding a, %a.param.loc13 // CHECK:STDOUT: %b.param.loc13: %i32 = value_param call_param1 // CHECK:STDOUT: %i32.loc13_27: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b.loc13: %i32 = value_binding b, %b.param.loc13 +// CHECK:STDOUT: %b.loc13: %i32 = wrapper_binding b, %b.param.loc13 // CHECK:STDOUT: %return.param.loc13: ref %i32 = out_param call_param2 // CHECK:STDOUT: %return.loc13: ref %i32 = return_slot %return.param.loc13 // CHECK:STDOUT: } @@ -247,7 +247,7 @@ fn Interface.C.F(unused self, U:! type, u: U*) -> U* { return u; } // CHECK:STDOUT: %.loc20_25.2: type = specific_constant constants.%C, @C(constants.%Self.3ce) [symbolic = %C (constants.%C)] // CHECK:STDOUT: %Self.ref.loc20: type = name_ref Self, %.loc20_25.2 [symbolic = %C (constants.%C)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self.loc20: @C.F.%C (%C) = value_binding self, %self.param.loc20 +// CHECK:STDOUT: %self.loc20: @C.F.%C (%C) = wrapper_binding self, %self.param.loc20 // CHECK:STDOUT: %.loc20_35.1: type = splice_block %.loc20_35.2 [concrete = type] { // CHECK:STDOUT: %.Self.loc20: %type = symbolic_binding .Self [symbolic_self = constants.%.Self] // CHECK:STDOUT: %.loc20_35.2: type = type_literal type [concrete = type] @@ -258,7 +258,7 @@ fn Interface.C.F(unused self, U:! type, u: U*) -> U* { return u; } // CHECK:STDOUT: %U.ref.loc20_44: type = name_ref U, %U.loc20 [symbolic = %U.loc14_17.1 (constants.%U.091)] // CHECK:STDOUT: %ptr.loc20_45: type = ptr_type %U.ref.loc20_44 [symbolic = %ptr.loc14_30.1 (constants.%ptr.18e)] // CHECK:STDOUT: } -// CHECK:STDOUT: %u.loc20: @C.F.%ptr.loc14_30.1 (%ptr.18e) = value_binding u, %u.param.loc20 +// CHECK:STDOUT: %u.loc20: @C.F.%ptr.loc14_30.1 (%ptr.18e) = wrapper_binding u, %u.param.loc20 // CHECK:STDOUT: %return.param.loc20: ref @C.F.%ptr.loc14_30.1 (%ptr.18e) = out_param call_param2 // CHECK:STDOUT: %return.loc20: ref @C.F.%ptr.loc14_30.1 (%ptr.18e) = return_slot %return.param.loc20 // CHECK:STDOUT: } @@ -303,7 +303,7 @@ fn Interface.C.F(unused self, U:! type, u: U*) -> U* { return u; } // CHECK:STDOUT: %.loc14_10.2: type = specific_constant constants.%C, @C(constants.%Self.3ce) [symbolic = %C (constants.%C)] // CHECK:STDOUT: %Self.ref.loc14: type = name_ref Self, %.loc14_10.2 [symbolic = %C (constants.%C)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self.loc14: @C.F.%C (%C) = value_binding self, %self.param.loc14 +// CHECK:STDOUT: %self.loc14: @C.F.%C (%C) = wrapper_binding self, %self.param.loc14 // CHECK:STDOUT: %.loc14_20.1: type = splice_block %.loc14_20.2 [concrete = type] { // CHECK:STDOUT: %.Self.loc14: %type = symbolic_binding .Self [symbolic_self = constants.%.Self] // CHECK:STDOUT: %.loc14_20.2: type = type_literal type [concrete = type] @@ -314,7 +314,7 @@ fn Interface.C.F(unused self, U:! type, u: U*) -> U* { return u; } // CHECK:STDOUT: %U.ref.loc14_29: type = name_ref U, %U.loc14_17.2 [symbolic = %U.loc14_17.1 (constants.%U.091)] // CHECK:STDOUT: %ptr.loc14_30.2: type = ptr_type %U.ref.loc14_29 [symbolic = %ptr.loc14_30.1 (constants.%ptr.18e)] // CHECK:STDOUT: } -// CHECK:STDOUT: %u.loc14: @C.F.%ptr.loc14_30.1 (%ptr.18e) = value_binding u, %u.param.loc14 +// CHECK:STDOUT: %u.loc14: @C.F.%ptr.loc14_30.1 (%ptr.18e) = wrapper_binding u, %u.param.loc14 // CHECK:STDOUT: %return.param.loc14: ref @C.F.%ptr.loc14_30.1 (%ptr.18e) = out_param call_param2 // CHECK:STDOUT: %return.loc14: ref @C.F.%ptr.loc14_30.1 (%ptr.18e) = return_slot %return.param.loc14 // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/interface/generic_method.carbon b/toolchain/check/testdata/interface/generic_method.carbon index d9c308d612b2..701be413879e 100644 --- a/toolchain/check/testdata/interface/generic_method.carbon +++ b/toolchain/check/testdata/interface/generic_method.carbon @@ -370,7 +370,7 @@ fn CallIndirect() { // CHECK:STDOUT: %U.ref.loc6_21: type = name_ref U, %U.loc6_9.2 [symbolic = %U.loc6_9.1 (constants.%U.4e7)] // CHECK:STDOUT: %ptr.loc6_22.2: type = ptr_type %U.ref.loc6_21 [symbolic = %ptr.loc6_22.1 (constants.%ptr.8f6)] // CHECK:STDOUT: } -// CHECK:STDOUT: %u: @A.WithSelf.F.%ptr.loc6_22.1 (%ptr.8f6) = value_binding u, %u.param +// CHECK:STDOUT: %u: @A.WithSelf.F.%ptr.loc6_22.1 (%ptr.8f6) = wrapper_binding u, %u.param // CHECK:STDOUT: %return.param: ref @A.WithSelf.F.%tuple.type.loc6_40.2 (%tuple.type.640) = out_param call_param1 // CHECK:STDOUT: %return: ref @A.WithSelf.F.%tuple.type.loc6_40.2 (%tuple.type.640) = return_slot %return.param // CHECK:STDOUT: } @@ -414,7 +414,7 @@ fn CallIndirect() { // CHECK:STDOUT: %U.ref.loc16_21: type = name_ref U, %U.loc16_9.2 [symbolic = %U.loc16_9.1 (constants.%U.67d)] // CHECK:STDOUT: %ptr.loc16_22.2: type = ptr_type %U.ref.loc16_21 [symbolic = %ptr.loc16_22.1 (constants.%ptr.e8f8f9.1)] // CHECK:STDOUT: } -// CHECK:STDOUT: %u: @Y.as.A.impl.F.%ptr.loc16_22.1 (%ptr.e8f8f9.1) = value_binding u, %u.param +// CHECK:STDOUT: %u: @Y.as.A.impl.F.%ptr.loc16_22.1 (%ptr.e8f8f9.1) = wrapper_binding u, %u.param // CHECK:STDOUT: %return.param: ref @Y.as.A.impl.F.%tuple.type.loc16 (%tuple.type.316) = out_param call_param1 // CHECK:STDOUT: %return: ref @Y.as.A.impl.F.%tuple.type.loc16 (%tuple.type.316) = return_slot %return.param // CHECK:STDOUT: } @@ -546,7 +546,7 @@ fn CallIndirect() { // CHECK:STDOUT: %T.as.DefaultOrUnformed.impl.Op.call: init %Z to %.loc22_3 = call %T.as.DefaultOrUnformed.impl.Op.specific_fn() // CHECK:STDOUT: assign %u.var, %T.as.DefaultOrUnformed.impl.Op.call // CHECK:STDOUT: %Z.ref.loc22: type = name_ref Z, file.%Z.decl [concrete = constants.%Z] -// CHECK:STDOUT: %u: ref %Z = ref_binding u, %u.var +// CHECK:STDOUT: %u: ref %Z = wrapper_binding u, %u.var // CHECK:STDOUT: %Y.ref: type = name_ref Y, file.%Y.decl [concrete = constants.%Y] // CHECK:STDOUT: %A.ref: %A.type.55a = name_ref A, file.%A.decl [concrete = constants.%A.generic] // CHECK:STDOUT: %X.ref: type = name_ref X, file.%X.decl [concrete = constants.%X] @@ -633,7 +633,7 @@ fn CallIndirect() { // CHECK:STDOUT: %T.as.DefaultOrUnformed.impl.Op.call: init %Z to %.loc27_3 = call %T.as.DefaultOrUnformed.impl.Op.specific_fn() // CHECK:STDOUT: assign %u.var, %T.as.DefaultOrUnformed.impl.Op.call // CHECK:STDOUT: %Z.ref.loc27: type = name_ref Z, file.%Z.decl [concrete = constants.%Z] -// CHECK:STDOUT: %u: ref %Z = ref_binding u, %u.var +// CHECK:STDOUT: %u: ref %Z = wrapper_binding u, %u.var // CHECK:STDOUT: %T.ref: %facet_type = name_ref T, %T.loc26_17.2 [symbolic = %T.loc26_17.1 (constants.%T.5b7)] // CHECK:STDOUT: %T.as_type.loc28_4.1: type = facet_access_type %T.ref [symbolic = %T.as_type.loc28_4.2 (constants.%T.as_type.0af)] // CHECK:STDOUT: %.loc28_4.1: type = converted %T.ref, %T.as_type.loc28_4.1 [symbolic = %T.as_type.loc28_4.2 (constants.%T.as_type.0af)] @@ -1174,7 +1174,7 @@ fn CallIndirect() { // CHECK:STDOUT: %U.loc6_9.2: type = symbolic_binding U, 2 [symbolic = %U.loc6_9.1 (constants.%U.4e7)] // CHECK:STDOUT: %u.param: @A.WithSelf.F.%U.loc6_9.1 (%U.4e7) = value_param call_param0 // CHECK:STDOUT: %U.ref.loc6_21: type = name_ref U, %U.loc6_9.2 [symbolic = %U.loc6_9.1 (constants.%U.4e7)] -// CHECK:STDOUT: %u: @A.WithSelf.F.%U.loc6_9.1 (%U.4e7) = value_binding u, %u.param +// CHECK:STDOUT: %u: @A.WithSelf.F.%U.loc6_9.1 (%U.4e7) = wrapper_binding u, %u.param // CHECK:STDOUT: %return.param: ref @A.WithSelf.F.%tuple.type.loc6_38.2 (%tuple.type.d73) = out_param call_param1 // CHECK:STDOUT: %return: ref @A.WithSelf.F.%tuple.type.loc6_38.2 (%tuple.type.d73) = return_slot %return.param // CHECK:STDOUT: } @@ -1235,7 +1235,7 @@ fn CallIndirect() { // CHECK:STDOUT: %U.loc17_9.2: type = symbolic_binding U, 3 [symbolic = %U.loc17_9.1 (constants.%U.ce4)] // CHECK:STDOUT: %u.param: @tuple.type.as.A.impl.F.%U.loc17_9.1 (%U.ce4) = value_param call_param0 // CHECK:STDOUT: %U.ref.loc17_21: type = name_ref U, %U.loc17_9.2 [symbolic = %U.loc17_9.1 (constants.%U.ce4)] -// CHECK:STDOUT: %u: @tuple.type.as.A.impl.F.%U.loc17_9.1 (%U.ce4) = value_binding u, %u.param +// CHECK:STDOUT: %u: @tuple.type.as.A.impl.F.%U.loc17_9.1 (%U.ce4) = wrapper_binding u, %u.param // CHECK:STDOUT: %return.param: ref @tuple.type.as.A.impl.F.%tuple.type.loc17_42.2 (%tuple.type.897) = out_param call_param1 // CHECK:STDOUT: %return: ref @tuple.type.as.A.impl.F.%tuple.type.loc17_42.2 (%tuple.type.897) = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/interface/import.carbon b/toolchain/check/testdata/interface/import.carbon index 6d5a11f7e263..20ed5c684e60 100644 --- a/toolchain/check/testdata/interface/import.carbon +++ b/toolchain/check/testdata/interface/import.carbon @@ -118,7 +118,7 @@ var f: ForwardDeclared* = &f_ref.f; // CHECK:STDOUT: %ForwardDeclared.ref: type = name_ref ForwardDeclared, %ForwardDeclared.decl [concrete = constants.%ForwardDeclared.type] // CHECK:STDOUT: %struct_type.f: type = struct_type {.f: %ForwardDeclared.type} [concrete = constants.%struct_type.f] // CHECK:STDOUT: } -// CHECK:STDOUT: %f_ref: ref %struct_type.f = ref_binding f_ref, %f_ref.var [concrete = %f_ref.var] +// CHECK:STDOUT: %f_ref: ref %struct_type.f = wrapper_binding f_ref, %f_ref.var [concrete = %f_ref.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Empty { @@ -323,7 +323,7 @@ var f: ForwardDeclared* = &f_ref.f; // CHECK:STDOUT: } { // CHECK:STDOUT: %e.param: %Empty.type = value_param call_param0 // CHECK:STDOUT: %Empty.ref: type = name_ref Empty, imports.%Main.Empty [concrete = constants.%Empty.type] -// CHECK:STDOUT: %e: %Empty.type = value_binding e, %e.param +// CHECK:STDOUT: %e: %Empty.type = wrapper_binding e, %e.param // CHECK:STDOUT: } // CHECK:STDOUT: %UseBasic.decl: %UseBasic.type = fn_decl @UseBasic [concrete = constants.%UseBasic] { // CHECK:STDOUT: %e.param_patt: %pattern_type.7fe = value_param_pattern [concrete = constants.%e.param_patt.7a3] @@ -331,7 +331,7 @@ var f: ForwardDeclared* = &f_ref.f; // CHECK:STDOUT: } { // CHECK:STDOUT: %e.param: %Basic.type = value_param call_param0 // CHECK:STDOUT: %Basic.ref: type = name_ref Basic, imports.%Main.Basic [concrete = constants.%Basic.type] -// CHECK:STDOUT: %e: %Basic.type = value_binding e, %e.param +// CHECK:STDOUT: %e: %Basic.type = wrapper_binding e, %e.param // CHECK:STDOUT: } // CHECK:STDOUT: %UseForwardDeclared.decl: %UseForwardDeclared.type = fn_decl @UseForwardDeclared [concrete = constants.%UseForwardDeclared] { // CHECK:STDOUT: %f.param_patt: %pattern_type.566 = value_param_pattern [concrete = constants.%f.param_patt] @@ -339,7 +339,7 @@ var f: ForwardDeclared* = &f_ref.f; // CHECK:STDOUT: } { // CHECK:STDOUT: %f.param: %ForwardDeclared.type = value_param call_param0 // CHECK:STDOUT: %ForwardDeclared.ref: type = name_ref ForwardDeclared, imports.%Main.ForwardDeclared [concrete = constants.%ForwardDeclared.type] -// CHECK:STDOUT: %f: %ForwardDeclared.type = value_binding f, %f.param +// CHECK:STDOUT: %f: %ForwardDeclared.type = wrapper_binding f, %f.param // CHECK:STDOUT: } // CHECK:STDOUT: %Basic.ref.loc10: type = name_ref Basic, imports.%Main.Basic [concrete = constants.%Basic.type] // CHECK:STDOUT: %T.ref.loc10: %Basic.assoc_type = name_ref T, imports.%Main.import_ref.5b8 [concrete = constants.%assoc0.2b3] @@ -362,7 +362,7 @@ var f: ForwardDeclared* = &f_ref.f; // CHECK:STDOUT: %ForwardDeclared.ref.loc16: type = name_ref ForwardDeclared, imports.%Main.ForwardDeclared [concrete = constants.%ForwardDeclared.type] // CHECK:STDOUT: %ptr: type = ptr_type %ForwardDeclared.ref.loc16 [concrete = constants.%ptr.b71] // CHECK:STDOUT: } -// CHECK:STDOUT: %f: ref %ptr.b71 = ref_binding f, %f.var [concrete = %f.var] +// CHECK:STDOUT: %f: ref %ptr.b71 = wrapper_binding f, %f.var [concrete = %f.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Empty [from "a.carbon"] { diff --git a/toolchain/check/testdata/interface/import_access.carbon b/toolchain/check/testdata/interface/import_access.carbon index bd8a54545163..cef997c94087 100644 --- a/toolchain/check/testdata/interface/import_access.carbon +++ b/toolchain/check/testdata/interface/import_access.carbon @@ -243,7 +243,7 @@ private interface Redecl {} // CHECK:STDOUT: } { // CHECK:STDOUT: %i.param: %Def.type = value_param call_param0 // CHECK:STDOUT: %Def.ref: type = name_ref Def, imports.%Test.Def [concrete = constants.%Def.type] -// CHECK:STDOUT: %i: %Def.type = value_binding i, %i.param +// CHECK:STDOUT: %i: %Def.type = wrapper_binding i, %i.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -283,7 +283,7 @@ private interface Redecl {} // CHECK:STDOUT: } { // CHECK:STDOUT: %i.param: = value_param call_param0 // CHECK:STDOUT: %Def.ref: = name_ref Def, [concrete = ] -// CHECK:STDOUT: %i: = value_binding i, [concrete = ] +// CHECK:STDOUT: %i: = wrapper_binding i, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -321,7 +321,7 @@ private interface Redecl {} // CHECK:STDOUT: %Test.ref: = name_ref Test, imports.%Test [concrete = imports.%Test] // CHECK:STDOUT: %Def.ref: = name_ref Def, [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %i: = value_binding i, [concrete = ] +// CHECK:STDOUT: %i: = wrapper_binding i, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -360,7 +360,7 @@ private interface Redecl {} // CHECK:STDOUT: } { // CHECK:STDOUT: %i.param: %ForwardWithDef.type = value_param call_param0 // CHECK:STDOUT: %ForwardWithDef.ref: type = name_ref ForwardWithDef, imports.%Test.ForwardWithDef [concrete = constants.%ForwardWithDef.type] -// CHECK:STDOUT: %i: %ForwardWithDef.type = value_binding i, %i.param +// CHECK:STDOUT: %i: %ForwardWithDef.type = wrapper_binding i, %i.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -400,7 +400,7 @@ private interface Redecl {} // CHECK:STDOUT: } { // CHECK:STDOUT: %i.param: = value_param call_param0 // CHECK:STDOUT: %ForwardWithDef.ref: = name_ref ForwardWithDef, [concrete = ] -// CHECK:STDOUT: %i: = value_binding i, [concrete = ] +// CHECK:STDOUT: %i: = wrapper_binding i, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -438,7 +438,7 @@ private interface Redecl {} // CHECK:STDOUT: %Test.ref: = name_ref Test, imports.%Test [concrete = imports.%Test] // CHECK:STDOUT: %ForwardWithDef.ref: = name_ref ForwardWithDef, [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %i: = value_binding i, [concrete = ] +// CHECK:STDOUT: %i: = wrapper_binding i, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -472,7 +472,7 @@ private interface Redecl {} // CHECK:STDOUT: %Forward.ref: = name_ref Forward, [concrete = ] // CHECK:STDOUT: %ptr: type = ptr_type [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %i: = value_binding i, [concrete = ] +// CHECK:STDOUT: %i: = wrapper_binding i, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: %Forward.decl: type = interface_decl @Forward [concrete = constants.%Forward.type] {} {} // CHECK:STDOUT: } @@ -517,7 +517,7 @@ private interface Redecl {} // CHECK:STDOUT: %Forward.ref: = name_ref Forward, [concrete = ] // CHECK:STDOUT: %ptr: type = ptr_type [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %i: = value_binding i, [concrete = ] +// CHECK:STDOUT: %i: = wrapper_binding i, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -555,7 +555,7 @@ private interface Redecl {} // CHECK:STDOUT: %Forward.ref: = name_ref Forward, [concrete = ] // CHECK:STDOUT: %ptr: type = ptr_type [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %i: = value_binding i, [concrete = ] +// CHECK:STDOUT: %i: = wrapper_binding i, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interface/incomplete.carbon b/toolchain/check/testdata/interface/incomplete.carbon index 631251aacf31..40c20d9df7bc 100644 --- a/toolchain/check/testdata/interface/incomplete.carbon +++ b/toolchain/check/testdata/interface/incomplete.carbon @@ -264,7 +264,7 @@ interface A(T:! type) { // CHECK:STDOUT: %U.as_type.loc9_16.2: type = facet_access_type %U.ref [symbolic = %U.as_type.loc9_16.1 (constants.%U.as_type)] // CHECK:STDOUT: %.loc9_16.2: type = converted %U.ref, %U.as_type.loc9_16.2 [symbolic = %U.as_type.loc9_16.1 (constants.%U.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: @F.%U.as_type.loc9_16.1 (%U.as_type) = value_binding a, %a.param +// CHECK:STDOUT: %a: @F.%U.as_type.loc9_16.1 (%U.as_type) = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interface/local.carbon b/toolchain/check/testdata/interface/local.carbon index 4e2928a1f5d1..fc71f562c446 100644 --- a/toolchain/check/testdata/interface/local.carbon +++ b/toolchain/check/testdata/interface/local.carbon @@ -74,7 +74,7 @@ fn F() { // CHECK:STDOUT: %Self.as_type.loc17_10.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc17_10.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc17_10.2: type = converted %Self.ref, %Self.as_type.loc17_10.2 [symbolic = %Self.as_type.loc17_10.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @I.WithSelf.G.%Self.as_type.loc17_10.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @I.WithSelf.G.%Self.as_type.loc17_10.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %assoc0: %I.assoc_type = assoc_entity element0, %I.WithSelf.G.decl [concrete = constants.%assoc0] // CHECK:STDOUT: @@ -93,7 +93,7 @@ fn F() { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %empty_tuple.type = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @empty_tuple.type.as.I.impl.%.loc19_9.2 [concrete = constants.%empty_tuple.type] -// CHECK:STDOUT: %self: %empty_tuple.type = value_binding self, %self.param +// CHECK:STDOUT: %self: %empty_tuple.type = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %I.impl_witness_table = impl_witness_table (%empty_tuple.type.as.I.impl.G.decl), @empty_tuple.type.as.I.impl [concrete] // CHECK:STDOUT: %I.impl_witness: = impl_witness %I.impl_witness_table [concrete = constants.%I.impl_witness] diff --git a/toolchain/check/testdata/interface/self.carbon b/toolchain/check/testdata/interface/self.carbon index 4a99e34953b6..eb83162a45bf 100644 --- a/toolchain/check/testdata/interface/self.carbon +++ b/toolchain/check/testdata/interface/self.carbon @@ -63,7 +63,7 @@ interface UseSelf { // CHECK:STDOUT: %Self.as_type.loc16_8.2: type = facet_access_type %Self.ref.loc16_8 [symbolic = %Self.as_type.loc16_8.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc16_8.2: type = converted %Self.ref.loc16_8, %Self.as_type.loc16_8.2 [symbolic = %Self.as_type.loc16_8.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @UseSelf.WithSelf.F.%Self.as_type.loc16_8.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @UseSelf.WithSelf.F.%Self.as_type.loc16_8.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref @UseSelf.WithSelf.F.%Self.as_type.loc16_8.1 (%Self.as_type) = out_param call_param1 // CHECK:STDOUT: %return: ref @UseSelf.WithSelf.F.%Self.as_type.loc16_8.1 (%Self.as_type) = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/interface/todo_define_not_default.carbon b/toolchain/check/testdata/interface/todo_define_not_default.carbon index 05bf2252c369..8fb290a2bdfe 100644 --- a/toolchain/check/testdata/interface/todo_define_not_default.carbon +++ b/toolchain/check/testdata/interface/todo_define_not_default.carbon @@ -112,10 +112,10 @@ interface I { // CHECK:STDOUT: %.loc18: Core.Form = init_form %i32.loc18_27 [concrete = constants.%.795] // CHECK:STDOUT: %a.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc18_11: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %i32 = value_param call_param1 // CHECK:STDOUT: %i32.loc18_19: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: %i32 = value_binding b, %b.param +// CHECK:STDOUT: %b: %i32 = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param2 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/interop/cpp/basics/import/import.carbon b/toolchain/check/testdata/interop/cpp/basics/import/import.carbon index 29ce5fb67112..08039525611d 100644 --- a/toolchain/check/testdata/interop/cpp/basics/import/import.carbon +++ b/toolchain/check/testdata/interop/cpp/basics/import/import.carbon @@ -136,8 +136,8 @@ fn F() { // CHECK:STDOUT: %x.var: ref = var %x.var_patt [concrete = ] // CHECK:STDOUT: assign %x.var, // CHECK:STDOUT: %MyStructAlias.ref: type = name_ref MyStructAlias, imports.%Main.MyStructAlias [concrete = ] -// CHECK:STDOUT: %x: ref = ref_binding x, [concrete = ] -// CHECK:STDOUT: %x.ref: ref = name_ref x, %x [concrete = ] +// CHECK:STDOUT: %x: = wrapper_binding x, [concrete = ] +// CHECK:STDOUT: %x.ref: = name_ref x, %x [concrete = ] // CHECK:STDOUT: %Foo.ref: = name_ref Foo, [concrete = ] // CHECK:STDOUT: // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/interop/cpp/basics/import/indirect.carbon b/toolchain/check/testdata/interop/cpp/basics/import/indirect.carbon index 6167023fa189..73d0e55b2bab 100644 --- a/toolchain/check/testdata/interop/cpp/basics/import/indirect.carbon +++ b/toolchain/check/testdata/interop/cpp/basics/import/indirect.carbon @@ -298,7 +298,7 @@ fn UseZ() -> Cpp.A.Z { // CHECK:STDOUT: %.loc9_3.3: init %X = converted %int_1, %.loc9_3.2 // CHECK:STDOUT: assign %ax.var, %.loc9_3.3 // CHECK:STDOUT: %AX.ref: type = name_ref AX, imports.%Main.AX [concrete = constants.%X] -// CHECK:STDOUT: %ax: ref %X = ref_binding ax, %ax.var +// CHECK:STDOUT: %ax: ref %X = wrapper_binding ax, %ax.var // CHECK:STDOUT: %ax.ref.loc10_11: ref %X = name_ref ax, %ax // CHECK:STDOUT: %x.ref: %X.elem = name_ref x, @X.%.1 [concrete = @X.%.1] // CHECK:STDOUT: %.loc10_13.1: ref %i32 = class_element_access %ax.ref.loc10_11, element0 diff --git a/toolchain/check/testdata/interop/cpp/class/import/access.carbon b/toolchain/check/testdata/interop/cpp/class/import/access.carbon index 6a278bb568b1..ee414a6b8bc2 100644 --- a/toolchain/check/testdata/interop/cpp/class/import/access.carbon +++ b/toolchain/check/testdata/interop/cpp/class/import/access.carbon @@ -1654,7 +1654,7 @@ fn Call(var instance: Cpp.PublicPrivate) { // CHECK:STDOUT: %.loc8_36.1: ref %i32 = class_element_access %s.ref, element0 // CHECK:STDOUT: %.loc8_36.2: %i32 = acquire_value %.loc8_36.1 // CHECK:STDOUT: %i32.loc8: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %instance_data: %i32 = value_binding instance_data, %.loc8_36.2 +// CHECK:STDOUT: %instance_data: %i32 = wrapper_binding instance_data, %.loc8_36.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %static_data.patt: %pattern_type.6b6 = value_binding_pattern static_data [concrete = constants.%static_data.patt.405] // CHECK:STDOUT: } @@ -1664,7 +1664,7 @@ fn Call(var instance: Cpp.PublicPrivate) { // CHECK:STDOUT: %static_data.ref: ref %i32 = name_ref static_data, imports.%static_data.var [concrete = imports.%static_data.var] // CHECK:STDOUT: %.loc9: %i32 = acquire_value %static_data.ref // CHECK:STDOUT: %i32.loc9: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %static_data: %i32 = value_binding static_data, %.loc9 +// CHECK:STDOUT: %static_data: %i32 = wrapper_binding static_data, %.loc9 // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1702,7 +1702,7 @@ fn Call(var instance: Cpp.PublicPrivate) { // CHECK:STDOUT: %.loc12_36.4: ref %i32 = class_element_access %.loc12_36.3, element0 // CHECK:STDOUT: %.loc12_36.5: %i32 = acquire_value %.loc12_36.4 // CHECK:STDOUT: %i32.loc12: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %instance_data: %i32 = value_binding instance_data, %.loc12_36.5 +// CHECK:STDOUT: %instance_data: %i32 = wrapper_binding instance_data, %.loc12_36.5 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %static_data.patt: %pattern_type.6b6 = value_binding_pattern static_data [concrete = constants.%static_data.patt.405] // CHECK:STDOUT: } @@ -1711,7 +1711,7 @@ fn Call(var instance: Cpp.PublicPrivate) { // CHECK:STDOUT: %static_data.ref: ref %i32 = name_ref static_data, imports.%static_data.var [concrete = imports.%static_data.var] // CHECK:STDOUT: %.loc13: %i32 = acquire_value %static_data.ref // CHECK:STDOUT: %i32.loc13: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %static_data: %i32 = value_binding static_data, %.loc13 +// CHECK:STDOUT: %static_data: %i32 = wrapper_binding static_data, %.loc13 // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1770,7 +1770,7 @@ fn Call(var instance: Cpp.PublicPrivate) { // CHECK:STDOUT: %.loc10_41.4: ref %i32 = class_element_access %.loc10_41.3, element0 // CHECK:STDOUT: %.loc10_41.5: %i32 = acquire_value %.loc10_41.4 // CHECK:STDOUT: %i32.loc10: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %instance_data: %i32 = value_binding instance_data, %.loc10_41.5 +// CHECK:STDOUT: %instance_data: %i32 = wrapper_binding instance_data, %.loc10_41.5 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %unqualified_static_data.patt: %pattern_type.6b6 = value_binding_pattern unqualified_static_data [concrete = constants.%unqualified_static_data.patt] // CHECK:STDOUT: } @@ -1778,7 +1778,7 @@ fn Call(var instance: Cpp.PublicPrivate) { // CHECK:STDOUT: %static_data.ref.loc11: ref %i32 = name_ref static_data, imports.%static_data.var [concrete = imports.%static_data.var] // CHECK:STDOUT: %.loc11: %i32 = acquire_value %static_data.ref.loc11 // CHECK:STDOUT: %i32.loc11: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %unqualified_static_data: %i32 = value_binding unqualified_static_data, %.loc11 +// CHECK:STDOUT: %unqualified_static_data: %i32 = wrapper_binding unqualified_static_data, %.loc11 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %derived_static_data.patt: %pattern_type.6b6 = value_binding_pattern derived_static_data [concrete = constants.%derived_static_data.patt] // CHECK:STDOUT: } @@ -1786,7 +1786,7 @@ fn Call(var instance: Cpp.PublicPrivate) { // CHECK:STDOUT: %static_data.ref.loc12: ref %i32 = name_ref static_data, imports.%static_data.var [concrete = imports.%static_data.var] // CHECK:STDOUT: %.loc12: %i32 = acquire_value %static_data.ref.loc12 // CHECK:STDOUT: %i32.loc12: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %derived_static_data: %i32 = value_binding derived_static_data, %.loc12 +// CHECK:STDOUT: %derived_static_data: %i32 = wrapper_binding derived_static_data, %.loc12 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %base_static_data.patt: %pattern_type.6b6 = value_binding_pattern base_static_data [concrete = constants.%base_static_data.patt] // CHECK:STDOUT: } @@ -1795,7 +1795,7 @@ fn Call(var instance: Cpp.PublicPrivate) { // CHECK:STDOUT: %static_data.ref.loc13: ref %i32 = name_ref static_data, imports.%static_data.var [concrete = imports.%static_data.var] // CHECK:STDOUT: %.loc13: %i32 = acquire_value %static_data.ref.loc13 // CHECK:STDOUT: %i32.loc13: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %base_static_data: %i32 = value_binding base_static_data, %.loc13 +// CHECK:STDOUT: %base_static_data: %i32 = wrapper_binding base_static_data, %.loc13 // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interop/cpp/class/import/base.carbon b/toolchain/check/testdata/interop/cpp/class/import/base.carbon index ad9abf0ae112..2ed9801c1947 100644 --- a/toolchain/check/testdata/interop/cpp/class/import/base.carbon +++ b/toolchain/check/testdata/interop/cpp/class/import/base.carbon @@ -532,7 +532,7 @@ class V { // CHECK:STDOUT: %Derived.ref: type = name_ref Derived, imports.%Derived.decl [concrete = constants.%Derived] // CHECK:STDOUT: %ptr.loc7_29: type = ptr_type %Derived.ref [concrete = constants.%ptr.976] // CHECK:STDOUT: } -// CHECK:STDOUT: %d: %ptr.976 = value_binding d, %d.param +// CHECK:STDOUT: %d: %ptr.976 = wrapper_binding d, %d.param // CHECK:STDOUT: %return.param: ref %ptr.0e0 = out_param call_param1 // CHECK:STDOUT: %return: ref %ptr.0e0 = return_slot %return.param // CHECK:STDOUT: } @@ -545,7 +545,7 @@ class V { // CHECK:STDOUT: %Cpp.ref: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Derived.ref: type = name_ref Derived, imports.%Derived.decl [concrete = constants.%Derived] // CHECK:STDOUT: } -// CHECK:STDOUT: %d: %Derived = value_binding d, %d.param +// CHECK:STDOUT: %d: %Derived = wrapper_binding d, %d.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interop/cpp/class/import/class.carbon b/toolchain/check/testdata/interop/cpp/class/import/class.carbon index d2f3e9e27a47..492543564aff 100644 --- a/toolchain/check/testdata/interop/cpp/class/import/class.carbon +++ b/toolchain/check/testdata/interop/cpp/class/import/class.carbon @@ -283,7 +283,7 @@ fn GenericUse(p2: Generic(Cpp.Class1)) { // CHECK:STDOUT: %Bar.ref: type = name_ref Bar, imports.%Bar.decl [concrete = constants.%Bar] // CHECK:STDOUT: %ptr: type = ptr_type %Bar.ref [concrete = constants.%ptr] // CHECK:STDOUT: } -// CHECK:STDOUT: %bar: %ptr = value_binding bar, %bar.param +// CHECK:STDOUT: %bar: %ptr = wrapper_binding bar, %bar.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -320,7 +320,7 @@ fn GenericUse(p2: Generic(Cpp.Class1)) { // CHECK:STDOUT: %Bar.ref: type = name_ref Bar, imports.%Bar.decl [concrete = constants.%Bar] // CHECK:STDOUT: %ptr: type = ptr_type %Bar.ref [concrete = constants.%ptr] // CHECK:STDOUT: } -// CHECK:STDOUT: %bar: %ptr = value_binding bar, %bar.param +// CHECK:STDOUT: %bar: %ptr = wrapper_binding bar, %bar.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -357,7 +357,7 @@ fn GenericUse(p2: Generic(Cpp.Class1)) { // CHECK:STDOUT: %Bar.ref: type = name_ref Bar, imports.%Bar.decl [concrete = constants.%Bar] // CHECK:STDOUT: %ptr: type = ptr_type %Bar.ref [concrete = constants.%ptr] // CHECK:STDOUT: } -// CHECK:STDOUT: %bar: %ptr = value_binding bar, %bar.param +// CHECK:STDOUT: %bar: %ptr = wrapper_binding bar, %bar.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -429,7 +429,7 @@ fn GenericUse(p2: Generic(Cpp.Class1)) { // CHECK:STDOUT: %Bar.ref.loc8_22: type = name_ref Bar, imports.%Bar.decl [concrete = constants.%Bar] // CHECK:STDOUT: %ptr: type = ptr_type %Bar.ref.loc8_22 [concrete = constants.%ptr.227] // CHECK:STDOUT: } -// CHECK:STDOUT: %bar: %ptr.227 = value_binding bar, %.loc8_37 +// CHECK:STDOUT: %bar: %ptr.227 = wrapper_binding bar, %.loc8_37 // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -466,7 +466,7 @@ fn GenericUse(p2: Generic(Cpp.Class1)) { // CHECK:STDOUT: %Bar.ref.loc7: type = name_ref Bar, imports.%Bar.decl [concrete = constants.%Bar] // CHECK:STDOUT: %ptr.loc7: type = ptr_type %Bar.ref.loc7 [concrete = constants.%ptr.227] // CHECK:STDOUT: } -// CHECK:STDOUT: %bar: %ptr.227 = value_binding bar, %bar.param +// CHECK:STDOUT: %bar: %ptr.227 = wrapper_binding bar, %bar.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -485,7 +485,7 @@ fn GenericUse(p2: Generic(Cpp.Class1)) { // CHECK:STDOUT: %Bar.ref.loc8: type = name_ref Bar, imports.%Bar.decl [concrete = constants.%Bar] // CHECK:STDOUT: %ptr.loc8: type = ptr_type %Bar.ref.loc8 [concrete = constants.%ptr.227] // CHECK:STDOUT: } -// CHECK:STDOUT: %foo_bar: %ptr.227 = value_binding foo_bar, %.loc8_37.3 +// CHECK:STDOUT: %foo_bar: %ptr.227 = wrapper_binding foo_bar, %.loc8_37.3 // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: @@ -531,7 +531,7 @@ fn GenericUse(p2: Generic(Cpp.Class1)) { // CHECK:STDOUT: %Bar.ref: type = name_ref Bar, imports.%Bar.decl [concrete = constants.%Bar] // CHECK:STDOUT: %ptr: type = ptr_type %Bar.ref [concrete = constants.%ptr.227] // CHECK:STDOUT: } -// CHECK:STDOUT: %bar: %ptr.227 = value_binding bar, %bar.param +// CHECK:STDOUT: %bar: %ptr.227 = wrapper_binding bar, %bar.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -644,7 +644,7 @@ fn GenericUse(p2: Generic(Cpp.Class1)) { // CHECK:STDOUT: %X.ref: type = name_ref X, imports.%X.decl [concrete = constants.%X] // CHECK:STDOUT: %ptr: type = ptr_type imports.%Bar.decl [concrete = constants.%ptr] // CHECK:STDOUT: } -// CHECK:STDOUT: %bar: %ptr = value_binding bar, %bar.param +// CHECK:STDOUT: %bar: %ptr = wrapper_binding bar, %bar.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interop/cpp/class/import/constructor.carbon b/toolchain/check/testdata/interop/cpp/class/import/constructor.carbon index 0950abc74ed4..0ca0230a16d8 100644 --- a/toolchain/check/testdata/interop/cpp/class/import/constructor.carbon +++ b/toolchain/check/testdata/interop/cpp/class/import/constructor.carbon @@ -360,7 +360,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc8_17: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc8_20: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %C = value_binding c, %.loc8_33.4 +// CHECK:STDOUT: %c: %C = wrapper_binding c, %.loc8_33.4 // CHECK:STDOUT: %C.cpp_destructor.bound: = bound_method %.loc8_33.3, constants.%C.cpp_destructor // CHECK:STDOUT: %C.cpp_destructor.call: init %empty_tuple.type = call %C.cpp_destructor.bound(%.loc8_33.3) // CHECK:STDOUT: @@ -418,7 +418,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var // CHECK:STDOUT: %C.cpp_destructor.bound: = bound_method %c.var, constants.%C.cpp_destructor // CHECK:STDOUT: %C.cpp_destructor.call: init %empty_tuple.type = call %C.cpp_destructor.bound(%c.var) // CHECK:STDOUT: @@ -511,7 +511,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc8_17: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc8_20: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %C = value_binding c, %.loc8_41.4 +// CHECK:STDOUT: %c: %C = wrapper_binding c, %.loc8_41.4 // CHECK:STDOUT: %C.cpp_destructor.bound: = bound_method %.loc8_41.3, constants.%C.cpp_destructor // CHECK:STDOUT: %C.cpp_destructor.call: init %empty_tuple.type = call %C.cpp_destructor.bound(%.loc8_41.3) // CHECK:STDOUT: @@ -596,7 +596,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc8_18: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc8_21: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c1: %C = value_binding c1, %.loc8_34.4 +// CHECK:STDOUT: %c1: %C = wrapper_binding c1, %.loc8_34.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c2.patt: %pattern_type.bbc = value_binding_pattern c2 [concrete = constants.%c2.patt] // CHECK:STDOUT: } @@ -629,7 +629,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc9_18: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc9_21: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c2: %C = value_binding c2, %.loc9_42.4 +// CHECK:STDOUT: %c2: %C = wrapper_binding c2, %.loc9_42.4 // CHECK:STDOUT: %C.cpp_destructor.bound.loc9: = bound_method %.loc9_42.3, constants.%C.cpp_destructor // CHECK:STDOUT: %C.cpp_destructor.call.loc9: init %empty_tuple.type = call %C.cpp_destructor.bound.loc9(%.loc9_42.3) // CHECK:STDOUT: %C.cpp_destructor.bound.loc8: = bound_method %.loc8_34.3, constants.%C.cpp_destructor @@ -732,7 +732,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc8_18: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc8_21: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c1: %C = value_binding c1, %.loc8_38.4 +// CHECK:STDOUT: %c1: %C = wrapper_binding c1, %.loc8_38.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c2.patt: %pattern_type.bbc = value_binding_pattern c2 [concrete = constants.%c2.patt] // CHECK:STDOUT: } @@ -757,7 +757,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc9_18: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc9_21: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c2: %C = value_binding c2, %.loc9_35.4 +// CHECK:STDOUT: %c2: %C = wrapper_binding c2, %.loc9_35.4 // CHECK:STDOUT: %C.cpp_destructor.bound.loc9: = bound_method %.loc9_35.3, constants.%C.cpp_destructor // CHECK:STDOUT: %C.cpp_destructor.call.loc9: init %empty_tuple.type = call %C.cpp_destructor.bound.loc9(%.loc9_35.3) // CHECK:STDOUT: %C.cpp_destructor.bound.loc8: = bound_method %.loc8_38.3, constants.%C.cpp_destructor @@ -874,7 +874,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc8_11: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc8_14: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c1: ref %C = ref_binding c1, %c1.var +// CHECK:STDOUT: %c1: ref %C = wrapper_binding c1, %c1.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c2.patt: %pattern_type.bbc = ref_binding_pattern c2 [concrete = constants.%c2.patt] // CHECK:STDOUT: %c2.var_patt: %pattern_type.bbc = var_pattern %c2.patt [concrete = constants.%c2.var_patt] @@ -899,7 +899,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc9_18: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc9_21: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c2: ref %C = ref_binding c2, %c2.var +// CHECK:STDOUT: %c2: ref %C = wrapper_binding c2, %c2.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c3.patt: %pattern_type.bbc = ref_binding_pattern c3 [concrete = constants.%c3.patt] // CHECK:STDOUT: %c3.var_patt: %pattern_type.bbc = var_pattern %c3.patt [concrete = constants.%c3.var_patt] @@ -919,7 +919,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc10_18: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc10_21: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c3: ref %C = ref_binding c3, %c3.var +// CHECK:STDOUT: %c3: ref %C = wrapper_binding c3, %c3.var // CHECK:STDOUT: %C.cpp_destructor.bound.loc10: = bound_method %c3.var, constants.%C.cpp_destructor // CHECK:STDOUT: %C.cpp_destructor.call.loc10: init %empty_tuple.type = call %C.cpp_destructor.bound.loc10(%c3.var) // CHECK:STDOUT: %C.cpp_destructor.bound.loc9: = bound_method %c2.var, constants.%C.cpp_destructor @@ -1021,7 +1021,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc8_18: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc8_21: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c1: %C = value_binding c1, %.loc8_35.4 +// CHECK:STDOUT: %c1: %C = wrapper_binding c1, %.loc8_35.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c2.patt: %pattern_type.bbc = value_binding_pattern c2 [concrete = constants.%c2.patt] // CHECK:STDOUT: } @@ -1045,7 +1045,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc9: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc9: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c2: %C = value_binding c2, %.loc9_28.7 +// CHECK:STDOUT: %c2: %C = wrapper_binding c2, %.loc9_28.7 // CHECK:STDOUT: %C.cpp_destructor.bound.loc9: = bound_method %.loc9_28.6, constants.%C.cpp_destructor // CHECK:STDOUT: %C.cpp_destructor.call.loc9: init %empty_tuple.type = call %C.cpp_destructor.bound.loc9(%.loc9_28.6) // CHECK:STDOUT: %C.cpp_destructor.bound.loc8: = bound_method %.loc8_35.3, constants.%C.cpp_destructor @@ -1163,7 +1163,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc8_18: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc8_21: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c1: %C = value_binding c1, %.loc8_38.4 +// CHECK:STDOUT: %c1: %C = wrapper_binding c1, %.loc8_38.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c2.patt: %pattern_type.bbc = value_binding_pattern c2 [concrete = constants.%c2.patt] // CHECK:STDOUT: } @@ -1188,7 +1188,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc9_18: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc9_21: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c2: %C = value_binding c2, %.loc9_35.4 +// CHECK:STDOUT: %c2: %C = wrapper_binding c2, %.loc9_35.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c3.patt: %pattern_type.bbc = value_binding_pattern c3 [concrete = constants.%c3.patt] // CHECK:STDOUT: } @@ -1212,7 +1212,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc10: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc10: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c3: %C = value_binding c3, %.loc10_28.7 +// CHECK:STDOUT: %c3: %C = wrapper_binding c3, %.loc10_28.7 // CHECK:STDOUT: %C.cpp_destructor.bound.loc10: = bound_method %.loc10_28.6, constants.%C.cpp_destructor // CHECK:STDOUT: %C.cpp_destructor.call.loc10: init %empty_tuple.type = call %C.cpp_destructor.bound.loc10(%.loc10_28.6) // CHECK:STDOUT: %C.cpp_destructor.bound.loc9: = bound_method %.loc9_35.3, constants.%C.cpp_destructor diff --git a/toolchain/check/testdata/interop/cpp/class/import/method.carbon b/toolchain/check/testdata/interop/cpp/class/import/method.carbon index b25bff818ecd..9ceef9b96194 100644 --- a/toolchain/check/testdata/interop/cpp/class/import/method.carbon +++ b/toolchain/check/testdata/interop/cpp/class/import/method.carbon @@ -571,7 +571,7 @@ fn Call(e: Cpp.ExplicitObjectParam, n: i32, a: Cpp.Another) { // CHECK:STDOUT: %F__carbon_thunk.call: init %i32 = call imports.%F__carbon_thunk.decl.828b0d.1(%v.ref) // CHECK:STDOUT: assign %a.var, %F__carbon_thunk.call // CHECK:STDOUT: %i32.loc8: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: ref %i32 = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %i32 = wrapper_binding a, %a.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.f00 = ref_binding_pattern b [concrete = constants.%b.patt.9fb99a.1] // CHECK:STDOUT: %b.var_patt: %pattern_type.f00 = var_pattern %b.patt [concrete = constants.%b.var_patt.dede8c.1] @@ -587,7 +587,7 @@ fn Call(e: Cpp.ExplicitObjectParam, n: i32, a: Cpp.Another) { // CHECK:STDOUT: %i32.loc9: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %ptr.loc9: type = ptr_type %i32.loc9 [concrete = constants.%ptr.d08] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: ref %ptr.d08 = ref_binding b, %b.var +// CHECK:STDOUT: %b: ref %ptr.d08 = wrapper_binding b, %b.var // CHECK:STDOUT: %Destroy.Op.bound.loc9: = bound_method %b.var, constants.%Destroy.Op.1a2547.1 // CHECK:STDOUT: %Destroy.Op.call.loc9: init %empty_tuple.type = call %Destroy.Op.bound.loc9(%b.var) // CHECK:STDOUT: %Destroy.Op.bound.loc8: = bound_method %a.var, constants.%Destroy.Op.1a2547.3 @@ -617,7 +617,7 @@ fn Call(e: Cpp.ExplicitObjectParam, n: i32, a: Cpp.Another) { // CHECK:STDOUT: %F__carbon_thunk.call: init %i32 = call imports.%F__carbon_thunk.decl.828b0d.2(%v.ref) // CHECK:STDOUT: assign %a.var, %F__carbon_thunk.call // CHECK:STDOUT: %i32.loc15: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: ref %i32 = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %i32 = wrapper_binding a, %a.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.f00 = ref_binding_pattern b [concrete = constants.%b.patt.9fb99a.2] // CHECK:STDOUT: %b.var_patt: %pattern_type.f00 = var_pattern %b.patt [concrete = constants.%b.var_patt.dede8c.2] @@ -633,7 +633,7 @@ fn Call(e: Cpp.ExplicitObjectParam, n: i32, a: Cpp.Another) { // CHECK:STDOUT: %i32.loc16: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %ptr.loc16: type = ptr_type %i32.loc16 [concrete = constants.%ptr.d08] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: ref %ptr.d08 = ref_binding b, %b.var +// CHECK:STDOUT: %b: ref %ptr.d08 = wrapper_binding b, %b.var // CHECK:STDOUT: %Destroy.Op.bound.loc16: = bound_method %b.var, constants.%Destroy.Op.1a2547.1 // CHECK:STDOUT: %Destroy.Op.call.loc16: init %empty_tuple.type = call %Destroy.Op.bound.loc16(%b.var) // CHECK:STDOUT: %Destroy.Op.bound.loc15: = bound_method %a.var, constants.%Destroy.Op.1a2547.3 diff --git a/toolchain/check/testdata/interop/cpp/class/import/struct.carbon b/toolchain/check/testdata/interop/cpp/class/import/struct.carbon index 425d1bc1fd6c..5c4652182605 100644 --- a/toolchain/check/testdata/interop/cpp/class/import/struct.carbon +++ b/toolchain/check/testdata/interop/cpp/class/import/struct.carbon @@ -59,7 +59,7 @@ fn MyF(bar: Cpp.Bar*); // CHECK:STDOUT: %Bar.ref: type = name_ref Bar, imports.%Bar.decl [concrete = constants.%Bar] // CHECK:STDOUT: %ptr: type = ptr_type %Bar.ref [concrete = constants.%ptr] // CHECK:STDOUT: } -// CHECK:STDOUT: %bar: %ptr = value_binding bar, %bar.param +// CHECK:STDOUT: %bar: %ptr = wrapper_binding bar, %bar.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interop/cpp/class/import/template.carbon b/toolchain/check/testdata/interop/cpp/class/import/template.carbon index 198b43306e2a..b85206aefbc7 100644 --- a/toolchain/check/testdata/interop/cpp/class/import/template.carbon +++ b/toolchain/check/testdata/interop/cpp/class/import/template.carbon @@ -236,7 +236,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %type.ref.loc7: type = name_ref r#type, %i32.4 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %i32 = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %i32 = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %y.patt: %pattern_type.6b6 = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type.6b6 = var_pattern %y.patt [concrete = constants.%y.var_patt] @@ -248,7 +248,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %type.ref.loc21: type = name_ref r#type, %i32.2 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: ref %i32 = ref_binding y, %y.var [concrete = %y.var] +// CHECK:STDOUT: %y: ref %i32 = wrapper_binding y, %y.var [concrete = %y.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/interop/cpp/class/import/union.carbon b/toolchain/check/testdata/interop/cpp/class/import/union.carbon index d5e42c8b068b..cdcd38ea3c5b 100644 --- a/toolchain/check/testdata/interop/cpp/class/import/union.carbon +++ b/toolchain/check/testdata/interop/cpp/class/import/union.carbon @@ -204,7 +204,7 @@ fn MyF(bar: Cpp.Bar(Cpp.X)*); // CHECK:STDOUT: %Bar.ref: type = name_ref Bar, imports.%Bar.decl [concrete = constants.%Bar] // CHECK:STDOUT: %ptr: type = ptr_type %Bar.ref [concrete = constants.%ptr] // CHECK:STDOUT: } -// CHECK:STDOUT: %bar: %ptr = value_binding bar, %bar.param +// CHECK:STDOUT: %bar: %ptr = wrapper_binding bar, %bar.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -241,7 +241,7 @@ fn MyF(bar: Cpp.Bar(Cpp.X)*); // CHECK:STDOUT: %Bar.ref: type = name_ref Bar, imports.%Bar.decl [concrete = constants.%Bar] // CHECK:STDOUT: %ptr: type = ptr_type %Bar.ref [concrete = constants.%ptr] // CHECK:STDOUT: } -// CHECK:STDOUT: %bar: %ptr = value_binding bar, %bar.param +// CHECK:STDOUT: %bar: %ptr = wrapper_binding bar, %bar.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -278,7 +278,7 @@ fn MyF(bar: Cpp.Bar(Cpp.X)*); // CHECK:STDOUT: %Bar.ref: type = name_ref Bar, imports.%Bar.decl [concrete = constants.%Bar] // CHECK:STDOUT: %ptr: type = ptr_type %Bar.ref [concrete = constants.%ptr] // CHECK:STDOUT: } -// CHECK:STDOUT: %bar: %ptr = value_binding bar, %bar.param +// CHECK:STDOUT: %bar: %ptr = wrapper_binding bar, %bar.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -350,7 +350,7 @@ fn MyF(bar: Cpp.Bar(Cpp.X)*); // CHECK:STDOUT: %Bar.ref.loc8_22: type = name_ref Bar, imports.%Bar.decl [concrete = constants.%Bar] // CHECK:STDOUT: %ptr: type = ptr_type %Bar.ref.loc8_22 [concrete = constants.%ptr.227] // CHECK:STDOUT: } -// CHECK:STDOUT: %bar: %ptr.227 = value_binding bar, %.loc8_37 +// CHECK:STDOUT: %bar: %ptr.227 = wrapper_binding bar, %.loc8_37 // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -387,7 +387,7 @@ fn MyF(bar: Cpp.Bar(Cpp.X)*); // CHECK:STDOUT: %Bar.ref.loc7: type = name_ref Bar, imports.%Bar.decl [concrete = constants.%Bar] // CHECK:STDOUT: %ptr.loc7: type = ptr_type %Bar.ref.loc7 [concrete = constants.%ptr.227] // CHECK:STDOUT: } -// CHECK:STDOUT: %bar: %ptr.227 = value_binding bar, %bar.param +// CHECK:STDOUT: %bar: %ptr.227 = wrapper_binding bar, %bar.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -406,7 +406,7 @@ fn MyF(bar: Cpp.Bar(Cpp.X)*); // CHECK:STDOUT: %Bar.ref.loc8: type = name_ref Bar, imports.%Bar.decl [concrete = constants.%Bar] // CHECK:STDOUT: %ptr.loc8: type = ptr_type %Bar.ref.loc8 [concrete = constants.%ptr.227] // CHECK:STDOUT: } -// CHECK:STDOUT: %foo_bar: %ptr.227 = value_binding foo_bar, %.loc8_37.3 +// CHECK:STDOUT: %foo_bar: %ptr.227 = wrapper_binding foo_bar, %.loc8_37.3 // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: @@ -449,7 +449,7 @@ fn MyF(bar: Cpp.Bar(Cpp.X)*); // CHECK:STDOUT: %X.ref: type = name_ref X, imports.%X.decl [concrete = constants.%X] // CHECK:STDOUT: %ptr: type = ptr_type imports.%Bar.decl [concrete = constants.%ptr] // CHECK:STDOUT: } -// CHECK:STDOUT: %bar: %ptr = value_binding bar, %bar.param +// CHECK:STDOUT: %bar: %ptr = wrapper_binding bar, %bar.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interop/cpp/enum/convert.carbon b/toolchain/check/testdata/interop/cpp/enum/convert.carbon index f152963cdd1f..5fa4639ec522 100644 --- a/toolchain/check/testdata/interop/cpp/enum/convert.carbon +++ b/toolchain/check/testdata/interop/cpp/enum/convert.carbon @@ -151,7 +151,7 @@ fn F() { // CHECK:STDOUT: %.loc8_34.1: %i16 = as_compatible %a.ref.loc8 [concrete = constants.%int_0.a8d] // CHECK:STDOUT: %.loc8_34.2: %i16 = converted %a.ref.loc8, %.loc8_34.1 [concrete = constants.%int_0.a8d] // CHECK:STDOUT: %i16.loc8_17: type = type_literal constants.%i16 [concrete = constants.%i16] -// CHECK:STDOUT: %a: %i16 = value_binding a, %.loc8_34.2 +// CHECK:STDOUT: %a: %i16 = wrapper_binding a, %.loc8_34.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.926 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } @@ -172,7 +172,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc9_17: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Enum.ref.loc9_20: type = name_ref Enum, imports.%Enum.decl [concrete = constants.%Enum] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %Enum = value_binding b, %.loc9_40.2 +// CHECK:STDOUT: %b: %Enum = wrapper_binding b, %.loc9_40.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.d91 = value_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: } @@ -186,7 +186,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc10_17: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Other.ref.loc10_20: type = name_ref Other, imports.%Other.decl [concrete = constants.%Other] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %Other = value_binding c, %.loc10_35.2 +// CHECK:STDOUT: %c: %Other = wrapper_binding c, %.loc10_35.2 // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interop/cpp/enum/copy.carbon b/toolchain/check/testdata/interop/cpp/enum/copy.carbon index b6803057c78e..2f997dc939b0 100644 --- a/toolchain/check/testdata/interop/cpp/enum/copy.carbon +++ b/toolchain/check/testdata/interop/cpp/enum/copy.carbon @@ -85,7 +85,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc8_10: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Enum.ref.loc8_13: type = name_ref Enum, imports.%Enum.decl [concrete = constants.%Enum] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %Enum = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %Enum = wrapper_binding a, %a.var // CHECK:STDOUT: %a.ref.loc10: ref %Enum = name_ref a, %a // CHECK:STDOUT: %Cpp.ref.loc10: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Enum.ref.loc10: type = name_ref Enum, imports.%Enum.decl [concrete = constants.%Enum] diff --git a/toolchain/check/testdata/interop/cpp/enum/fixed.carbon b/toolchain/check/testdata/interop/cpp/enum/fixed.carbon index 506e32054777..0397c7e377e5 100644 --- a/toolchain/check/testdata/interop/cpp/enum/fixed.carbon +++ b/toolchain/check/testdata/interop/cpp/enum/fixed.carbon @@ -67,7 +67,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc8_17: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Enum.ref.loc8_20: type = name_ref Enum, imports.%Enum.decl [concrete = constants.%Enum] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %Enum = value_binding a, %a.ref +// CHECK:STDOUT: %a: %Enum = wrapper_binding a, %a.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } @@ -77,7 +77,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc9_17: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Enum.ref.loc9: type = name_ref Enum, imports.%Enum.decl [concrete = constants.%Enum] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %Enum = value_binding b, %b.ref +// CHECK:STDOUT: %b: %Enum = wrapper_binding b, %b.ref // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interop/cpp/enum/incomplete.carbon b/toolchain/check/testdata/interop/cpp/enum/incomplete.carbon index 26594c9e83ab..a37abcf813cd 100644 --- a/toolchain/check/testdata/interop/cpp/enum/incomplete.carbon +++ b/toolchain/check/testdata/interop/cpp/enum/incomplete.carbon @@ -86,7 +86,7 @@ fn MyF() { // CHECK:STDOUT: %Cpp.ref: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %UnsizedEnum.ref: type = name_ref UnsizedEnum, imports.%UnsizedEnum.decl [concrete = constants.%UnsizedEnum] // CHECK:STDOUT: } -// CHECK:STDOUT: %e: %UnsizedEnum = value_binding e, %e.param +// CHECK:STDOUT: %e: %UnsizedEnum = wrapper_binding e, %e.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interop/cpp/enum/member.carbon b/toolchain/check/testdata/interop/cpp/enum/member.carbon index c83cba9d546e..dc35d5bfa81b 100644 --- a/toolchain/check/testdata/interop/cpp/enum/member.carbon +++ b/toolchain/check/testdata/interop/cpp/enum/member.carbon @@ -72,7 +72,7 @@ fn F() { // CHECK:STDOUT: %A.ref.loc8_20: type = name_ref A, imports.%A.decl [concrete = constants.%A] // CHECK:STDOUT: %E.ref.loc8: type = name_ref E, imports.%E.decl [concrete = constants.%E] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %E = value_binding a, %a.ref +// CHECK:STDOUT: %a: %E = wrapper_binding a, %a.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } @@ -85,7 +85,7 @@ fn F() { // CHECK:STDOUT: %A.ref.loc9_20: type = name_ref A, imports.%A.decl [concrete = constants.%A] // CHECK:STDOUT: %E.ref.loc9_22: type = name_ref E, imports.%E.decl [concrete = constants.%E] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %E = value_binding b, %b.ref +// CHECK:STDOUT: %b: %E = wrapper_binding b, %b.ref // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interop/cpp/enum/scoped.carbon b/toolchain/check/testdata/interop/cpp/enum/scoped.carbon index 77e576aa49c3..82cca60bc399 100644 --- a/toolchain/check/testdata/interop/cpp/enum/scoped.carbon +++ b/toolchain/check/testdata/interop/cpp/enum/scoped.carbon @@ -76,7 +76,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc8_17: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Enum.ref.loc8_20: type = name_ref Enum, imports.%Enum.decl [concrete = constants.%Enum] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %Enum = value_binding a, %a.ref +// CHECK:STDOUT: %a: %Enum = wrapper_binding a, %a.ref // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interop/cpp/enum/unscoped.carbon b/toolchain/check/testdata/interop/cpp/enum/unscoped.carbon index 2f4f2e8b2e36..055aa70fe7e5 100644 --- a/toolchain/check/testdata/interop/cpp/enum/unscoped.carbon +++ b/toolchain/check/testdata/interop/cpp/enum/unscoped.carbon @@ -109,7 +109,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc8_17: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Enum.ref.loc8_20: type = name_ref Enum, imports.%Enum.decl [concrete = constants.%Enum] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %Enum = value_binding a, %a.ref +// CHECK:STDOUT: %a: %Enum = wrapper_binding a, %a.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } @@ -119,7 +119,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc9_17: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Enum.ref.loc9: type = name_ref Enum, imports.%Enum.decl [concrete = constants.%Enum] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %Enum = value_binding b, %b.ref +// CHECK:STDOUT: %b: %Enum = wrapper_binding b, %b.ref // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interop/cpp/enum/using.carbon b/toolchain/check/testdata/interop/cpp/enum/using.carbon index 9c9b5eb27368..2d658136345e 100644 --- a/toolchain/check/testdata/interop/cpp/enum/using.carbon +++ b/toolchain/check/testdata/interop/cpp/enum/using.carbon @@ -102,7 +102,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc18_20: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Color.ref.loc18_23: type = name_ref Color, imports.%Color.decl [concrete = constants.%Color] // CHECK:STDOUT: } -// CHECK:STDOUT: %col: %Color = value_binding col, %Red.ref +// CHECK:STDOUT: %col: %Color = wrapper_binding col, %Red.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %colb.patt: %pattern_type.732 = value_binding_pattern colb [concrete = constants.%colb.patt] // CHECK:STDOUT: } @@ -112,7 +112,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc19_21: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Color.ref.loc19: type = name_ref Color, imports.%Color.decl [concrete = constants.%Color] // CHECK:STDOUT: } -// CHECK:STDOUT: %colb: %Color = value_binding colb, %Blue.ref +// CHECK:STDOUT: %colb: %Color = wrapper_binding colb, %Blue.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %pet.patt: %pattern_type.8cd = value_binding_pattern pet [concrete = constants.%pet.patt] // CHECK:STDOUT: } @@ -125,7 +125,7 @@ fn F() { // CHECK:STDOUT: %Zoo.ref.loc20_23: type = name_ref Zoo, imports.%Zoo.decl [concrete = constants.%Zoo] // CHECK:STDOUT: %Animal.ref.loc20_27: type = name_ref Animal, imports.%Animal.decl [concrete = constants.%Animal] // CHECK:STDOUT: } -// CHECK:STDOUT: %pet: %Animal = value_binding pet, %Cat.ref +// CHECK:STDOUT: %pet: %Animal = wrapper_binding pet, %Cat.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %pet2.patt: %pattern_type.8cd = value_binding_pattern pet2 [concrete = constants.%pet2.patt] // CHECK:STDOUT: } @@ -136,7 +136,7 @@ fn F() { // CHECK:STDOUT: %Zoo.ref.loc21: type = name_ref Zoo, imports.%Zoo.decl [concrete = constants.%Zoo] // CHECK:STDOUT: %Animal.ref.loc21: type = name_ref Animal, imports.%Animal.decl [concrete = constants.%Animal] // CHECK:STDOUT: } -// CHECK:STDOUT: %pet2: %Animal = value_binding pet2, %Dog.ref +// CHECK:STDOUT: %pet2: %Animal = wrapper_binding pet2, %Dog.ref // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interop/cpp/function/import/arithmetic_types_bridged.carbon b/toolchain/check/testdata/interop/cpp/function/import/arithmetic_types_bridged.carbon index 32138aec04b1..38507c232cda 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/arithmetic_types_bridged.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/arithmetic_types_bridged.carbon @@ -2210,7 +2210,7 @@ fn F() { // CHECK:STDOUT: %.loc8_37.3: ref bool = temporary %.loc8_37.1, %.loc8_37.2 // CHECK:STDOUT: %.loc8_37.4: bool = acquire_value %.loc8_37.3 // CHECK:STDOUT: %.loc8_17: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %x: bool = value_binding x, %.loc8_37.4 +// CHECK:STDOUT: %x: bool = wrapper_binding x, %.loc8_37.4 // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %.loc8_37.3, constants.%Destroy.Op // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%.loc8_37.3) // CHECK:STDOUT: @@ -2263,7 +2263,7 @@ fn F() { // CHECK:STDOUT: %.loc8_37.3: ref %i16 = temporary %.loc8_37.1, %.loc8_37.2 // CHECK:STDOUT: %.loc8_37.4: %i16 = acquire_value %.loc8_37.3 // CHECK:STDOUT: %i16: type = type_literal constants.%i16 [concrete = constants.%i16] -// CHECK:STDOUT: %x: %i16 = value_binding x, %.loc8_37.4 +// CHECK:STDOUT: %x: %i16 = wrapper_binding x, %.loc8_37.4 // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %.loc8_37.3, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%.loc8_37.3) // CHECK:STDOUT: @@ -2345,7 +2345,7 @@ fn F() { // CHECK:STDOUT: %.loc8_38.3: ref %f64.dc1 = temporary %.loc8_38.1, %.loc8_38.2 // CHECK:STDOUT: %.loc8_38.4: %f64.dc1 = acquire_value %.loc8_38.3 // CHECK:STDOUT: %f64: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %x: %f64.dc1 = value_binding x, %.loc8_38.4 +// CHECK:STDOUT: %x: %f64.dc1 = wrapper_binding x, %.loc8_38.4 // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %.loc8_38.3, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%.loc8_38.3) // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interop/cpp/function/import/class.carbon b/toolchain/check/testdata/interop/cpp/function/import/class.carbon index 72a1b836e46f..607572316a17 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/class.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/class.carbon @@ -872,7 +872,7 @@ fn F() { // CHECK:STDOUT: %N.ref.loc10: = name_ref N, imports.%N [concrete = imports.%N] // CHECK:STDOUT: %C.ref.loc10: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %C = ref_binding x, %x.var +// CHECK:STDOUT: %x: ref %C = wrapper_binding x, %x.var // CHECK:STDOUT: %C.cpp_destructor.bound: = bound_method %x.var, constants.%C.cpp_destructor // CHECK:STDOUT: %C.cpp_destructor.call: init %empty_tuple.type = call %C.cpp_destructor.bound(%x.var) // CHECK:STDOUT: @@ -996,7 +996,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc9: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %O.ref.loc9: type = name_ref O, imports.%O.decl [concrete = constants.%O] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %O = ref_binding x, %x.var +// CHECK:STDOUT: %x: ref %O = wrapper_binding x, %x.var // CHECK:STDOUT: %O.cpp_destructor.bound: = bound_method %x.var, constants.%O.cpp_destructor // CHECK:STDOUT: %O.cpp_destructor.call: init %empty_tuple.type = call %O.cpp_destructor.bound(%x.var) // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interop/cpp/function/import/decayed_param.carbon b/toolchain/check/testdata/interop/cpp/function/import/decayed_param.carbon index efbe02832b53..4f373f9f85e8 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/decayed_param.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/decayed_param.carbon @@ -235,7 +235,7 @@ fn F() { // CHECK:STDOUT: %int_42: Core.IntLiteral = int_value 42 [concrete = constants.%int_42] // CHECK:STDOUT: %array_type: type = array_type %int_42, %i32 [concrete = constants.%array_type.d58] // CHECK:STDOUT: } -// CHECK:STDOUT: %n: ref %array_type.d58 = ref_binding n, %n.var +// CHECK:STDOUT: %n: ref %array_type.d58 = wrapper_binding n, %n.var // CHECK:STDOUT: %Cpp.ref.loc11: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %TakesArray.ref.loc11: %TakesArray.cpp_overload_set.type = name_ref TakesArray, imports.%TakesArray.cpp_overload_set.value [concrete = constants.%TakesArray.cpp_overload_set.value] // CHECK:STDOUT: %n.ref: ref %array_type.d58 = name_ref n, %n @@ -405,7 +405,7 @@ fn F() { // CHECK:STDOUT: %int_42: Core.IntLiteral = int_value 42 [concrete = constants.%int_42] // CHECK:STDOUT: %array_type: type = array_type %int_42, %i32 [concrete = constants.%array_type.d58] // CHECK:STDOUT: } -// CHECK:STDOUT: %n: ref %array_type.d58 = ref_binding n, %n.var +// CHECK:STDOUT: %n: ref %array_type.d58 = wrapper_binding n, %n.var // CHECK:STDOUT: %Cpp.ref.loc31: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %TakesFunction.ref.loc31: %TakesFunction.cpp_overload_set.type = name_ref TakesFunction, imports.%TakesFunction.cpp_overload_set.value [concrete = constants.%TakesFunction.cpp_overload_set.value] // CHECK:STDOUT: %n.ref: ref %array_type.d58 = name_ref n, %n diff --git a/toolchain/check/testdata/interop/cpp/function/import/default_arg.carbon b/toolchain/check/testdata/interop/cpp/function/import/default_arg.carbon index 523ac4e5e624..9cbfe0ee8780 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/default_arg.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/default_arg.carbon @@ -327,7 +327,7 @@ fn Call() { // CHECK:STDOUT: %.loc9_57.1: %i32 = value_of_initializer %GlobalReturnInt.call // CHECK:STDOUT: %.loc9_57.2: %i32 = converted %GlobalReturnInt.call, %.loc9_57.1 // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %value: %i32 = value_binding value, %.loc9_57.2 +// CHECK:STDOUT: %value: %i32 = wrapper_binding value, %.loc9_57.2 // CHECK:STDOUT: %.loc10_5.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %Cpp.ref.loc10: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %X.ref.loc10: type = name_ref X, imports.%X.decl [concrete = constants.%X] @@ -534,14 +534,14 @@ fn Call() { // CHECK:STDOUT: %i32.3: type = class_type @Int, @Int(constants.%int_32) [concrete = constants.%i32] // CHECK:STDOUT: %i32.4: type = type_literal %i32.3 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %i32 = value_param call_param1 // CHECK:STDOUT: %.2: type = splice_block %i32.2 [concrete = constants.%i32] { // CHECK:STDOUT: %int_32.1: Core.IntLiteral = int_value 32 [concrete = constants.%int_32] // CHECK:STDOUT: %i32.1: type = class_type @Int, @Int(constants.%int_32) [concrete = constants.%i32] // CHECK:STDOUT: %i32.2: type = type_literal %i32.1 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %i32 = value_binding b, %b.param +// CHECK:STDOUT: %b: %i32 = wrapper_binding b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: %Core.ImplicitAs: %ImplicitAs.type.0ff = import_ref Core//prelude/parts/as, ImplicitAs, loaded [concrete = constants.%ImplicitAs.generic] // CHECK:STDOUT: %Core.import_ref.edf: @Core.IntLiteral.as.ImplicitAs.impl.%Core.IntLiteral.as.ImplicitAs.impl.Convert.type (%Core.IntLiteral.as.ImplicitAs.impl.Convert.type.e74) = import_ref Core//prelude/parts/int, loc{{\d+_\d+}}, loaded [symbolic = @Core.IntLiteral.as.ImplicitAs.impl.%Core.IntLiteral.as.ImplicitAs.impl.Convert (constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.845)] @@ -564,14 +564,14 @@ fn Call() { // CHECK:STDOUT: %i32.5: type = class_type @Int, @Int(constants.%int_32) [concrete = constants.%i32] // CHECK:STDOUT: %i32.6: type = type_literal %i32.5 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %i32 = value_param call_param1 // CHECK:STDOUT: %.2: type = splice_block %i32.4 [concrete = constants.%i32] { // CHECK:STDOUT: %int_32.2: Core.IntLiteral = int_value 32 [concrete = constants.%int_32] // CHECK:STDOUT: %i32.3: type = class_type @Int, @Int(constants.%int_32) [concrete = constants.%i32] // CHECK:STDOUT: %i32.4: type = type_literal %i32.3 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %i32 = value_binding b, %b.param +// CHECK:STDOUT: %b: %i32 = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param2 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -589,21 +589,21 @@ fn Call() { // CHECK:STDOUT: %i32.5: type = class_type @Int, @Int(constants.%int_32) [concrete = constants.%i32] // CHECK:STDOUT: %i32.6: type = type_literal %i32.5 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %i32 = value_param call_param1 // CHECK:STDOUT: %.2: type = splice_block %i32.4 [concrete = constants.%i32] { // CHECK:STDOUT: %int_32.2: Core.IntLiteral = int_value 32 [concrete = constants.%int_32] // CHECK:STDOUT: %i32.3: type = class_type @Int, @Int(constants.%int_32) [concrete = constants.%i32] // CHECK:STDOUT: %i32.4: type = type_literal %i32.3 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %i32 = value_binding b, %b.param +// CHECK:STDOUT: %b: %i32 = wrapper_binding b, %b.param // CHECK:STDOUT: %c.param: %i32 = value_param call_param2 // CHECK:STDOUT: %.3: type = splice_block %i32.2 [concrete = constants.%i32] { // CHECK:STDOUT: %int_32.1: Core.IntLiteral = int_value 32 [concrete = constants.%int_32] // CHECK:STDOUT: %i32.1: type = class_type @Int, @Int(constants.%int_32) [concrete = constants.%i32] // CHECK:STDOUT: %i32.2: type = type_literal %i32.1 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %i32 = value_binding c, %c.param +// CHECK:STDOUT: %c: %i32 = wrapper_binding c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: %X.decl: type = class_decl @X [concrete = constants.%X] {} {} // CHECK:STDOUT: %X.B.cpp_overload_set.value: %X.B.cpp_overload_set.type = cpp_overload_set_value @X.B.cpp_overload_set [concrete = constants.%X.B.cpp_overload_set.value] @@ -614,14 +614,14 @@ fn Call() { // CHECK:STDOUT: %a.patt: %pattern_type.6b6 = at_binding_pattern a, %a.param_patt [concrete = constants.%a.patt] // CHECK:STDOUT: } { // CHECK:STDOUT: %this.param: %X = value_param call_param0 -// CHECK:STDOUT: %this: %X = value_binding this, %this.param +// CHECK:STDOUT: %this: %X = wrapper_binding this, %this.param // CHECK:STDOUT: %a.param: %i32 = value_param call_param1 // CHECK:STDOUT: %.1: type = splice_block %i32.2 [concrete = constants.%i32] { // CHECK:STDOUT: %int_32: Core.IntLiteral = int_value 32 [concrete = constants.%int_32] // CHECK:STDOUT: %i32.1: type = class_type @Int, @Int(constants.%int_32) [concrete = constants.%i32] // CHECK:STDOUT: %i32.2: type = type_literal %i32.1 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %X.C.cpp_overload_set.value: %X.C.cpp_overload_set.type = cpp_overload_set_value @X.C.cpp_overload_set [concrete = constants.%X.C.cpp_overload_set.value] // CHECK:STDOUT: %C__carbon_thunk.decl: %C__carbon_thunk.type = fn_decl @C__carbon_thunk [concrete = constants.%C__carbon_thunk] { @@ -634,7 +634,7 @@ fn Call() { // CHECK:STDOUT: %i32.1: type = class_type @Int, @Int(constants.%int_32) [concrete = constants.%i32] // CHECK:STDOUT: %i32.2: type = type_literal %i32.1 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %X.D.cpp_overload_set.value: %X.D.cpp_overload_set.type = cpp_overload_set_value @X.D.cpp_overload_set [concrete = constants.%X.D.cpp_overload_set.value] // CHECK:STDOUT: %D__carbon_thunk.decl: %D__carbon_thunk.type = fn_decl @D__carbon_thunk [concrete = constants.%D__carbon_thunk] { @@ -644,14 +644,14 @@ fn Call() { // CHECK:STDOUT: %a.patt: %pattern_type.6b6 = at_binding_pattern a, %a.param_patt [concrete = constants.%a.patt] // CHECK:STDOUT: } { // CHECK:STDOUT: %_.param: %ptr.ca1 = value_param call_param0 -// CHECK:STDOUT: %_: %ptr.ca1 = value_binding _, %_.param +// CHECK:STDOUT: %_: %ptr.ca1 = wrapper_binding _, %_.param // CHECK:STDOUT: %a.param: %i32 = value_param call_param1 // CHECK:STDOUT: %.1: type = splice_block %i32.2 [concrete = constants.%i32] { // CHECK:STDOUT: %int_32: Core.IntLiteral = int_value 32 [concrete = constants.%int_32] // CHECK:STDOUT: %i32.1: type = class_type @Int, @Int(constants.%int_32) [concrete = constants.%i32] // CHECK:STDOUT: %i32.2: type = type_literal %i32.1 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %Core.Destroy: type = import_ref Core//prelude/parts/destroy, Destroy, loaded [concrete = constants.%Destroy.type] // CHECK:STDOUT: %Destroy.WithSelf.Op.decl: %Destroy.WithSelf.Op.type.d3e = fn_decl @Destroy.WithSelf.Op [symbolic = @Destroy.WithSelf.%Destroy.WithSelf.Op (constants.%Destroy.WithSelf.Op.42b)] {} {} @@ -660,7 +660,7 @@ fn Call() { // CHECK:STDOUT: %self.patt: %pattern_type.fa7 = at_binding_pattern self, %self.param_patt [concrete = constants.%self.patt.37b] // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: ref %X = ref_param call_param0 -// CHECK:STDOUT: %self: ref %X = ref_binding self, %self.param +// CHECK:STDOUT: %self: ref %X = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -735,7 +735,7 @@ fn Call() { // CHECK:STDOUT: %.loc9_51.1: %i32 = value_of_initializer %GlobalReturnInt__carbon_thunk.call // CHECK:STDOUT: %.loc9_51.2: %i32 = converted %GlobalReturnInt__carbon_thunk.call, %.loc9_51.1 // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %value: %i32 = value_binding value, %.loc9_51.2 +// CHECK:STDOUT: %value: %i32 = wrapper_binding value, %.loc9_51.2 // CHECK:STDOUT: %Cpp.ref.loc10: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %GlobalNoReturn.ref.loc10: %GlobalNoReturn.cpp_overload_set.type = name_ref GlobalNoReturn, imports.%GlobalNoReturn.cpp_overload_set.value [concrete = constants.%GlobalNoReturn.cpp_overload_set.value] // CHECK:STDOUT: %int_1.loc10: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] @@ -820,7 +820,7 @@ fn Call() { // CHECK:STDOUT: %self.patt: %pattern_type.fa7 = at_binding_pattern self, %.1 [concrete = constants.%self.patt.37b] // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: ref %X = ref_param call_param0 -// CHECK:STDOUT: %self: ref %X = ref_binding self, %self.param +// CHECK:STDOUT: %self: ref %X = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %Op.ref.loc13: %X.cpp_destructor.type = name_ref Op, imports.%X.cpp_destructor.decl [concrete = constants.%X.cpp_destructor] // CHECK:STDOUT: %Op.ref.loc11: %X.cpp_destructor.type = name_ref Op, imports.%X.cpp_destructor.decl [concrete = constants.%X.cpp_destructor] diff --git a/toolchain/check/testdata/interop/cpp/function/import/full_semir.carbon b/toolchain/check/testdata/interop/cpp/function/import/full_semir.carbon index 7f8f8c71a621..40138e83dd38 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/full_semir.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/full_semir.carbon @@ -150,7 +150,7 @@ fn F() { // CHECK:STDOUT: %i16.1: type = class_type @Int, @Int(constants.%int_16) [concrete = constants.%i16] // CHECK:STDOUT: %i16.2: type = type_literal %i16.1 [concrete = constants.%i16] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %ptr.686 = value_binding a, %a.param +// CHECK:STDOUT: %a: %ptr.686 = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %Core.Copy: type = import_ref Core//prelude/parts/copy, Copy, loaded [concrete = constants.%Copy.type] // CHECK:STDOUT: %Core.import_ref.cd6: @Int.as.Copy.impl.%Int.as.Copy.impl.Op.type (%Int.as.Copy.impl.Op.type.ac8) = 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.5e0)] @@ -267,7 +267,7 @@ fn F() { // CHECK:STDOUT: %i32.1: type = class_type @Int, @Int(constants.%int_32) [concrete = constants.%i32] // CHECK:STDOUT: %i32.2: type = type_literal %i32.1 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %Core.ImplicitAs: %ImplicitAs.type.0ff = import_ref Core//prelude/parts/as, ImplicitAs, loaded [concrete = constants.%ImplicitAs.generic] // CHECK:STDOUT: %Core.import_ref.edf: @Core.IntLiteral.as.ImplicitAs.impl.%Core.IntLiteral.as.ImplicitAs.impl.Convert.type (%Core.IntLiteral.as.ImplicitAs.impl.Convert.type.e74) = import_ref Core//prelude/parts/int, loc{{\d+_\d+}}, loaded [symbolic = @Core.IntLiteral.as.ImplicitAs.impl.%Core.IntLiteral.as.ImplicitAs.impl.Convert (constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.845)] @@ -354,7 +354,7 @@ fn F() { // CHECK:STDOUT: %i16.1: type = class_type @Int, @Int(constants.%int_16) [concrete = constants.%i16] // CHECK:STDOUT: %i16.2: type = type_literal %i16.1 [concrete = constants.%i16] // CHECK:STDOUT: } -// CHECK:STDOUT: %return: %ptr = value_binding r#return, %return.param +// CHECK:STDOUT: %return: %ptr = wrapper_binding r#return, %return.param // CHECK:STDOUT: } // CHECK:STDOUT: %Core.Destroy: type = import_ref Core//prelude/parts/destroy, Destroy, loaded [concrete = constants.%Destroy.type] // CHECK:STDOUT: } @@ -386,7 +386,7 @@ fn F() { // CHECK:STDOUT: %.loc7_37.3: ref %i16 = temporary %.loc7_37.1, %.loc7_37.2 // CHECK:STDOUT: %.loc7_37.4: %i16 = acquire_value %.loc7_37.3 // CHECK:STDOUT: %i16: type = type_literal constants.%i16 [concrete = constants.%i16] -// CHECK:STDOUT: %x: %i16 = value_binding x, %.loc7_37.4 +// CHECK:STDOUT: %x: %i16 = wrapper_binding x, %.loc7_37.4 // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %.loc7_37.3, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%.loc7_37.3) // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/interop/cpp/function/import/inline.carbon b/toolchain/check/testdata/interop/cpp/function/import/inline.carbon index d5daf1a326e5..e888e5e11426 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/inline.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/inline.carbon @@ -278,7 +278,7 @@ fn MyF() { // CHECK:STDOUT: %.loc13_42.1: %i32 = value_of_initializer %WithoutThunk.call // CHECK:STDOUT: %.loc13_42.2: %i32 = converted %WithoutThunk.call, %.loc13_42.1 // CHECK:STDOUT: %i32.loc13: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %r1: %i32 = value_binding r1, %.loc13_42.2 +// CHECK:STDOUT: %r1: %i32 = wrapper_binding r1, %.loc13_42.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %r2.patt: %pattern_type.6b6 = value_binding_pattern r2 [concrete = constants.%r2.patt] // CHECK:STDOUT: } @@ -304,7 +304,7 @@ fn MyF() { // CHECK:STDOUT: %.loc14_40.1: %i32 = value_of_initializer %ThunkOnArg__carbon_thunk.call // CHECK:STDOUT: %.loc14_40.2: %i32 = converted %ThunkOnArg__carbon_thunk.call, %.loc14_40.1 // CHECK:STDOUT: %i32.loc14: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %r2: %i32 = value_binding r2, %.loc14_40.2 +// CHECK:STDOUT: %r2: %i32 = wrapper_binding r2, %.loc14_40.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %r3.patt: %pattern_type.203 = value_binding_pattern r3 [concrete = constants.%r3.patt] // CHECK:STDOUT: } @@ -325,7 +325,7 @@ fn MyF() { // CHECK:STDOUT: %.loc15_43.3: ref %i16 = temporary %.loc15_43.1, %.loc15_43.2 // CHECK:STDOUT: %.loc15_43.4: %i16 = acquire_value %.loc15_43.3 // CHECK:STDOUT: %i16.loc15: type = type_literal constants.%i16 [concrete = constants.%i16] -// CHECK:STDOUT: %r3: %i16 = value_binding r3, %.loc15_43.4 +// CHECK:STDOUT: %r3: %i16 = wrapper_binding r3, %.loc15_43.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %r4.patt: %pattern_type.203 = value_binding_pattern r4 [concrete = constants.%r4.patt] // CHECK:STDOUT: } @@ -354,7 +354,7 @@ fn MyF() { // CHECK:STDOUT: %.loc16_41.3: ref %i16 = temporary %.loc16_41.1, %.loc16_41.2 // CHECK:STDOUT: %.loc16_41.4: %i16 = acquire_value %.loc16_41.3 // CHECK:STDOUT: %i16.loc16: type = type_literal constants.%i16 [concrete = constants.%i16] -// CHECK:STDOUT: %r4: %i16 = value_binding r4, %.loc16_41.4 +// CHECK:STDOUT: %r4: %i16 = wrapper_binding r4, %.loc16_41.4 // CHECK:STDOUT: %Destroy.Op.bound.loc16: = bound_method %.loc16_41.3, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call.loc16_41: init %empty_tuple.type = call %Destroy.Op.bound.loc16(%.loc16_41.3) // CHECK:STDOUT: %Destroy.Op.call.loc16_40: init %empty_tuple.type = call constants.%Destroy.Op.bound(constants.%.597) diff --git a/toolchain/check/testdata/interop/cpp/function/import/overloads.carbon b/toolchain/check/testdata/interop/cpp/function/import/overloads.carbon index 3d7b19004ed8..78cf71a49653 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/overloads.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/overloads.carbon @@ -875,7 +875,7 @@ fn F() { // CHECK:STDOUT: %i16.1: type = class_type @Int, @Int(constants.%int_16) [concrete = constants.%i16] // CHECK:STDOUT: %i16.2: type = type_literal %i16.1 [concrete = constants.%i16] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %ptr.686 = value_binding a, %a.param +// CHECK:STDOUT: %a: %ptr.686 = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %Core.Copy: type = import_ref Core//prelude/parts/copy, Copy, loaded [concrete = constants.%Copy.type] // CHECK:STDOUT: %Core.import_ref.cd6: @Int.as.Copy.impl.%Int.as.Copy.impl.Op.type (%Int.as.Copy.impl.Op.type.ac8) = 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.5e0)] @@ -995,7 +995,7 @@ fn F() { // CHECK:STDOUT: %i32.1: type = class_type @Int, @Int(constants.%int_32) [concrete = constants.%i32] // CHECK:STDOUT: %i32.2: type = type_literal %i32.1 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1134,7 +1134,7 @@ fn F() { // CHECK:STDOUT: %i32.1: type = class_type @Int, @Int(constants.%int_32) [concrete = constants.%i32] // CHECK:STDOUT: %i32.2: type = type_literal %i32.1 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %foo__carbon_thunk.decl: %foo__carbon_thunk.type = fn_decl @foo__carbon_thunk [concrete = constants.%foo__carbon_thunk] { // CHECK:STDOUT: %a.param_patt: %pattern_type.f71 = value_param_pattern [concrete = constants.%a.param_patt.58a] @@ -1146,7 +1146,7 @@ fn F() { // CHECK:STDOUT: %i16.1: type = class_type @Int, @Int(constants.%int_16) [concrete = constants.%i16] // CHECK:STDOUT: %i16.2: type = type_literal %i16.1 [concrete = constants.%i16] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %ptr.686 = value_binding a, %a.param +// CHECK:STDOUT: %a: %ptr.686 = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %Core.Copy: type = import_ref Core//prelude/parts/copy, Copy, loaded [concrete = constants.%Copy.type] // CHECK:STDOUT: %Core.import_ref.cd6: @Int.as.Copy.impl.%Int.as.Copy.impl.Op.type (%Int.as.Copy.impl.Op.type.ac8) = 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.5e0)] @@ -1285,7 +1285,7 @@ fn F() { // CHECK:STDOUT: %i32.1: type = class_type @Int, @Int(constants.%int_32) [concrete = constants.%i32] // CHECK:STDOUT: %i32.2: type = type_literal %i32.1 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %bar.cpp_overload_set.value: %bar.cpp_overload_set.type = cpp_overload_set_value @bar.cpp_overload_set [concrete = constants.%bar.cpp_overload_set.value] // CHECK:STDOUT: %bar.decl: %bar.type = fn_decl @bar [concrete = constants.%bar] { @@ -1298,7 +1298,7 @@ fn F() { // CHECK:STDOUT: %i32.1: type = class_type @Int, @Int(constants.%int_32) [concrete = constants.%i32] // CHECK:STDOUT: %i32.2: type = type_literal %i32.1 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1520,7 +1520,7 @@ fn F() { // CHECK:STDOUT: %i32.3: type = class_type @Int, @Int(constants.%int_32) [concrete = constants.%i32] // CHECK:STDOUT: %i32.4: type = type_literal %i32.3 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -1542,7 +1542,7 @@ fn F() { // CHECK:STDOUT: %i64.3: type = class_type @Int, @Int(constants.%int_64) [concrete = constants.%i64] // CHECK:STDOUT: %i64.4: type = type_literal %i64.3 [concrete = constants.%i64] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %i64 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i64 = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref %i64 = out_param call_param1 // CHECK:STDOUT: %return: ref %i64 = return_slot %return.param // CHECK:STDOUT: } @@ -1558,14 +1558,14 @@ fn F() { // CHECK:STDOUT: %i128.3: type = class_type @Int, @Int(constants.%int_128) [concrete = constants.%i128] // CHECK:STDOUT: %i128.4: type = type_literal %i128.3 [concrete = constants.%i128] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %ptr.19c = value_binding a, %a.param +// CHECK:STDOUT: %a: %ptr.19c = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: %ptr.19c = value_param call_param1 // CHECK:STDOUT: %.2: type = splice_block constants.%ptr.19c [concrete = constants.%ptr.19c] { // CHECK:STDOUT: %int_128.1: Core.IntLiteral = int_value 128 [concrete = constants.%int_128] // CHECK:STDOUT: %i128.1: type = class_type @Int, @Int(constants.%int_128) [concrete = constants.%i128] // CHECK:STDOUT: %i128.2: type = type_literal %i128.1 [concrete = constants.%i128] // CHECK:STDOUT: } -// CHECK:STDOUT: %return: %ptr.19c = value_binding r#return, %return.param +// CHECK:STDOUT: %return: %ptr.19c = wrapper_binding r#return, %return.param // CHECK:STDOUT: } // CHECK:STDOUT: %Core.Copy: type = import_ref Core//prelude/parts/copy, Copy, loaded [concrete = constants.%Copy.type] // CHECK:STDOUT: %Core.import_ref.cd6: @Int.as.Copy.impl.%Int.as.Copy.impl.Op.type (%Int.as.Copy.impl.Op.type.ac8) = 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.5e0)] @@ -1605,7 +1605,7 @@ fn F() { // CHECK:STDOUT: %.loc8_41.1: %i32 = value_of_initializer %foo.call.loc8 // CHECK:STDOUT: %.loc8_41.2: %i32 = converted %foo.call.loc8, %.loc8_41.1 // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %.loc8_41.2 +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %.loc8_41.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.f57 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } @@ -1623,7 +1623,7 @@ fn F() { // CHECK:STDOUT: %.loc13_41.1: %i64 = value_of_initializer %foo.call.loc13 // CHECK:STDOUT: %.loc13_41.2: %i64 = converted %foo.call.loc13, %.loc13_41.1 // CHECK:STDOUT: %i64.loc13: type = type_literal constants.%i64 [concrete = constants.%i64] -// CHECK:STDOUT: %b: %i64 = value_binding b, %.loc13_41.2 +// CHECK:STDOUT: %b: %i64 = wrapper_binding b, %.loc13_41.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b_hexa.patt: %pattern_type.f57 = value_binding_pattern b_hexa [concrete = constants.%b_hexa.patt] // CHECK:STDOUT: } @@ -1641,7 +1641,7 @@ fn F() { // CHECK:STDOUT: %.loc14_47.1: %i64 = value_of_initializer %foo.call.loc14 // CHECK:STDOUT: %.loc14_47.2: %i64 = converted %foo.call.loc14, %.loc14_47.1 // CHECK:STDOUT: %i64.loc14: type = type_literal constants.%i64 [concrete = constants.%i64] -// CHECK:STDOUT: %b_hexa: %i64 = value_binding b_hexa, %.loc14_47.2 +// CHECK:STDOUT: %b_hexa: %i64 = wrapper_binding b_hexa, %.loc14_47.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b_binary.patt: %pattern_type.f57 = value_binding_pattern b_binary [concrete = constants.%b_binary.patt] // CHECK:STDOUT: } @@ -1659,7 +1659,7 @@ fn F() { // CHECK:STDOUT: %.loc15_79.1: %i64 = value_of_initializer %foo.call.loc15 // CHECK:STDOUT: %.loc15_79.2: %i64 = converted %foo.call.loc15, %.loc15_79.1 // CHECK:STDOUT: %i64.loc15: type = type_literal constants.%i64 [concrete = constants.%i64] -// CHECK:STDOUT: %b_binary: %i64 = value_binding b_binary, %.loc15_79.2 +// CHECK:STDOUT: %b_binary: %i64 = wrapper_binding b_binary, %.loc15_79.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.f57 = value_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: } @@ -1677,7 +1677,7 @@ fn F() { // CHECK:STDOUT: %.loc18_50.1: %i64 = value_of_initializer %foo.call.loc18 // CHECK:STDOUT: %.loc18_50.2: %i64 = converted %foo.call.loc18, %.loc18_50.1 // CHECK:STDOUT: %i64.loc18: type = type_literal constants.%i64 [concrete = constants.%i64] -// CHECK:STDOUT: %c: %i64 = value_binding c, %.loc18_50.2 +// CHECK:STDOUT: %c: %i64 = wrapper_binding c, %.loc18_50.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.97f = value_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: } @@ -1706,7 +1706,7 @@ fn F() { // CHECK:STDOUT: %.loc22_51.3: ref %i128 = temporary %.loc22_51.1, %.loc22_51.2 // CHECK:STDOUT: %.loc22_51.4: %i128 = acquire_value %.loc22_51.3 // CHECK:STDOUT: %i128.loc22: type = type_literal constants.%i128 [concrete = constants.%i128] -// CHECK:STDOUT: %d: %i128 = value_binding d, %.loc22_51.4 +// CHECK:STDOUT: %d: %i128 = wrapper_binding d, %.loc22_51.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %e.patt: %pattern_type.97f = value_binding_pattern e [concrete = constants.%e.patt] // CHECK:STDOUT: } @@ -1735,7 +1735,7 @@ fn F() { // CHECK:STDOUT: %.loc25_52.3: ref %i128 = temporary %.loc25_52.1, %.loc25_52.2 // CHECK:STDOUT: %.loc25_52.4: %i128 = acquire_value %.loc25_52.3 // CHECK:STDOUT: %i128.loc25: type = type_literal constants.%i128 [concrete = constants.%i128] -// CHECK:STDOUT: %e: %i128 = value_binding e, %.loc25_52.4 +// CHECK:STDOUT: %e: %i128 = wrapper_binding e, %.loc25_52.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %f.patt: %pattern_type.97f = value_binding_pattern f [concrete = constants.%f.patt] // CHECK:STDOUT: } @@ -1764,7 +1764,7 @@ fn F() { // CHECK:STDOUT: %.loc28_52.3: ref %i128 = temporary %.loc28_52.1, %.loc28_52.2 // CHECK:STDOUT: %.loc28_52.4: %i128 = acquire_value %.loc28_52.3 // CHECK:STDOUT: %i128.loc28: type = type_literal constants.%i128 [concrete = constants.%i128] -// CHECK:STDOUT: %f: %i128 = value_binding f, %.loc28_52.4 +// CHECK:STDOUT: %f: %i128 = wrapper_binding f, %.loc28_52.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %g.patt: %pattern_type.97f = value_binding_pattern g [concrete = constants.%g.patt] // CHECK:STDOUT: } @@ -1793,7 +1793,7 @@ fn F() { // CHECK:STDOUT: %.loc31_71.3: ref %i128 = temporary %.loc31_71.1, %.loc31_71.2 // CHECK:STDOUT: %.loc31_71.4: %i128 = acquire_value %.loc31_71.3 // CHECK:STDOUT: %i128.loc31: type = type_literal constants.%i128 [concrete = constants.%i128] -// CHECK:STDOUT: %g: %i128 = value_binding g, %.loc31_71.4 +// CHECK:STDOUT: %g: %i128 = wrapper_binding g, %.loc31_71.4 // CHECK:STDOUT: %Destroy.Op.bound.loc31: = bound_method %.loc31_71.3, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call.loc31_71: init %empty_tuple.type = call %Destroy.Op.bound.loc31(%.loc31_71.3) // CHECK:STDOUT: %Destroy.Op.call.loc31_32: init %empty_tuple.type = call constants.%Destroy.Op.bound.741(constants.%.dc9) @@ -1876,7 +1876,7 @@ fn F() { // CHECK:STDOUT: %foo.ref: %foo.cpp_overload_set.type = name_ref foo, imports.%foo.cpp_overload_set.value [concrete = constants.%foo.cpp_overload_set.value] // CHECK:STDOUT: %int_170141183460469231731687303715884105728: Core.IntLiteral = int_value 170141183460469231731687303715884105728 [concrete = constants.%int_170141183460469231731687303715884105728] // CHECK:STDOUT: %i128: type = type_literal constants.%i128 [concrete = constants.%i128] -// CHECK:STDOUT: %h: %i128 = value_binding h, [concrete = ] +// CHECK:STDOUT: %h: %i128 = wrapper_binding h, [concrete = ] // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1953,7 +1953,7 @@ fn F() { // CHECK:STDOUT: %i32.1: type = class_type @Int, @Int(constants.%int_32) [concrete = constants.%i32] // CHECK:STDOUT: %i32.2: type = type_literal %i32.1 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %Core.ImplicitAs: %ImplicitAs.type.0ff = import_ref Core//prelude/parts/as, ImplicitAs, loaded [concrete = constants.%ImplicitAs.generic] // CHECK:STDOUT: %Core.import_ref.edf: @Core.IntLiteral.as.ImplicitAs.impl.%Core.IntLiteral.as.ImplicitAs.impl.Convert.type (%Core.IntLiteral.as.ImplicitAs.impl.Convert.type.e74) = import_ref Core//prelude/parts/int, loc{{\d+_\d+}}, loaded [symbolic = @Core.IntLiteral.as.ImplicitAs.impl.%Core.IntLiteral.as.ImplicitAs.impl.Convert (constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.845)] @@ -2069,7 +2069,7 @@ fn F() { // CHECK:STDOUT: %u32.1: type = class_type @UInt, @UInt(constants.%int_32) [concrete = constants.%u32] // CHECK:STDOUT: %u32.2: type = type_literal %u32.1 [concrete = constants.%u32] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %u32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %u32 = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %Core.ImplicitAs: %ImplicitAs.type.0ff = import_ref Core//prelude/parts/as, ImplicitAs, loaded [concrete = constants.%ImplicitAs.generic] // CHECK:STDOUT: %Core.import_ref.aa5: @Core.IntLiteral.as.ImplicitAs.impl.%Core.IntLiteral.as.ImplicitAs.impl.Convert.type (%Core.IntLiteral.as.ImplicitAs.impl.Convert.type.199) = import_ref Core//prelude/parts/uint, loc{{\d+_\d+}}, loaded [symbolic = @Core.IntLiteral.as.ImplicitAs.impl.%Core.IntLiteral.as.ImplicitAs.impl.Convert (constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.170)] @@ -2200,14 +2200,14 @@ fn F() { // CHECK:STDOUT: %f64.3: type = class_type @Float, @Float(constants.%int_64) [concrete = constants.%f64.dc1] // CHECK:STDOUT: %f64.4: type = type_literal %f64.3 [concrete = constants.%f64.dc1] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %ptr.749 = value_binding a, %a.param +// CHECK:STDOUT: %a: %ptr.749 = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: %ptr.749 = value_param call_param1 // CHECK:STDOUT: %.2: type = splice_block constants.%ptr.749 [concrete = constants.%ptr.749] { // CHECK:STDOUT: %int_64.1: Core.IntLiteral = int_value 64 [concrete = constants.%int_64] // CHECK:STDOUT: %f64.1: type = class_type @Float, @Float(constants.%int_64) [concrete = constants.%f64.dc1] // CHECK:STDOUT: %f64.2: type = type_literal %f64.1 [concrete = constants.%f64.dc1] // CHECK:STDOUT: } -// CHECK:STDOUT: %return: %ptr.749 = value_binding r#return, %return.param +// CHECK:STDOUT: %return: %ptr.749 = wrapper_binding r#return, %return.param // CHECK:STDOUT: } // CHECK:STDOUT: %Core.ImplicitAs: %ImplicitAs.type.0ff = import_ref Core//prelude/parts/as, ImplicitAs, loaded [concrete = constants.%ImplicitAs.generic] // CHECK:STDOUT: %Core.import_ref.c4c: @Core.FloatLiteral.as.ImplicitAs.impl.%Core.FloatLiteral.as.ImplicitAs.impl.Convert.type (%Core.FloatLiteral.as.ImplicitAs.impl.Convert.type.063) = import_ref Core//prelude/parts/float, loc{{\d+_\d+}}, loaded [symbolic = @Core.FloatLiteral.as.ImplicitAs.impl.%Core.FloatLiteral.as.ImplicitAs.impl.Convert (constants.%Core.FloatLiteral.as.ImplicitAs.impl.Convert.d4f)] @@ -2261,7 +2261,7 @@ fn F() { // CHECK:STDOUT: %.loc7_34.3: ref %f64.dc1 = temporary %.loc7_34.1, %.loc7_34.2 // CHECK:STDOUT: %.loc7_34.4: %f64.dc1 = acquire_value %.loc7_34.3 // CHECK:STDOUT: %f64: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %d: %f64.dc1 = value_binding d, %.loc7_34.4 +// CHECK:STDOUT: %d: %f64.dc1 = wrapper_binding d, %.loc7_34.4 // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %.loc7_34.3, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call.loc7_34: init %empty_tuple.type = call %Destroy.Op.bound(%.loc7_34.3) // CHECK:STDOUT: %Destroy.Op.call.loc7_31: init %empty_tuple.type = call constants.%Destroy.Op.bound(constants.%.011) @@ -2359,14 +2359,14 @@ fn F() { // CHECK:STDOUT: %f64.3: type = class_type @Float, @Float(constants.%int_64) [concrete = constants.%f64.dc1] // CHECK:STDOUT: %f64.4: type = type_literal %f64.3 [concrete = constants.%f64.dc1] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %ptr.749 = value_binding a, %a.param +// CHECK:STDOUT: %a: %ptr.749 = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: %ptr.749 = value_param call_param1 // CHECK:STDOUT: %.2: type = splice_block constants.%ptr.749 [concrete = constants.%ptr.749] { // CHECK:STDOUT: %int_64.1: Core.IntLiteral = int_value 64 [concrete = constants.%int_64] // CHECK:STDOUT: %f64.1: type = class_type @Float, @Float(constants.%int_64) [concrete = constants.%f64.dc1] // CHECK:STDOUT: %f64.2: type = type_literal %f64.1 [concrete = constants.%f64.dc1] // CHECK:STDOUT: } -// CHECK:STDOUT: %return: %ptr.749 = value_binding r#return, %return.param +// CHECK:STDOUT: %return: %ptr.749 = wrapper_binding r#return, %return.param // CHECK:STDOUT: } // CHECK:STDOUT: %Core.ImplicitAs: %ImplicitAs.type.0ff = import_ref Core//prelude/parts/as, ImplicitAs, loaded [concrete = constants.%ImplicitAs.generic] // CHECK:STDOUT: %Core.import_ref.c4c: @Core.FloatLiteral.as.ImplicitAs.impl.%Core.FloatLiteral.as.ImplicitAs.impl.Convert.type (%Core.FloatLiteral.as.ImplicitAs.impl.Convert.type.063) = import_ref Core//prelude/parts/float, loc{{\d+_\d+}}, loaded [symbolic = @Core.FloatLiteral.as.ImplicitAs.impl.%Core.FloatLiteral.as.ImplicitAs.impl.Convert (constants.%Core.FloatLiteral.as.ImplicitAs.impl.Convert.d4f)] @@ -2482,7 +2482,7 @@ fn F() { // CHECK:STDOUT: %s.patt: %pattern_type.80e = at_binding_pattern s, %s.param_patt [concrete = constants.%s.patt.b99] // CHECK:STDOUT: } { // CHECK:STDOUT: %s.param: %ptr.027 = value_param call_param0 -// CHECK:STDOUT: %s: %ptr.027 = value_binding s, %s.param +// CHECK:STDOUT: %s: %ptr.027 = wrapper_binding s, %s.param // CHECK:STDOUT: } // CHECK:STDOUT: %Core.Destroy: type = import_ref Core//prelude/parts/destroy, Destroy, loaded [concrete = constants.%Destroy.type] // CHECK:STDOUT: } @@ -2519,13 +2519,13 @@ fn F() { // CHECK:STDOUT: %.loc8_18.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc8_18.3: type = converted %.loc8_18.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %value: %empty_struct_type = value_binding value, %value.param +// CHECK:STDOUT: %value: %empty_struct_type = wrapper_binding value, %value.param // CHECK:STDOUT: %reference.param: ref %empty_struct_type = ref_param call_param1 // CHECK:STDOUT: %.loc8_37.1: type = splice_block %.loc8_37.3 [concrete = constants.%empty_struct_type] { // CHECK:STDOUT: %.loc8_37.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc8_37.3: type = converted %.loc8_37.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %reference: ref %empty_struct_type = ref_binding reference, %reference.param +// CHECK:STDOUT: %reference: ref %empty_struct_type = wrapper_binding reference, %reference.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -2664,7 +2664,7 @@ fn F() { // CHECK:STDOUT: %t.patt: %pattern_type.ecf = at_binding_pattern t, %t.param_patt [concrete = constants.%t.patt.81a] // CHECK:STDOUT: } { // CHECK:STDOUT: %t.param: %ptr.6c3 = value_param call_param0 -// CHECK:STDOUT: %t: %ptr.6c3 = value_binding t, %t.param +// CHECK:STDOUT: %t: %ptr.6c3 = wrapper_binding t, %t.param // CHECK:STDOUT: } // CHECK:STDOUT: %Core.ImplicitAs: %ImplicitAs.type.0ff = import_ref Core//prelude/parts/as, ImplicitAs, loaded [concrete = constants.%ImplicitAs.generic] // CHECK:STDOUT: } @@ -2705,7 +2705,7 @@ fn F() { // CHECK:STDOUT: %i32.loc8_46: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a.b.c.loc8_49: type = struct_type {.a: %i32, .b: %i32, .c: %i32} [concrete = constants.%struct_type.a.b.c.fde] // CHECK:STDOUT: } -// CHECK:STDOUT: %value: %struct_type.a.b.c.fde = value_binding value, %value.param +// CHECK:STDOUT: %value: %struct_type.a.b.c.fde = wrapper_binding value, %value.param // CHECK:STDOUT: %reference.param: ref %struct_type.a.b.c.fde = ref_param call_param1 // CHECK:STDOUT: %.loc8_93: type = splice_block %struct_type.a.b.c.loc8_93 [concrete = constants.%struct_type.a.b.c.fde] { // CHECK:STDOUT: %i32.loc8_72: type = type_literal constants.%i32 [concrete = constants.%i32] @@ -2713,7 +2713,7 @@ fn F() { // CHECK:STDOUT: %i32.loc8_90: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a.b.c.loc8_93: type = struct_type {.a: %i32, .b: %i32, .c: %i32} [concrete = constants.%struct_type.a.b.c.fde] // CHECK:STDOUT: } -// CHECK:STDOUT: %reference: ref %struct_type.a.b.c.fde = ref_binding reference, %reference.param +// CHECK:STDOUT: %reference: ref %struct_type.a.b.c.fde = wrapper_binding reference, %reference.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -2979,7 +2979,7 @@ fn F() { // CHECK:STDOUT: %s.patt: %pattern_type.80e = at_binding_pattern s, %s.param_patt [concrete = constants.%s.patt.b99] // CHECK:STDOUT: } { // CHECK:STDOUT: %s.param: %ptr.027 = value_param call_param0 -// CHECK:STDOUT: %s: %ptr.027 = value_binding s, %s.param +// CHECK:STDOUT: %s: %ptr.027 = wrapper_binding s, %s.param // CHECK:STDOUT: } // CHECK:STDOUT: %Core.ImplicitAs: %ImplicitAs.type.0ff = import_ref Core//prelude/parts/as, ImplicitAs, loaded [concrete = constants.%ImplicitAs.generic] // CHECK:STDOUT: %Core.Int: %Int.type = import_ref Core//prelude/parts/int, Int, loaded [concrete = constants.%Int.generic] @@ -2989,7 +2989,7 @@ fn F() { // CHECK:STDOUT: %t.patt: %pattern_type.ecf = at_binding_pattern t, %t.param_patt [concrete = constants.%t.patt.81a] // CHECK:STDOUT: } { // CHECK:STDOUT: %t.param: %ptr.6c3 = value_param call_param0 -// CHECK:STDOUT: %t: %ptr.6c3 = value_binding t, %t.param +// CHECK:STDOUT: %t: %ptr.6c3 = wrapper_binding t, %t.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -3027,13 +3027,13 @@ fn F() { // CHECK:STDOUT: %.loc11_18.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc11_18.3: type = converted %.loc11_18.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %value: %empty_tuple.type = value_binding value, %value.param +// CHECK:STDOUT: %value: %empty_tuple.type = wrapper_binding value, %value.param // CHECK:STDOUT: %reference.param: ref %empty_tuple.type = ref_param call_param1 // CHECK:STDOUT: %.loc11_37.1: type = splice_block %.loc11_37.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc11_37.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc11_37.3: type = converted %.loc11_37.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %reference: ref %empty_tuple.type = ref_binding reference, %reference.param +// CHECK:STDOUT: %reference: ref %empty_tuple.type = wrapper_binding reference, %reference.param // CHECK:STDOUT: } // CHECK:STDOUT: %MakeThreeFields.decl: %MakeThreeFields.type = fn_decl @MakeThreeFields [concrete = constants.%MakeThreeFields] { // CHECK:STDOUT: %return.param_patt: %pattern_type.777 = out_param_pattern [concrete = constants.%return.param_patt.789] @@ -3062,7 +3062,7 @@ fn F() { // CHECK:STDOUT: %.loc67_37.2: %tuple.type.ff9 = tuple_literal (%i32.loc67_24, %i32.loc67_29, %i32.loc67_34) [concrete = constants.%tuple.04d] // CHECK:STDOUT: %.loc67_37.3: type = converted %.loc67_37.2, constants.%tuple.type.555 [concrete = constants.%tuple.type.555] // CHECK:STDOUT: } -// CHECK:STDOUT: %value: %tuple.type.555 = value_binding value, %value.param +// CHECK:STDOUT: %value: %tuple.type.555 = wrapper_binding value, %value.param // CHECK:STDOUT: %reference.param: ref %tuple.type.555 = ref_param call_param1 // CHECK:STDOUT: %.loc67_69.1: type = splice_block %.loc67_69.3 [concrete = constants.%tuple.type.555] { // CHECK:STDOUT: %i32.loc67_56: type = type_literal constants.%i32 [concrete = constants.%i32] @@ -3071,7 +3071,7 @@ fn F() { // CHECK:STDOUT: %.loc67_69.2: %tuple.type.ff9 = tuple_literal (%i32.loc67_56, %i32.loc67_61, %i32.loc67_66) [concrete = constants.%tuple.04d] // CHECK:STDOUT: %.loc67_69.3: type = converted %.loc67_69.2, constants.%tuple.type.555 [concrete = constants.%tuple.type.555] // CHECK:STDOUT: } -// CHECK:STDOUT: %reference: ref %tuple.type.555 = ref_binding reference, %reference.param +// CHECK:STDOUT: %reference: ref %tuple.type.555 = wrapper_binding reference, %reference.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -3228,7 +3228,7 @@ fn F() { // CHECK:STDOUT: %i32.1: type = class_type @Int, @Int(constants.%int_32) [concrete = constants.%i32] // CHECK:STDOUT: %i32.2: type = type_literal %i32.1 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %n: %i32 = value_binding n, %n.param +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, %n.param // CHECK:STDOUT: } // CHECK:STDOUT: %Core.ImplicitAs: %ImplicitAs.type.0ff = import_ref Core//prelude/parts/as, ImplicitAs, loaded [concrete = constants.%ImplicitAs.generic] // CHECK:STDOUT: } @@ -3310,7 +3310,7 @@ fn F() { // CHECK:STDOUT: %i32.1: type = class_type @Int, @Int(constants.%int_32) [concrete = constants.%i32] // CHECK:STDOUT: %i32.2: type = type_literal %i32.1 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %n: %i32 = value_binding n, %n.param +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, %n.param // CHECK:STDOUT: } // CHECK:STDOUT: %Core.ImplicitAs: %ImplicitAs.type.0ff = import_ref Core//prelude/parts/as, ImplicitAs, loaded [concrete = constants.%ImplicitAs.generic] // CHECK:STDOUT: } @@ -3453,7 +3453,7 @@ fn F() { // CHECK:STDOUT: %_.patt: %pattern_type.733 = at_binding_pattern _, %_.param_patt [concrete = constants.%_.patt.025] // CHECK:STDOUT: } { // CHECK:STDOUT: %_.param: %ptr.dc0 = value_param call_param0 -// CHECK:STDOUT: %_: %ptr.dc0 = value_binding _, %_.param +// CHECK:STDOUT: %_: %ptr.dc0 = wrapper_binding _, %_.param // CHECK:STDOUT: } // CHECK:STDOUT: %Core.Int: %Int.type = import_ref Core//prelude/parts/int, Int, loaded [concrete = constants.%Int.generic] // CHECK:STDOUT: %Core.ImplicitAs: %ImplicitAs.type.0ff = import_ref Core//prelude/parts/as, ImplicitAs, loaded [concrete = constants.%ImplicitAs.generic] @@ -3589,7 +3589,7 @@ fn F() { // CHECK:STDOUT: %i32.1: type = class_type @Int, @Int(constants.%int_32) [concrete = constants.%i32] // CHECK:STDOUT: %i32.2: type = type_literal %i32.1 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %Core.ImplicitAs: %ImplicitAs.type.0ff = import_ref Core//prelude/parts/as, ImplicitAs, loaded [concrete = constants.%ImplicitAs.generic] // CHECK:STDOUT: } @@ -3695,7 +3695,7 @@ fn F() { // CHECK:STDOUT: %i16.1: type = class_type @Int, @Int(constants.%int_16) [concrete = constants.%i16] // CHECK:STDOUT: %i16.2: type = type_literal %i16.1 [concrete = constants.%i16] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %ptr = value_binding a, %a.param +// CHECK:STDOUT: %a: %ptr = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %Core.ImplicitAs: %ImplicitAs.type.0ff = import_ref Core//prelude/parts/as, ImplicitAs, loaded [concrete = constants.%ImplicitAs.generic] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/interop/cpp/function/import/pointer.carbon b/toolchain/check/testdata/interop/cpp/function/import/pointer.carbon index 6cf497300a94..2e3ef413c7a7 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/pointer.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/pointer.carbon @@ -477,7 +477,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc8: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %S.ref: type = name_ref S, imports.%S.decl [concrete = constants.%S] // CHECK:STDOUT: } -// CHECK:STDOUT: %s: ref %S = ref_binding s, %s.var +// CHECK:STDOUT: %s: ref %S = wrapper_binding s, %s.var // CHECK:STDOUT: %Cpp.ref.loc9: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %foo.ref: %foo.cpp_overload_set.type = name_ref foo, imports.%foo.cpp_overload_set.value [concrete = constants.%foo.cpp_overload_set.value] // CHECK:STDOUT: %s.ref: ref %S = name_ref s, %s @@ -539,7 +539,7 @@ fn F() { // CHECK:STDOUT: %ptr: type = ptr_type %S.ref [concrete = constants.%ptr] // CHECK:STDOUT: %const: type = const_type %ptr [concrete = constants.%const] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: ref %const = ref_binding p, %p.var +// CHECK:STDOUT: %p: ref %const = wrapper_binding p, %p.var // CHECK:STDOUT: %Cpp.ref.loc11: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %foo.ref: %foo.cpp_overload_set.type = name_ref foo, imports.%foo.cpp_overload_set.value [concrete = constants.%foo.cpp_overload_set.value] // CHECK:STDOUT: %p.ref: ref %const = name_ref p, %p @@ -628,7 +628,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc8: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %S.ref.loc8: type = name_ref S, imports.%S.decl [concrete = constants.%S] // CHECK:STDOUT: } -// CHECK:STDOUT: %s: ref %S = ref_binding s, %s.var +// CHECK:STDOUT: %s: ref %S = wrapper_binding s, %s.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %p.patt: %pattern_type.de6 = ref_binding_pattern p [concrete = constants.%p.patt] // CHECK:STDOUT: %p.var_patt: %pattern_type.de6 = var_pattern %p.patt [concrete = constants.%p.var_patt] @@ -647,7 +647,7 @@ fn F() { // CHECK:STDOUT: %S.ref.loc9: type = name_ref S, imports.%S.decl [concrete = constants.%S] // CHECK:STDOUT: %ptr: type = ptr_type %S.ref.loc9 [concrete = constants.%ptr.037] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: ref %ptr.037 = ref_binding p, %p.var +// CHECK:STDOUT: %p: ref %ptr.037 = wrapper_binding p, %p.var // CHECK:STDOUT: %Cpp.ref.loc10: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %foo.ref: %foo.cpp_overload_set.type = name_ref foo, imports.%foo.cpp_overload_set.value [concrete = constants.%foo.cpp_overload_set.value] // CHECK:STDOUT: %p.ref: ref %ptr.037 = name_ref p, %p @@ -713,7 +713,7 @@ fn F() { // CHECK:STDOUT: %S.ref: type = name_ref S, imports.%S.decl [concrete = constants.%S] // CHECK:STDOUT: %const: type = const_type %S.ref [concrete = constants.%const] // CHECK:STDOUT: } -// CHECK:STDOUT: %s: ref %const = ref_binding s, %s.var +// CHECK:STDOUT: %s: ref %const = wrapper_binding s, %s.var // CHECK:STDOUT: %Cpp.ref.loc11: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %foo.ref: %foo.cpp_overload_set.type = name_ref foo, imports.%foo.cpp_overload_set.value [concrete = constants.%foo.cpp_overload_set.value] // CHECK:STDOUT: %s.ref: ref %const = name_ref s, %s @@ -780,7 +780,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc8: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %S.ref: type = name_ref S, imports.%S.decl [concrete = constants.%S] // CHECK:STDOUT: } -// CHECK:STDOUT: %s: ref %S = ref_binding s, %s.var +// CHECK:STDOUT: %s: ref %S = wrapper_binding s, %s.var // CHECK:STDOUT: %Cpp.ref.loc9: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %foo.ref: %foo.cpp_overload_set.type = name_ref foo, imports.%foo.cpp_overload_set.value [concrete = constants.%foo.cpp_overload_set.value] // CHECK:STDOUT: %s.ref: ref %S = name_ref s, %s @@ -844,7 +844,7 @@ fn F() { // CHECK:STDOUT: %ptr: type = ptr_type %S.ref [concrete = constants.%ptr] // CHECK:STDOUT: %const: type = const_type %ptr [concrete = constants.%const] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: ref %const = ref_binding p, %p.var +// CHECK:STDOUT: %p: ref %const = wrapper_binding p, %p.var // CHECK:STDOUT: %Cpp.ref.loc11: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %foo.ref: %foo.cpp_overload_set.type = name_ref foo, imports.%foo.cpp_overload_set.value [concrete = constants.%foo.cpp_overload_set.value] // CHECK:STDOUT: %p.ref: ref %const = name_ref p, %p @@ -913,7 +913,7 @@ fn F() { // CHECK:STDOUT: %S.ref: type = name_ref S, imports.%S.decl [concrete = constants.%S] // CHECK:STDOUT: %ptr: type = ptr_type %S.ref [concrete = constants.%ptr] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: ref %ptr = ref_binding p, %p.var +// CHECK:STDOUT: %p: ref %ptr = wrapper_binding p, %p.var // CHECK:STDOUT: %Cpp.ref.loc11: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %foo.ref: %foo.cpp_overload_set.type = name_ref foo, imports.%foo.cpp_overload_set.value [concrete = constants.%foo.cpp_overload_set.value] // CHECK:STDOUT: %p.ref: ref %ptr = name_ref p, %p @@ -1040,7 +1040,7 @@ fn F() { // CHECK:STDOUT: %ptr: type = ptr_type %S.ref [concrete = constants.%ptr.037] // CHECK:STDOUT: %const: type = const_type %ptr [concrete = constants.%const.f96] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: ref %const.f96 = ref_binding p, %p.var +// CHECK:STDOUT: %p: ref %const.f96 = wrapper_binding p, %p.var // CHECK:STDOUT: %Cpp.ref.loc11: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %foo.ref: %foo.cpp_overload_set.type = name_ref foo, imports.%foo.cpp_overload_set.value [concrete = constants.%foo.cpp_overload_set.value] // CHECK:STDOUT: %p.ref: ref %const.f96 = name_ref p, %p @@ -1184,7 +1184,7 @@ fn F() { // CHECK:STDOUT: %S.ref: type = name_ref S, imports.%S.decl [concrete = constants.%S] // CHECK:STDOUT: %ptr: type = ptr_type %S.ref [concrete = constants.%ptr.037] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: ref %ptr.037 = ref_binding p, %p.var +// CHECK:STDOUT: %p: ref %ptr.037 = wrapper_binding p, %p.var // CHECK:STDOUT: %Cpp.ref.loc11: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %foo.ref: %foo.cpp_overload_set.type = name_ref foo, imports.%foo.cpp_overload_set.value [concrete = constants.%foo.cpp_overload_set.value] // CHECK:STDOUT: %p.ref: ref %ptr.037 = name_ref p, %p @@ -1460,7 +1460,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc8: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %S.ref: type = name_ref S, imports.%S.decl [concrete = constants.%S] // CHECK:STDOUT: } -// CHECK:STDOUT: %s: ref %S = ref_binding s, %s.var +// CHECK:STDOUT: %s: ref %S = wrapper_binding s, %s.var // CHECK:STDOUT: %Cpp.ref.loc9: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %foo.ref: %foo.cpp_overload_set.type = name_ref foo, imports.%foo.cpp_overload_set.value [concrete = constants.%foo.cpp_overload_set.value] // CHECK:STDOUT: %s.ref: ref %S = name_ref s, %s @@ -1714,7 +1714,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc8: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %S.ref.loc8: type = name_ref S, imports.%S.decl [concrete = constants.%S] // CHECK:STDOUT: } -// CHECK:STDOUT: %s: ref %S = ref_binding s, %s.var +// CHECK:STDOUT: %s: ref %S = wrapper_binding s, %s.var // CHECK:STDOUT: %Cpp.ref.loc9_3: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %foo.ref: %foo.cpp_overload_set.type = name_ref foo, imports.%foo.cpp_overload_set.value [concrete = constants.%foo.cpp_overload_set.value] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [concrete = imports.%Core] @@ -1914,7 +1914,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc8: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %S.ref.loc8: type = name_ref S, imports.%S.decl [concrete = constants.%S] // CHECK:STDOUT: } -// CHECK:STDOUT: %s: ref %S = ref_binding s, %s.var +// CHECK:STDOUT: %s: ref %S = wrapper_binding s, %s.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %p.patt: %pattern_type.de6 = value_binding_pattern p [concrete = constants.%p.patt] // CHECK:STDOUT: } @@ -1930,7 +1930,7 @@ fn F() { // CHECK:STDOUT: %S.ref.loc13: type = name_ref S, imports.%S.decl [concrete = constants.%S] // CHECK:STDOUT: %ptr: type = ptr_type %S.ref.loc13 [concrete = constants.%ptr.037] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.037 = value_binding p, %.loc13_36.2 +// CHECK:STDOUT: %p: %ptr.037 = wrapper_binding p, %.loc13_36.2 // CHECK:STDOUT: %S.cpp_destructor.bound: = bound_method %s.var, constants.%S.cpp_destructor // CHECK:STDOUT: %S.cpp_destructor.call: init %empty_tuple.type = call %S.cpp_destructor.bound(%s.var) // CHECK:STDOUT: @@ -2075,7 +2075,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc10: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %S.ref.loc10: type = name_ref S, imports.%S.decl [concrete = constants.%S] // CHECK:STDOUT: } -// CHECK:STDOUT: %s: ref %S = ref_binding s, %s.var +// CHECK:STDOUT: %s: ref %S = wrapper_binding s, %s.var // CHECK:STDOUT: %Cpp.ref.loc11: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Direct.ref: %Direct.cpp_overload_set.type = name_ref Direct, imports.%Direct.cpp_overload_set.value [concrete = constants.%Direct.cpp_overload_set.value] // CHECK:STDOUT: %s.ref: ref %S = name_ref s, %s @@ -2119,7 +2119,7 @@ fn F() { // CHECK:STDOUT: %.loc13_37.2: %OptionalStorage.type = converted %ptr, %OptionalStorage.facet [concrete = constants.%OptionalStorage.facet.0ce] // CHECK:STDOUT: %Optional: type = class_type @Optional, @Optional(constants.%OptionalStorage.facet.0ce) [concrete = constants.%Optional.659] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %Optional.659 = value_binding a, %.loc13_65.3 +// CHECK:STDOUT: %a: %Optional.659 = wrapper_binding a, %.loc13_65.3 // CHECK:STDOUT: %Destroy.Op.bound.loc13: = bound_method %.loc13_65.2, constants.%Destroy.Op.1a2547.4 // CHECK:STDOUT: %Destroy.Op.call.loc13: init %empty_tuple.type = call %Destroy.Op.bound.loc13(%.loc13_65.2) // CHECK:STDOUT: %Destroy.Op.bound.loc11: = bound_method %.loc11_14.3, constants.%Destroy.Op.1a2547.4 diff --git a/toolchain/check/testdata/interop/cpp/function/import/qualified_param.carbon b/toolchain/check/testdata/interop/cpp/function/import/qualified_param.carbon index 37403711b098..189f6f7eb2d8 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/qualified_param.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/qualified_param.carbon @@ -126,7 +126,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc10: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %S.ref: type = name_ref S, imports.%S.decl [concrete = constants.%S] // CHECK:STDOUT: } -// CHECK:STDOUT: %s: ref %S = ref_binding s, %s.var +// CHECK:STDOUT: %s: ref %S = wrapper_binding s, %s.var // CHECK:STDOUT: %Cpp.ref.loc11: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %TakesConstS.ref: %TakesConstS.cpp_overload_set.type = name_ref TakesConstS, imports.%TakesConstS.cpp_overload_set.value [concrete = constants.%TakesConstS.cpp_overload_set.value] // CHECK:STDOUT: %s.ref: ref %S = name_ref s, %s diff --git a/toolchain/check/testdata/interop/cpp/function/import/reference.carbon b/toolchain/check/testdata/interop/cpp/function/import/reference.carbon index 834f9c3af5c9..05936b296390 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/reference.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/reference.carbon @@ -531,7 +531,7 @@ fn PassConstRef(ref x: const X) { // CHECK:STDOUT: %Cpp.ref.loc8: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %S.ref: type = name_ref S, imports.%S.decl [concrete = constants.%S] // CHECK:STDOUT: } -// CHECK:STDOUT: %s: ref %S = ref_binding s, %s.var +// CHECK:STDOUT: %s: ref %S = wrapper_binding s, %s.var // CHECK:STDOUT: %Cpp.ref.loc9: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %TakesLValue.ref: %TakesLValue.cpp_overload_set.type = name_ref TakesLValue, imports.%TakesLValue.cpp_overload_set.value [concrete = constants.%TakesLValue.cpp_overload_set.value] // CHECK:STDOUT: %s.ref: ref %S = name_ref s, %s @@ -616,7 +616,7 @@ fn PassConstRef(ref x: const X) { // CHECK:STDOUT: %Cpp.ref.loc8: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %S.ref.loc8: type = name_ref S, imports.%S.decl [concrete = constants.%S] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: ref %S = ref_binding v, %v.var +// CHECK:STDOUT: %v: ref %S = wrapper_binding v, %v.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %s.patt: %pattern_type.0f5 = value_binding_pattern s [concrete = constants.%s.patt] // CHECK:STDOUT: } @@ -626,7 +626,7 @@ fn PassConstRef(ref x: const X) { // CHECK:STDOUT: %Cpp.ref.loc9: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %S.ref.loc9: type = name_ref S, imports.%S.decl [concrete = constants.%S] // CHECK:STDOUT: } -// CHECK:STDOUT: %s: %S = value_binding s, %.loc9_18 +// CHECK:STDOUT: %s: %S = wrapper_binding s, %.loc9_18 // CHECK:STDOUT: %Cpp.ref.loc18: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %TakesLValue.ref.loc18: %TakesLValue.cpp_overload_set.type = name_ref TakesLValue, imports.%TakesLValue.cpp_overload_set.value [concrete = constants.%TakesLValue.cpp_overload_set.value] // CHECK:STDOUT: %s.ref.loc18: %S = name_ref s, %s @@ -655,7 +655,7 @@ fn PassConstRef(ref x: const X) { // CHECK:STDOUT: %Cpp.ref.loc30: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %T.ref: type = name_ref T, imports.%T.decl [concrete = constants.%T.ed0] // CHECK:STDOUT: } -// CHECK:STDOUT: %t: ref %T.ed0 = ref_binding t, %t.var +// CHECK:STDOUT: %t: ref %T.ed0 = wrapper_binding t, %t.var // CHECK:STDOUT: %Cpp.ref.loc39: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %TakesLValue.ref.loc39: %TakesLValue.cpp_overload_set.type = name_ref TakesLValue, imports.%TakesLValue.cpp_overload_set.value [concrete = constants.%TakesLValue.cpp_overload_set.value] // CHECK:STDOUT: %t.ref: ref %T.ed0 = name_ref t, %t @@ -676,7 +676,7 @@ fn PassConstRef(ref x: const X) { // CHECK:STDOUT: %Cpp.ref.loc41: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %S.ref.loc41: type = name_ref S, imports.%S.decl [concrete = constants.%S] // CHECK:STDOUT: } -// CHECK:STDOUT: %u: ref %S = ref_binding u, %u.var +// CHECK:STDOUT: %u: ref %S = wrapper_binding u, %u.var // CHECK:STDOUT: %Cpp.ref.loc50_3: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %TakesLValue.ref.loc50: %TakesLValue.cpp_overload_set.type = name_ref TakesLValue, imports.%TakesLValue.cpp_overload_set.value [concrete = constants.%TakesLValue.cpp_overload_set.value] // CHECK:STDOUT: %u.ref: ref %S = name_ref u, %u @@ -815,7 +815,7 @@ fn PassConstRef(ref x: const X) { // CHECK:STDOUT: %Cpp.ref.loc8: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %S.ref.loc8: type = name_ref S, imports.%S.decl [concrete = constants.%S] // CHECK:STDOUT: } -// CHECK:STDOUT: %s: ref %S = ref_binding s, %s.var +// CHECK:STDOUT: %s: ref %S = wrapper_binding s, %s.var // CHECK:STDOUT: %Cpp.ref.loc17: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %TakesRValue.ref.loc17: %TakesRValue.cpp_overload_set.type = name_ref TakesRValue, imports.%TakesRValue.cpp_overload_set.value [concrete = constants.%TakesRValue.cpp_overload_set.value] // CHECK:STDOUT: %s.ref: ref %S = name_ref s, %s @@ -836,7 +836,7 @@ fn PassConstRef(ref x: const X) { // CHECK:STDOUT: %Cpp.ref.loc19: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %T.ref: type = name_ref T, imports.%T.decl [concrete = constants.%T.ed0] // CHECK:STDOUT: } -// CHECK:STDOUT: %t: ref %T.ed0 = ref_binding t, %t.var +// CHECK:STDOUT: %t: ref %T.ed0 = wrapper_binding t, %t.var // CHECK:STDOUT: %Cpp.ref.loc28: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %TakesRValue.ref.loc28: %TakesRValue.cpp_overload_set.type = name_ref TakesRValue, imports.%TakesRValue.cpp_overload_set.value [concrete = constants.%TakesRValue.cpp_overload_set.value] // CHECK:STDOUT: %t.ref: ref %T.ed0 = name_ref t, %t @@ -912,7 +912,7 @@ fn PassConstRef(ref x: const X) { // CHECK:STDOUT: %Cpp.ref.loc8: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %S.ref.loc8: type = name_ref S, imports.%S.decl [concrete = constants.%S] // CHECK:STDOUT: } -// CHECK:STDOUT: %s: ref %S = ref_binding s, %s.var +// CHECK:STDOUT: %s: ref %S = wrapper_binding s, %s.var // CHECK:STDOUT: %Cpp.ref.loc9_3: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %TakesConstLValue.ref.loc9: %TakesConstLValue.cpp_overload_set.type = name_ref TakesConstLValue, imports.%TakesConstLValue.cpp_overload_set.value [concrete = constants.%TakesConstLValue.cpp_overload_set.value] // CHECK:STDOUT: %s.ref.loc9: ref %S = name_ref s, %s @@ -993,7 +993,7 @@ fn PassConstRef(ref x: const X) { // CHECK:STDOUT: %Cpp.ref.loc8: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %S.ref.loc8: type = name_ref S, imports.%S.decl [concrete = constants.%S] // CHECK:STDOUT: } -// CHECK:STDOUT: %s: %S = value_binding s, %.loc8_19.6 +// CHECK:STDOUT: %s: %S = wrapper_binding s, %.loc8_19.6 // CHECK:STDOUT: %Cpp.ref.loc9: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %TakesConstLValue.ref.loc9: %TakesConstLValue.cpp_overload_set.type = name_ref TakesConstLValue, imports.%TakesConstLValue.cpp_overload_set.value [concrete = constants.%TakesConstLValue.cpp_overload_set.value] // CHECK:STDOUT: %s.ref.loc9: %S = name_ref s, %s @@ -1142,7 +1142,7 @@ fn PassConstRef(ref x: const X) { // CHECK:STDOUT: %Cpp.ref.loc8: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %S.ref: type = name_ref S, imports.%S.decl [concrete = constants.%S] // CHECK:STDOUT: } -// CHECK:STDOUT: %s: ref %S = ref_binding s, %s.var +// CHECK:STDOUT: %s: ref %S = wrapper_binding s, %s.var // CHECK:STDOUT: %Cpp.ref.loc17: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %TakesConstRValue.ref.loc17: %TakesConstRValue.cpp_overload_set.type = name_ref TakesConstRValue, imports.%TakesConstRValue.cpp_overload_set.value [concrete = constants.%TakesConstRValue.cpp_overload_set.value] // CHECK:STDOUT: %s.ref: ref %S = name_ref s, %s @@ -1163,7 +1163,7 @@ fn PassConstRef(ref x: const X) { // CHECK:STDOUT: %Cpp.ref.loc19: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %T.ref: type = name_ref T, imports.%T.decl [concrete = constants.%T.ed0] // CHECK:STDOUT: } -// CHECK:STDOUT: %t: ref %T.ed0 = ref_binding t, %t.var +// CHECK:STDOUT: %t: ref %T.ed0 = wrapper_binding t, %t.var // CHECK:STDOUT: %Cpp.ref.loc28: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %TakesConstRValue.ref.loc28: %TakesConstRValue.cpp_overload_set.type = name_ref TakesConstRValue, imports.%TakesConstRValue.cpp_overload_set.value [concrete = constants.%TakesConstRValue.cpp_overload_set.value] // CHECK:STDOUT: %t.ref: ref %T.ed0 = name_ref t, %t @@ -1209,7 +1209,7 @@ fn PassConstRef(ref x: const X) { // CHECK:STDOUT: %Cpp.ref.loc8_21: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %S.ref: type = name_ref S, imports.%S.decl [concrete = constants.%S] // CHECK:STDOUT: } -// CHECK:STDOUT: %s: ref %S = ref_binding s, %ReturnsLValue.call +// CHECK:STDOUT: %s: ref %S = wrapper_binding s, %ReturnsLValue.call // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1248,7 +1248,7 @@ fn PassConstRef(ref x: const X) { // CHECK:STDOUT: %Cpp.ref.loc8_21: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %S.ref: type = name_ref S, imports.%S.decl [concrete = constants.%S] // CHECK:STDOUT: } -// CHECK:STDOUT: %s: ref %S = ref_binding s, %ReturnsRValue.call +// CHECK:STDOUT: %s: ref %S = wrapper_binding s, %ReturnsRValue.call // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1289,7 +1289,7 @@ fn PassConstRef(ref x: const X) { // CHECK:STDOUT: %S.ref: type = name_ref S, imports.%S.decl [concrete = constants.%S] // CHECK:STDOUT: %const: type = const_type %S.ref [concrete = constants.%const] // CHECK:STDOUT: } -// CHECK:STDOUT: %s: ref %const = ref_binding s, %ReturnConstLValue.call +// CHECK:STDOUT: %s: ref %const = wrapper_binding s, %ReturnConstLValue.call // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interop/cpp/function/import/return.carbon b/toolchain/check/testdata/interop/cpp/function/import/return.carbon index 7a70930cb887..e6a6da3fd566 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/return.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/return.carbon @@ -239,7 +239,7 @@ fn Var() { // CHECK:STDOUT: %Cpp.ref.loc11_17: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %nullptr_t.ref: type = name_ref nullptr_t, constants.%Cpp.nullptr_t [concrete = constants.%Cpp.nullptr_t] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %Cpp.nullptr_t = ref_binding c, %c.var +// CHECK:STDOUT: %c: ref %Cpp.nullptr_t = wrapper_binding c, %c.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %c.var, constants.%Destroy.Op.1a2547.5 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%c.var) // CHECK:STDOUT: @@ -308,7 +308,7 @@ fn Var() { // CHECK:STDOUT: %u8.1: type = class_type @UInt, @UInt(constants.%int_8) [concrete = constants.%u8] // CHECK:STDOUT: %u8.2: type = type_literal %u8.1 [concrete = constants.%u8] // CHECK:STDOUT: } -// CHECK:STDOUT: %return: %ptr = value_binding r#return, %return.param +// CHECK:STDOUT: %return: %ptr = wrapper_binding r#return, %return.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -424,7 +424,7 @@ fn Var() { // CHECK:STDOUT: %ReturnU32.call: init %u32 = call imports.%ReturnU32.decl() // CHECK:STDOUT: assign %my_u32.var, %ReturnU32.call // CHECK:STDOUT: %u32: type = type_literal constants.%u32 [concrete = constants.%u32] -// CHECK:STDOUT: %my_u32: ref %u32 = ref_binding my_u32, %my_u32.var +// CHECK:STDOUT: %my_u32: ref %u32 = wrapper_binding my_u32, %my_u32.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %my_u32.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%my_u32.var) // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/interop/cpp/function/import/struct.carbon b/toolchain/check/testdata/interop/cpp/function/import/struct.carbon index 3bde6aba4b77..d28d907db520 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/struct.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/struct.carbon @@ -715,7 +715,7 @@ fn F() { // CHECK:STDOUT: %N.ref.loc10: = name_ref N, imports.%N [concrete = imports.%N] // CHECK:STDOUT: %S.ref.loc10: type = name_ref S, imports.%S.decl [concrete = constants.%S] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %S = ref_binding x, %x.var +// CHECK:STDOUT: %x: ref %S = wrapper_binding x, %x.var // CHECK:STDOUT: %S.cpp_destructor.bound: = bound_method %x.var, constants.%S.cpp_destructor // CHECK:STDOUT: %S.cpp_destructor.call: init %empty_tuple.type = call %S.cpp_destructor.bound(%x.var) // CHECK:STDOUT: @@ -839,7 +839,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc9: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %O.ref.loc9: type = name_ref O, imports.%O.decl [concrete = constants.%O] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %O = ref_binding x, %x.var +// CHECK:STDOUT: %x: ref %O = wrapper_binding x, %x.var // CHECK:STDOUT: %O.cpp_destructor.bound: = bound_method %x.var, constants.%O.cpp_destructor // CHECK:STDOUT: %O.cpp_destructor.call: init %empty_tuple.type = call %O.cpp_destructor.bound(%x.var) // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interop/cpp/function/import/union.carbon b/toolchain/check/testdata/interop/cpp/function/import/union.carbon index 0f7d7008779e..5e044ffbc396 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/union.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/union.carbon @@ -640,7 +640,7 @@ fn F() { // CHECK:STDOUT: %N.ref.loc10: = name_ref N, imports.%N [concrete = imports.%N] // CHECK:STDOUT: %U.ref.loc10: type = name_ref U, imports.%U.decl [concrete = constants.%U] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %U = ref_binding x, %x.var +// CHECK:STDOUT: %x: ref %U = wrapper_binding x, %x.var // CHECK:STDOUT: %U.cpp_destructor.bound: = bound_method %x.var, constants.%U.cpp_destructor // CHECK:STDOUT: %U.cpp_destructor.call: init %empty_tuple.type = call %U.cpp_destructor.bound(%x.var) // CHECK:STDOUT: @@ -764,7 +764,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc9: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %O.ref.loc9: type = name_ref O, imports.%O.decl [concrete = constants.%O] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %O = ref_binding x, %x.var +// CHECK:STDOUT: %x: ref %O = wrapper_binding x, %x.var // CHECK:STDOUT: %O.cpp_destructor.bound: = bound_method %x.var, constants.%O.cpp_destructor // CHECK:STDOUT: %O.cpp_destructor.call: init %empty_tuple.type = call %O.cpp_destructor.bound(%x.var) // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interop/cpp/function/import/void_pointer.carbon b/toolchain/check/testdata/interop/cpp/function/import/void_pointer.carbon index d1e8226dabfc..2ebe41991684 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/void_pointer.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/void_pointer.carbon @@ -189,7 +189,7 @@ fn F() { // CHECK:STDOUT: %void.ref: type = name_ref void, constants.%Cpp.void [concrete = constants.%Cpp.void] // CHECK:STDOUT: %ptr: type = ptr_type %void.ref [concrete = constants.%ptr] // CHECK:STDOUT: } -// CHECK:STDOUT: %output: %ptr = value_binding output, %.loc10_42.2 +// CHECK:STDOUT: %output: %ptr = wrapper_binding output, %.loc10_42.2 // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -528,7 +528,7 @@ fn F() { // CHECK:STDOUT: %.loc10_45.2: %OptionalStorage.type = converted %ptr, %OptionalStorage.facet [concrete = constants.%OptionalStorage.facet] // CHECK:STDOUT: %Optional: type = class_type @Optional, @Optional(constants.%OptionalStorage.facet) [concrete = constants.%Optional.752] // CHECK:STDOUT: } -// CHECK:STDOUT: %output: %Optional.752 = value_binding output, %.loc10_57.3 +// CHECK:STDOUT: %output: %Optional.752 = wrapper_binding output, %.loc10_57.3 // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %.loc10_57.2, constants.%Destroy.Op.1a2547.4 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%.loc10_57.2) // CHECK:STDOUT: @@ -609,7 +609,7 @@ fn F() { // CHECK:STDOUT: %ptr.loc11_37: type = ptr_type %void.ref [concrete = constants.%ptr.00a] // CHECK:STDOUT: %ptr.loc11_38: type = ptr_type %ptr.loc11_37 [concrete = constants.%ptr.6f9] // CHECK:STDOUT: } -// CHECK:STDOUT: %non_nullable_pointer: ref %ptr.6f9 = ref_binding non_nullable_pointer, %non_nullable_pointer.var +// CHECK:STDOUT: %non_nullable_pointer: ref %ptr.6f9 = wrapper_binding non_nullable_pointer, %non_nullable_pointer.var // CHECK:STDOUT: %Cpp.ref.loc12: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Invoke.ref: %Invoke.cpp_overload_set.type = name_ref Invoke, imports.%Invoke.cpp_overload_set.value [concrete = constants.%Invoke.cpp_overload_set.value] // CHECK:STDOUT: %non_nullable_pointer.ref: ref %ptr.6f9 = name_ref non_nullable_pointer, %non_nullable_pointer @@ -682,7 +682,7 @@ fn F() { // CHECK:STDOUT: %const: type = const_type %void.ref [concrete = constants.%const] // CHECK:STDOUT: %ptr: type = ptr_type %const [concrete = constants.%ptr] // CHECK:STDOUT: } -// CHECK:STDOUT: %const_void_pointer: ref %ptr = ref_binding const_void_pointer, %const_void_pointer.var +// CHECK:STDOUT: %const_void_pointer: ref %ptr = wrapper_binding const_void_pointer, %const_void_pointer.var // CHECK:STDOUT: %Cpp.ref.loc12: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Invoke.ref: %Invoke.cpp_overload_set.type = name_ref Invoke, imports.%Invoke.cpp_overload_set.value [concrete = constants.%Invoke.cpp_overload_set.value] // CHECK:STDOUT: %const_void_pointer.ref: ref %ptr = name_ref const_void_pointer, %const_void_pointer diff --git a/toolchain/check/testdata/interop/cpp/impls/as.carbon b/toolchain/check/testdata/interop/cpp/impls/as.carbon index 2af6030f9093..2fd39844d91c 100644 --- a/toolchain/check/testdata/interop/cpp/impls/as.carbon +++ b/toolchain/check/testdata/interop/cpp/impls/as.carbon @@ -397,7 +397,7 @@ fn ConversionExplicit(s: Cpp.ConditionallyExplicitFalse) { // CHECK:STDOUT: %Cpp.ref.loc8: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %ConditionallyExplicitFalse.ref.loc8: type = name_ref ConditionallyExplicitFalse, imports.%ConditionallyExplicit.decl.996 [concrete = constants.%ConditionallyExplicit.3cd] // CHECK:STDOUT: } -// CHECK:STDOUT: %_: %ConditionallyExplicit.3cd = value_binding _, %.loc8_43.6 +// CHECK:STDOUT: %_: %ConditionallyExplicit.3cd = wrapper_binding _, %.loc8_43.6 // CHECK:STDOUT: %s.ref.loc9: %Source = name_ref s, %s // CHECK:STDOUT: %Cpp.ref.loc9: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %ConditionallyExplicitFalse.ref.loc9: type = name_ref ConditionallyExplicitFalse, imports.%ConditionallyExplicit.decl.996 [concrete = constants.%ConditionallyExplicit.3cd] @@ -459,7 +459,7 @@ fn ConversionExplicit(s: Cpp.ConditionallyExplicitFalse) { // CHECK:STDOUT: %Cpp.ref.loc21: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Dest.ref.loc21: type = name_ref Dest, imports.%Dest.decl [concrete = constants.%Dest] // CHECK:STDOUT: } -// CHECK:STDOUT: %_: %Dest = value_binding _, %.loc21_21.5 +// CHECK:STDOUT: %_: %Dest = wrapper_binding _, %.loc21_21.5 // CHECK:STDOUT: %s.ref.loc22: %ConditionallyExplicit.3cd = name_ref s, %s // CHECK:STDOUT: %Cpp.ref.loc22: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Dest.ref.loc22: type = name_ref Dest, imports.%Dest.decl [concrete = constants.%Dest] @@ -555,7 +555,7 @@ fn ConversionExplicit(s: Cpp.ConditionallyExplicitFalse) { // CHECK:STDOUT: %Cpp.ref.loc15: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %ConditionallyExplicitTrue.ref: type = name_ref ConditionallyExplicitTrue, imports.%ConditionallyExplicit.decl.6ab [concrete = constants.%ConditionallyExplicit.9d4] // CHECK:STDOUT: } -// CHECK:STDOUT: %_: %ConditionallyExplicit.9d4 = value_binding _, [concrete = ] +// CHECK:STDOUT: %_: %ConditionallyExplicit.9d4 = wrapper_binding _, [concrete = ] // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -576,7 +576,7 @@ fn ConversionExplicit(s: Cpp.ConditionallyExplicitFalse) { // CHECK:STDOUT: %Cpp.ref.loc21: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Dest.ref: type = name_ref Dest, imports.%Dest.decl [concrete = constants.%Dest.980] // CHECK:STDOUT: } -// CHECK:STDOUT: %_: %Dest.980 = value_binding _, %.loc21_21.5 +// CHECK:STDOUT: %_: %Dest.980 = wrapper_binding _, %.loc21_21.5 // CHECK:STDOUT: // CHECK:STDOUT: %Dest.Op.bound: = bound_method %.loc21_21.4, constants.%Dest.Op // CHECK:STDOUT: %Op.ref: %Dest.cpp_destructor.type = name_ref Op, imports.%Dest.cpp_destructor.decl [concrete = constants.%Dest.cpp_destructor] diff --git a/toolchain/check/testdata/interop/cpp/impls/destroy.carbon b/toolchain/check/testdata/interop/cpp/impls/destroy.carbon index b492d5a1fd33..06a7d50756d3 100644 --- a/toolchain/check/testdata/interop/cpp/impls/destroy.carbon +++ b/toolchain/check/testdata/interop/cpp/impls/destroy.carbon @@ -281,7 +281,7 @@ fn F() { // CHECK:STDOUT: %self.patt: %pattern_type.a12 = at_binding_pattern self, %self.param_patt [concrete = constants.%self.patt.b81] // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: ref %TrivialDestructor = ref_param call_param0 -// CHECK:STDOUT: %self: ref %TrivialDestructor = ref_binding self, %self.param +// CHECK:STDOUT: %self: ref %TrivialDestructor = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -333,7 +333,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %PublicDestructor.ref: type = name_ref PublicDestructor, imports.%PublicDestructor.decl [concrete = constants.%PublicDestructor] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %PublicDestructor = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %PublicDestructor = wrapper_binding a, %a.var // CHECK:STDOUT: %PublicDestructor.cpp_destructor.bound: = bound_method %a.var, constants.%PublicDestructor.cpp_destructor // CHECK:STDOUT: %PublicDestructor.cpp_destructor.call: init %empty_tuple.type = call %PublicDestructor.cpp_destructor.bound(%a.var) // CHECK:STDOUT: return @@ -356,13 +356,13 @@ fn F() { // CHECK:STDOUT: %Cpp.ref: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %TrivialDestructor.ref: type = name_ref TrivialDestructor, imports.%TrivialDestructor.decl [concrete = constants.%TrivialDestructor] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %TrivialDestructor = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %TrivialDestructor = wrapper_binding a, %a.var // CHECK:STDOUT: %TrivialDestructor.Op.decl: %TrivialDestructor.Op.type = fn_decl @TrivialDestructor.Op [concrete = constants.%TrivialDestructor.Op] { // CHECK:STDOUT: %.1: %pattern_type.a12 = specific_constant constants.%self.param_patt.e73, @Destroy.WithSelf.Op(constants.%Destroy.facet.c09) [concrete = constants.%self.param_patt.e73] // CHECK:STDOUT: %self.patt: %pattern_type.a12 = at_binding_pattern self, %.1 [concrete = constants.%self.patt.b81] // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: ref %TrivialDestructor = ref_param call_param0 -// CHECK:STDOUT: %self: ref %TrivialDestructor = ref_binding self, %self.param +// CHECK:STDOUT: %self: ref %TrivialDestructor = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %TrivialDestructor.Op.bound: = bound_method %a.var, constants.%TrivialDestructor.Op // CHECK:STDOUT: %Op.ref: %TrivialDestructor.cpp_destructor.type = name_ref Op, imports.%TrivialDestructor.cpp_destructor.decl [concrete = constants.%TrivialDestructor.cpp_destructor] @@ -420,7 +420,7 @@ fn F() { // CHECK:STDOUT: %.loc20_3: init %Derived = converted %.loc20_38.1, %.loc20_38.5 [concrete = constants.%Derived.val] // CHECK:STDOUT: assign %a.var, %.loc20_3 // CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl [concrete = constants.%Derived] -// CHECK:STDOUT: %a: ref %Derived = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %Derived = wrapper_binding a, %a.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %a.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%a.var) // CHECK:STDOUT: @@ -475,7 +475,7 @@ fn F() { // CHECK:STDOUT: %.loc21_3: init %Derived = converted %.loc21_38.1, %.loc21_38.5 [concrete = constants.%Derived.val] // CHECK:STDOUT: assign %a.var, %.loc21_3 // CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl [concrete = constants.%Derived] -// CHECK:STDOUT: %a: ref %Derived = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %Derived = wrapper_binding a, %a.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %a.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%a.var) // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interop/cpp/impls/implicit_as.carbon b/toolchain/check/testdata/interop/cpp/impls/implicit_as.carbon index ac015fc2ed1f..ead8f7953943 100644 --- a/toolchain/check/testdata/interop/cpp/impls/implicit_as.carbon +++ b/toolchain/check/testdata/interop/cpp/impls/implicit_as.carbon @@ -501,7 +501,7 @@ fn InitFromStruct() { // CHECK:STDOUT: %Cpp.ref.loc8: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Dest.ref: type = name_ref Dest, imports.%Dest.decl [concrete = constants.%Dest] // CHECK:STDOUT: } -// CHECK:STDOUT: %_: %Dest = value_binding _, %.loc8_21.5 +// CHECK:STDOUT: %_: %Dest = wrapper_binding _, %.loc8_21.5 // CHECK:STDOUT: // CHECK:STDOUT: %Dest.Op.bound: = bound_method %.loc8_21.4, constants.%Dest.Op // CHECK:STDOUT: %Op.ref: %Dest.cpp_destructor.type = name_ref Op, imports.%Dest.cpp_destructor.decl [concrete = constants.%Dest.cpp_destructor] @@ -527,7 +527,7 @@ fn InitFromStruct() { // CHECK:STDOUT: %Cpp.ref.loc14: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Dest.ref: type = name_ref Dest, imports.%Dest.decl [concrete = constants.%Dest] // CHECK:STDOUT: } -// CHECK:STDOUT: %_: %Dest = value_binding _, %.loc14_21.5 +// CHECK:STDOUT: %_: %Dest = wrapper_binding _, %.loc14_21.5 // CHECK:STDOUT: %Dest.Op.bound: = bound_method %.loc14_21.4, constants.%Dest.Op // CHECK:STDOUT: %Op.ref: %Dest.cpp_destructor.type = name_ref Op, imports.%Dest.cpp_destructor.decl [concrete = constants.%Dest.cpp_destructor] // CHECK:STDOUT: %Dest.cpp_destructor.bound: = bound_method %.loc14_21.4, %Op.ref @@ -554,7 +554,7 @@ fn InitFromStruct() { // CHECK:STDOUT: %Cpp.ref.loc20: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Dest2.ref: type = name_ref Dest2, imports.%Dest2.decl [concrete = constants.%Dest2] // CHECK:STDOUT: } -// CHECK:STDOUT: %_: %Dest2 = value_binding _, %.loc20_22.6 +// CHECK:STDOUT: %_: %Dest2 = wrapper_binding _, %.loc20_22.6 // CHECK:STDOUT: // CHECK:STDOUT: %Dest2.Op.bound: = bound_method %.loc20_22.5, constants.%Dest2.Op // CHECK:STDOUT: %Op.ref: %Dest2.cpp_destructor.type = name_ref Op, imports.%Dest2.cpp_destructor.decl [concrete = constants.%Dest2.cpp_destructor] @@ -593,7 +593,7 @@ fn InitFromStruct() { // CHECK:STDOUT: %Cpp.ref.loc15: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Dest.ref: type = name_ref Dest, imports.%Dest.decl [concrete = constants.%Dest.980] // CHECK:STDOUT: } -// CHECK:STDOUT: %_: %Dest.980 = value_binding _, [concrete = ] +// CHECK:STDOUT: %_: %Dest.980 = wrapper_binding _, [concrete = ] // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -679,7 +679,7 @@ fn InitFromStruct() { // CHECK:STDOUT: %Cpp.ref.loc16: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %InaccessibleConstructor.ref: type = name_ref InaccessibleConstructor, imports.%InaccessibleConstructor.decl [concrete = constants.%InaccessibleConstructor] // CHECK:STDOUT: } -// CHECK:STDOUT: %_: %InaccessibleConstructor = value_binding _, %.loc16_40.6 +// CHECK:STDOUT: %_: %InaccessibleConstructor = wrapper_binding _, %.loc16_40.6 // CHECK:STDOUT: // CHECK:STDOUT: %InaccessibleConstructor.Op.bound: = bound_method %.loc16_40.5, constants.%InaccessibleConstructor.Op // CHECK:STDOUT: %Op.ref: %InaccessibleConstructor.cpp_destructor.type = name_ref Op, imports.%InaccessibleConstructor.cpp_destructor.decl [concrete = constants.%InaccessibleConstructor.cpp_destructor] @@ -705,7 +705,7 @@ fn InitFromStruct() { // CHECK:STDOUT: %Cpp.ref.loc30: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Dest.ref: type = name_ref Dest, imports.%Dest.decl [concrete = constants.%Dest] // CHECK:STDOUT: } -// CHECK:STDOUT: %_: %Dest = value_binding _, %.loc30_21.5 +// CHECK:STDOUT: %_: %Dest = wrapper_binding _, %.loc30_21.5 // CHECK:STDOUT: // CHECK:STDOUT: %Dest.Op.bound: = bound_method %.loc30_21.4, constants.%Dest.Op // CHECK:STDOUT: %Op.ref: %Dest.cpp_destructor.type = name_ref Op, imports.%Dest.cpp_destructor.decl [concrete = constants.%Dest.cpp_destructor] @@ -752,7 +752,7 @@ fn InitFromStruct() { // CHECK:STDOUT: %Cpp.ref.loc15: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %DeletedConstructor.ref: type = name_ref DeletedConstructor, imports.%DeletedConstructor.decl [concrete = constants.%DeletedConstructor] // CHECK:STDOUT: } -// CHECK:STDOUT: %_: %DeletedConstructor = value_binding _, [concrete = ] +// CHECK:STDOUT: %_: %DeletedConstructor = wrapper_binding _, [concrete = ] // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -767,7 +767,7 @@ fn InitFromStruct() { // CHECK:STDOUT: %Cpp.ref.loc28: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Dest.ref: type = name_ref Dest, imports.%Dest.decl [concrete = constants.%Dest.980] // CHECK:STDOUT: } -// CHECK:STDOUT: %_: %Dest.980 = value_binding _, [concrete = ] +// CHECK:STDOUT: %_: %Dest.980 = wrapper_binding _, [concrete = ] // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -809,7 +809,7 @@ fn InitFromStruct() { // CHECK:STDOUT: %Cpp.ref.loc15: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %ExplicitConstructor.ref: type = name_ref ExplicitConstructor, imports.%ExplicitConstructor.decl [concrete = constants.%ExplicitConstructor] // CHECK:STDOUT: } -// CHECK:STDOUT: %_: %ExplicitConstructor = value_binding _, [concrete = ] +// CHECK:STDOUT: %_: %ExplicitConstructor = wrapper_binding _, [concrete = ] // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -824,7 +824,7 @@ fn InitFromStruct() { // CHECK:STDOUT: %Cpp.ref.loc28: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Dest.ref: type = name_ref Dest, imports.%Dest.decl [concrete = constants.%Dest.980] // CHECK:STDOUT: } -// CHECK:STDOUT: %_: %Dest.980 = value_binding _, [concrete = ] +// CHECK:STDOUT: %_: %Dest.980 = wrapper_binding _, [concrete = ] // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -881,7 +881,7 @@ fn InitFromStruct() { // CHECK:STDOUT: %Cpp.ref: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %IntConstructor.ref: type = name_ref IntConstructor, imports.%IntConstructor.decl [concrete = constants.%IntConstructor.372] // CHECK:STDOUT: } -// CHECK:STDOUT: %_: %IntConstructor.372 = value_binding _, %.loc8_31.5 +// CHECK:STDOUT: %_: %IntConstructor.372 = wrapper_binding _, %.loc8_31.5 // CHECK:STDOUT: // CHECK:STDOUT: %IntConstructor.Op.bound: = bound_method %.loc8_31.4, constants.%IntConstructor.Op // CHECK:STDOUT: %Op.ref: %IntConstructor.cpp_destructor.type = name_ref Op, imports.%IntConstructor.cpp_destructor.decl [concrete = constants.%IntConstructor.cpp_destructor] @@ -945,7 +945,7 @@ fn InitFromStruct() { // CHECK:STDOUT: %Cpp.ref: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %IntConstructor.ref: type = name_ref IntConstructor, imports.%IntConstructor.decl [concrete = constants.%IntConstructor] // CHECK:STDOUT: } -// CHECK:STDOUT: %_: %IntConstructor = value_binding _, %.loc19_31.6 +// CHECK:STDOUT: %_: %IntConstructor = wrapper_binding _, %.loc19_31.6 // CHECK:STDOUT: // CHECK:STDOUT: %IntConstructor.Op.bound: = bound_method %.loc19_31.5, constants.%IntConstructor.Op // CHECK:STDOUT: %Op.ref: %IntConstructor.cpp_destructor.type = name_ref Op, imports.%IntConstructor.cpp_destructor.decl [concrete = constants.%IntConstructor.cpp_destructor] @@ -1006,7 +1006,7 @@ fn InitFromStruct() { // CHECK:STDOUT: %Cpp.ref: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %DefaultConstructor.ref: type = name_ref DefaultConstructor, imports.%DefaultConstructor.decl [concrete = constants.%DefaultConstructor] // CHECK:STDOUT: } -// CHECK:STDOUT: %_: %DefaultConstructor = value_binding _, %.loc9_36.6 +// CHECK:STDOUT: %_: %DefaultConstructor = wrapper_binding _, %.loc9_36.6 // CHECK:STDOUT: // CHECK:STDOUT: %DefaultConstructor.Op.bound: = bound_method %.loc9_36.5, constants.%DefaultConstructor.Op // CHECK:STDOUT: %Op.ref: %DefaultConstructor.cpp_destructor.type = name_ref Op, imports.%DefaultConstructor.cpp_destructor.decl [concrete = constants.%DefaultConstructor.cpp_destructor] @@ -1142,7 +1142,7 @@ fn InitFromStruct() { // CHECK:STDOUT: %Cpp.ref.loc8: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Two.ref: type = name_ref Two, imports.%Two.decl [concrete = constants.%Two] // CHECK:STDOUT: } -// CHECK:STDOUT: %_.loc8: %Two = value_binding _, %.loc8_25.6 +// CHECK:STDOUT: %_.loc8: %Two = wrapper_binding _, %.loc8_25.6 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %_.patt.loc10: %pattern_type.248 = value_binding_pattern _ [concrete = constants.%_.patt.368] // CHECK:STDOUT: } @@ -1174,7 +1174,7 @@ fn InitFromStruct() { // CHECK:STDOUT: %Cpp.ref.loc10: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %ThreeWithDefault.ref.loc10: type = name_ref ThreeWithDefault, imports.%ThreeWithDefault.decl [concrete = constants.%ThreeWithDefault] // CHECK:STDOUT: } -// CHECK:STDOUT: %_.loc10: %ThreeWithDefault = value_binding _, %.loc10_38.6 +// CHECK:STDOUT: %_.loc10: %ThreeWithDefault = wrapper_binding _, %.loc10_38.6 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %_.patt.loc12: %pattern_type.248 = value_binding_pattern _ [concrete = constants.%_.patt.368] // CHECK:STDOUT: } @@ -1214,7 +1214,7 @@ fn InitFromStruct() { // CHECK:STDOUT: %Cpp.ref.loc12: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %ThreeWithDefault.ref.loc12: type = name_ref ThreeWithDefault, imports.%ThreeWithDefault.decl [concrete = constants.%ThreeWithDefault] // CHECK:STDOUT: } -// CHECK:STDOUT: %_.loc12: %ThreeWithDefault = value_binding _, %.loc12_41.6 +// CHECK:STDOUT: %_.loc12: %ThreeWithDefault = wrapper_binding _, %.loc12_41.6 // CHECK:STDOUT: // CHECK:STDOUT: %ThreeWithDefault.Op.bound.loc12: = bound_method %.loc12_41.5, constants.%ThreeWithDefault.Op // CHECK:STDOUT: %Op.ref.loc12: %ThreeWithDefault.cpp_destructor.type = name_ref Op, imports.%ThreeWithDefault.cpp_destructor.decl [concrete = constants.%ThreeWithDefault.cpp_destructor] @@ -1267,7 +1267,7 @@ fn InitFromStruct() { // CHECK:STDOUT: %Cpp.ref.loc15: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Aggregate.ref.loc15: type = name_ref Aggregate, imports.%Aggregate.decl [concrete = constants.%Aggregate] // CHECK:STDOUT: } -// CHECK:STDOUT: %_.loc15: %Aggregate = value_binding _, [concrete = ] +// CHECK:STDOUT: %_.loc15: %Aggregate = wrapper_binding _, [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %_.patt.loc23: %pattern_type.5dc = value_binding_pattern _ [concrete = constants.%_.patt] // CHECK:STDOUT: } @@ -1278,7 +1278,7 @@ fn InitFromStruct() { // CHECK:STDOUT: %Cpp.ref.loc23: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Aggregate.ref.loc23: type = name_ref Aggregate, imports.%Aggregate.decl [concrete = constants.%Aggregate] // CHECK:STDOUT: } -// CHECK:STDOUT: %_.loc23: %Aggregate = value_binding _, [concrete = ] +// CHECK:STDOUT: %_.loc23: %Aggregate = wrapper_binding _, [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %_.patt.loc31: %pattern_type.5dc = value_binding_pattern _ [concrete = constants.%_.patt] // CHECK:STDOUT: } @@ -1290,7 +1290,7 @@ fn InitFromStruct() { // CHECK:STDOUT: %Cpp.ref.loc31: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Aggregate.ref.loc31: type = name_ref Aggregate, imports.%Aggregate.decl [concrete = constants.%Aggregate] // CHECK:STDOUT: } -// CHECK:STDOUT: %_.loc31: %Aggregate = value_binding _, [concrete = ] +// CHECK:STDOUT: %_.loc31: %Aggregate = wrapper_binding _, [concrete = ] // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1329,7 +1329,7 @@ fn InitFromStruct() { // CHECK:STDOUT: %Cpp.ref.loc15: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Aggregate.ref.loc15: type = name_ref Aggregate, imports.%Aggregate.decl [concrete = constants.%Aggregate] // CHECK:STDOUT: } -// CHECK:STDOUT: %_.loc15: %Aggregate = value_binding _, [concrete = ] +// CHECK:STDOUT: %_.loc15: %Aggregate = wrapper_binding _, [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %_.patt.loc23: %pattern_type.5dc = value_binding_pattern _ [concrete = constants.%_.patt] // CHECK:STDOUT: } @@ -1340,7 +1340,7 @@ fn InitFromStruct() { // CHECK:STDOUT: %Cpp.ref.loc23: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Aggregate.ref.loc23: type = name_ref Aggregate, imports.%Aggregate.decl [concrete = constants.%Aggregate] // CHECK:STDOUT: } -// CHECK:STDOUT: %_.loc23: %Aggregate = value_binding _, [concrete = ] +// CHECK:STDOUT: %_.loc23: %Aggregate = wrapper_binding _, [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %_.patt.loc31: %pattern_type.5dc = value_binding_pattern _ [concrete = constants.%_.patt] // CHECK:STDOUT: } @@ -1352,7 +1352,7 @@ fn InitFromStruct() { // CHECK:STDOUT: %Cpp.ref.loc31: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Aggregate.ref.loc31: type = name_ref Aggregate, imports.%Aggregate.decl [concrete = constants.%Aggregate] // CHECK:STDOUT: } -// CHECK:STDOUT: %_.loc31: %Aggregate = value_binding _, [concrete = ] +// CHECK:STDOUT: %_.loc31: %Aggregate = wrapper_binding _, [concrete = ] // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1449,7 +1449,7 @@ fn InitFromStruct() { // CHECK:STDOUT: %Cpp.ref.loc8: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %NonAggregate.ref.loc8: type = name_ref NonAggregate, imports.%NonAggregate.decl [concrete = constants.%NonAggregate] // CHECK:STDOUT: } -// CHECK:STDOUT: %_.loc8: %NonAggregate = value_binding _, %.loc8_30.6 +// CHECK:STDOUT: %_.loc8: %NonAggregate = wrapper_binding _, %.loc8_30.6 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %_.patt.loc9: %pattern_type.273 = value_binding_pattern _ [concrete = constants.%_.patt] // CHECK:STDOUT: } @@ -1473,7 +1473,7 @@ fn InitFromStruct() { // CHECK:STDOUT: %Cpp.ref.loc9: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %NonAggregate.ref.loc9: type = name_ref NonAggregate, imports.%NonAggregate.decl [concrete = constants.%NonAggregate] // CHECK:STDOUT: } -// CHECK:STDOUT: %_.loc9: %NonAggregate = value_binding _, %.loc9_32.6 +// CHECK:STDOUT: %_.loc9: %NonAggregate = wrapper_binding _, %.loc9_32.6 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %_.patt.loc10: %pattern_type.273 = value_binding_pattern _ [concrete = constants.%_.patt] // CHECK:STDOUT: } @@ -1505,7 +1505,7 @@ fn InitFromStruct() { // CHECK:STDOUT: %Cpp.ref.loc10: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %NonAggregate.ref.loc10: type = name_ref NonAggregate, imports.%NonAggregate.decl [concrete = constants.%NonAggregate] // CHECK:STDOUT: } -// CHECK:STDOUT: %_.loc10: %NonAggregate = value_binding _, %.loc10_34.6 +// CHECK:STDOUT: %_.loc10: %NonAggregate = wrapper_binding _, %.loc10_34.6 // CHECK:STDOUT: // CHECK:STDOUT: %NonAggregate.Op.bound.loc10: = bound_method %.loc10_34.5, constants.%NonAggregate.Op // CHECK:STDOUT: %Op.ref.loc10: %NonAggregate.cpp_destructor.type = name_ref Op, imports.%NonAggregate.cpp_destructor.decl [concrete = constants.%NonAggregate.cpp_destructor] @@ -1557,7 +1557,7 @@ fn InitFromStruct() { // CHECK:STDOUT: %Cpp.ref.loc15: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %NonAggregate.ref.loc15: type = name_ref NonAggregate, imports.%NonAggregate.decl [concrete = constants.%NonAggregate] // CHECK:STDOUT: } -// CHECK:STDOUT: %_.loc15: %NonAggregate = value_binding _, [concrete = ] +// CHECK:STDOUT: %_.loc15: %NonAggregate = wrapper_binding _, [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %_.patt.loc23: %pattern_type.273 = value_binding_pattern _ [concrete = constants.%_.patt] // CHECK:STDOUT: } @@ -1568,7 +1568,7 @@ fn InitFromStruct() { // CHECK:STDOUT: %Cpp.ref.loc23: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %NonAggregate.ref.loc23: type = name_ref NonAggregate, imports.%NonAggregate.decl [concrete = constants.%NonAggregate] // CHECK:STDOUT: } -// CHECK:STDOUT: %_.loc23: %NonAggregate = value_binding _, [concrete = ] +// CHECK:STDOUT: %_.loc23: %NonAggregate = wrapper_binding _, [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %_.patt.loc31: %pattern_type.273 = value_binding_pattern _ [concrete = constants.%_.patt] // CHECK:STDOUT: } @@ -1580,7 +1580,7 @@ fn InitFromStruct() { // CHECK:STDOUT: %Cpp.ref.loc31: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %NonAggregate.ref.loc31: type = name_ref NonAggregate, imports.%NonAggregate.decl [concrete = constants.%NonAggregate] // CHECK:STDOUT: } -// CHECK:STDOUT: %_.loc31: %NonAggregate = value_binding _, [concrete = ] +// CHECK:STDOUT: %_.loc31: %NonAggregate = wrapper_binding _, [concrete = ] // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interop/cpp/macros/macros.carbon b/toolchain/check/testdata/interop/cpp/macros/macros.carbon index a1dd1cf8bf3f..739d917670ef 100644 --- a/toolchain/check/testdata/interop/cpp/macros/macros.carbon +++ b/toolchain/check/testdata/interop/cpp/macros/macros.carbon @@ -1017,7 +1017,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %CONFIG_VALUE.ref: %i32 = name_ref CONFIG_VALUE, constants.%int_42.ac4 [concrete = constants.%int_42.ac4] // CHECK:STDOUT: %i32.loc8: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %CONFIG_VALUE.ref +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %CONFIG_VALUE.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.f57 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } @@ -1025,7 +1025,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %CONFIG_VALUE_LONG.ref: %i64 = name_ref CONFIG_VALUE_LONG, constants.%int_42.b15 [concrete = constants.%int_42.b15] // CHECK:STDOUT: %i64.loc9: type = type_literal constants.%i64 [concrete = constants.%i64] -// CHECK:STDOUT: %b: %i64 = value_binding b, %CONFIG_VALUE_LONG.ref +// CHECK:STDOUT: %b: %i64 = wrapper_binding b, %CONFIG_VALUE_LONG.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.668 = value_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: } @@ -1033,7 +1033,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %CONFIG_VALUE_UNSIGNED.ref: %u32 = name_ref CONFIG_VALUE_UNSIGNED, constants.%int_42.869 [concrete = constants.%int_42.869] // CHECK:STDOUT: %u32.loc10: type = type_literal constants.%u32 [concrete = constants.%u32] -// CHECK:STDOUT: %c: %u32 = value_binding c, %CONFIG_VALUE_UNSIGNED.ref +// CHECK:STDOUT: %c: %u32 = wrapper_binding c, %CONFIG_VALUE_UNSIGNED.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.6b6 = value_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: } @@ -1041,7 +1041,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %CONFIG_VALUE_HEXA.ref: %i32 = name_ref CONFIG_VALUE_HEXA, constants.%int_255 [concrete = constants.%int_255] // CHECK:STDOUT: %i32.loc11: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %d: %i32 = value_binding d, %CONFIG_VALUE_HEXA.ref +// CHECK:STDOUT: %d: %i32 = wrapper_binding d, %CONFIG_VALUE_HEXA.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %e.patt: %pattern_type.6b6 = value_binding_pattern e [concrete = constants.%e.patt] // CHECK:STDOUT: } @@ -1049,7 +1049,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %CONFIG_VALUE_OCTAL.ref: %i32 = name_ref CONFIG_VALUE_OCTAL, constants.%int_8 [concrete = constants.%int_8] // CHECK:STDOUT: %i32.loc12: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %e: %i32 = value_binding e, %CONFIG_VALUE_OCTAL.ref +// CHECK:STDOUT: %e: %i32 = wrapper_binding e, %CONFIG_VALUE_OCTAL.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %f.patt: %pattern_type.6b6 = value_binding_pattern f [concrete = constants.%f.patt] // CHECK:STDOUT: } @@ -1057,7 +1057,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %CONFIG_VALUE_BINARY.ref: %i32 = name_ref CONFIG_VALUE_BINARY, constants.%int_5 [concrete = constants.%int_5] // CHECK:STDOUT: %i32.loc13: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %f: %i32 = value_binding f, %CONFIG_VALUE_BINARY.ref +// CHECK:STDOUT: %f: %i32 = wrapper_binding f, %CONFIG_VALUE_BINARY.ref // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1169,7 +1169,7 @@ fn F() { // CHECK:STDOUT: %.loc10_31.2: Core.IntLiteral = converted %n.ref.loc10, %.loc10_31.1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %array_type: type = array_type %.loc10_31.2, %f32.loc10 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %array_type = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %array_type = wrapper_binding a, %a.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.240 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } @@ -1179,7 +1179,7 @@ fn F() { // CHECK:STDOUT: %n.ref.loc12: ref %f32.c73 = name_ref n, imports.%n.var [concrete = imports.%n.var] // CHECK:STDOUT: %.loc12: %f32.c73 = acquire_value %n.ref.loc12 // CHECK:STDOUT: %f32.loc12: type = type_literal constants.%f32.c73 [concrete = constants.%f32.c73] -// CHECK:STDOUT: %b: %f32.c73 = value_binding b, %.loc12 +// CHECK:STDOUT: %b: %f32.c73 = wrapper_binding b, %.loc12 // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %a.var, constants.%Destroy.Op.1a2547.3 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%a.var) // CHECK:STDOUT: @@ -1223,7 +1223,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %NEGATIVE.ref: %i32 = name_ref NEGATIVE, constants.%int_-1 [concrete = constants.%int_-1] // CHECK:STDOUT: %i32.loc8: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %NEGATIVE.ref +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %NEGATIVE.ref // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1253,7 +1253,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %ADDITION.ref: %i32 = name_ref ADDITION, constants.%int_3 [concrete = constants.%int_3] // CHECK:STDOUT: %i32.loc8: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %ADDITION.ref +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %ADDITION.ref // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1294,7 +1294,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %CAST_UNSIGNED.ref: %u32 = name_ref CAST_UNSIGNED, constants.%int_1.92d [concrete = constants.%int_1.92d] // CHECK:STDOUT: %u32.loc8: type = type_literal constants.%u32 [concrete = constants.%u32] -// CHECK:STDOUT: %a: %u32 = value_binding a, %CAST_UNSIGNED.ref +// CHECK:STDOUT: %a: %u32 = wrapper_binding a, %CAST_UNSIGNED.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } @@ -1302,7 +1302,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %CAST_STATIC.ref: %i32 = name_ref CAST_STATIC, constants.%int_100 [concrete = constants.%int_100] // CHECK:STDOUT: %i32.loc9: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: %i32 = value_binding b, %CAST_STATIC.ref +// CHECK:STDOUT: %b: %i32 = wrapper_binding b, %CAST_STATIC.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.6b6 = value_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: } @@ -1310,7 +1310,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %CAST_FUNCTIONAL.ref: %i32 = name_ref CAST_FUNCTIONAL, constants.%int_99 [concrete = constants.%int_99] // CHECK:STDOUT: %i32.loc10: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %c: %i32 = value_binding c, %CAST_FUNCTIONAL.ref +// CHECK:STDOUT: %c: %i32 = wrapper_binding c, %CAST_FUNCTIONAL.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.6b6 = value_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: } @@ -1318,7 +1318,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %CAST_BOOL_TO_INT.ref: %i32 = name_ref CAST_BOOL_TO_INT, constants.%int_1.0c6 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %i32.loc11: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %d: %i32 = value_binding d, %CAST_BOOL_TO_INT.ref +// CHECK:STDOUT: %d: %i32 = wrapper_binding d, %CAST_BOOL_TO_INT.ref // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1348,7 +1348,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %INDIRECT_ONE.ref: %i32 = name_ref INDIRECT_ONE, constants.%int_1 [concrete = constants.%int_1] // CHECK:STDOUT: %i32.loc8: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %INDIRECT_ONE.ref +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %INDIRECT_ONE.ref // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1411,7 +1411,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %SimpleString.ref: %str.3d4 = name_ref SimpleString, %String.val.1 [concrete = constants.%String.val.6e1] // CHECK:STDOUT: %str.loc8: type = type_literal constants.%str.3d4 [concrete = constants.%str.3d4] -// CHECK:STDOUT: %a: %str.3d4 = value_binding a, %SimpleString.ref +// CHECK:STDOUT: %a: %str.3d4 = wrapper_binding a, %SimpleString.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.adf = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } @@ -1419,7 +1419,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %EmptyString.ref: %str.3d4 = name_ref EmptyString, %String.val.2 [concrete = constants.%String.val.9fd] // CHECK:STDOUT: %str.loc9: type = type_literal constants.%str.3d4 [concrete = constants.%str.3d4] -// CHECK:STDOUT: %b: %str.3d4 = value_binding b, %EmptyString.ref +// CHECK:STDOUT: %b: %str.3d4 = wrapper_binding b, %EmptyString.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.adf = value_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: } @@ -1427,7 +1427,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %EscapeCharacter.ref: %str.3d4 = name_ref EscapeCharacter, %String.val.3 [concrete = constants.%String.val.86a] // CHECK:STDOUT: %str.loc10: type = type_literal constants.%str.3d4 [concrete = constants.%str.3d4] -// CHECK:STDOUT: %c: %str.3d4 = value_binding c, %EscapeCharacter.ref +// CHECK:STDOUT: %c: %str.3d4 = wrapper_binding c, %EscapeCharacter.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.adf = value_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: } @@ -1435,7 +1435,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %Concatenated.ref: %str.3d4 = name_ref Concatenated, %String.val.4 [concrete = constants.%String.val.efd] // CHECK:STDOUT: %str.loc11: type = type_literal constants.%str.3d4 [concrete = constants.%str.3d4] -// CHECK:STDOUT: %d: %str.3d4 = value_binding d, %Concatenated.ref +// CHECK:STDOUT: %d: %str.3d4 = wrapper_binding d, %Concatenated.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %e.patt: %pattern_type.adf = value_binding_pattern e [concrete = constants.%e.patt] // CHECK:STDOUT: } @@ -1443,7 +1443,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %RawString.ref: %str.3d4 = name_ref RawString, %String.val.5 [concrete = constants.%String.val.70a] // CHECK:STDOUT: %str.loc12: type = type_literal constants.%str.3d4 [concrete = constants.%str.3d4] -// CHECK:STDOUT: %e: %str.3d4 = value_binding e, %RawString.ref +// CHECK:STDOUT: %e: %str.3d4 = wrapper_binding e, %RawString.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %f.patt: %pattern_type.adf = value_binding_pattern f [concrete = constants.%f.patt] // CHECK:STDOUT: } @@ -1451,7 +1451,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %Utf8String.ref: %str.3d4 = name_ref Utf8String, %String.val.6 [concrete = constants.%String.val.711] // CHECK:STDOUT: %str.loc13: type = type_literal constants.%str.3d4 [concrete = constants.%str.3d4] -// CHECK:STDOUT: %f: %str.3d4 = value_binding f, %Utf8String.ref +// CHECK:STDOUT: %f: %str.3d4 = wrapper_binding f, %Utf8String.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %g.patt: %pattern_type.adf = value_binding_pattern g [concrete = constants.%g.patt] // CHECK:STDOUT: } @@ -1459,7 +1459,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %Indirect.ref: %str.3d4 = name_ref Indirect, %String.val.7 [concrete = constants.%String.val.fce] // CHECK:STDOUT: %str.loc14: type = type_literal constants.%str.3d4 [concrete = constants.%str.3d4] -// CHECK:STDOUT: %g: %str.3d4 = value_binding g, %Indirect.ref +// CHECK:STDOUT: %g: %str.3d4 = wrapper_binding g, %Indirect.ref // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1498,7 +1498,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %MyDouble.ref: %f64.dc1 = name_ref MyDouble, constants.%float.3b9 [concrete = constants.%float.3b9] // CHECK:STDOUT: %f64.loc8: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %a: %f64.dc1 = value_binding a, %MyDouble.ref +// CHECK:STDOUT: %a: %f64.dc1 = wrapper_binding a, %MyDouble.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.fb7 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } @@ -1506,7 +1506,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %MyDoubleE.ref: %f64.dc1 = name_ref MyDoubleE, constants.%float.17a [concrete = constants.%float.17a] // CHECK:STDOUT: %f64.loc9: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %b: %f64.dc1 = value_binding b, %MyDoubleE.ref +// CHECK:STDOUT: %b: %f64.dc1 = wrapper_binding b, %MyDoubleE.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.240 = value_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: } @@ -1514,7 +1514,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %MyFloat.ref: %f32.c73 = name_ref MyFloat, constants.%float.943 [concrete = constants.%float.943] // CHECK:STDOUT: %f32.loc10: type = type_literal constants.%f32.c73 [concrete = constants.%f32.c73] -// CHECK:STDOUT: %c: %f32.c73 = value_binding c, %MyFloat.ref +// CHECK:STDOUT: %c: %f32.c73 = wrapper_binding c, %MyFloat.ref // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1558,7 +1558,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %M_LOWERCASE.ref: %char = name_ref M_LOWERCASE, constants.%int_97 [concrete = constants.%int_97] // CHECK:STDOUT: %char.loc8: type = type_literal constants.%char [concrete = constants.%char] -// CHECK:STDOUT: %a: %char = value_binding a, %M_LOWERCASE.ref +// CHECK:STDOUT: %a: %char = wrapper_binding a, %M_LOWERCASE.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.2ff = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } @@ -1566,7 +1566,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %M_UPPERCASE.ref: %char = name_ref M_UPPERCASE, constants.%int_65 [concrete = constants.%int_65] // CHECK:STDOUT: %char.loc9: type = type_literal constants.%char [concrete = constants.%char] -// CHECK:STDOUT: %b: %char = value_binding b, %M_UPPERCASE.ref +// CHECK:STDOUT: %b: %char = wrapper_binding b, %M_UPPERCASE.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.2ff = value_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: } @@ -1574,7 +1574,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %M_DIGIT.ref: %char = name_ref M_DIGIT, constants.%int_49 [concrete = constants.%int_49] // CHECK:STDOUT: %char.loc10: type = type_literal constants.%char [concrete = constants.%char] -// CHECK:STDOUT: %c: %char = value_binding c, %M_DIGIT.ref +// CHECK:STDOUT: %c: %char = wrapper_binding c, %M_DIGIT.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.2ff = value_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: } @@ -1582,7 +1582,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %M_SPACE.ref: %char = name_ref M_SPACE, constants.%int_32 [concrete = constants.%int_32] // CHECK:STDOUT: %char.loc11: type = type_literal constants.%char [concrete = constants.%char] -// CHECK:STDOUT: %d: %char = value_binding d, %M_SPACE.ref +// CHECK:STDOUT: %d: %char = wrapper_binding d, %M_SPACE.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %e.patt: %pattern_type.2ff = value_binding_pattern e [concrete = constants.%e.patt] // CHECK:STDOUT: } @@ -1590,7 +1590,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %M_TAB.ref: %char = name_ref M_TAB, constants.%int_9 [concrete = constants.%int_9] // CHECK:STDOUT: %char.loc12: type = type_literal constants.%char [concrete = constants.%char] -// CHECK:STDOUT: %e: %char = value_binding e, %M_TAB.ref +// CHECK:STDOUT: %e: %char = wrapper_binding e, %M_TAB.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %f.patt: %pattern_type.2ff = value_binding_pattern f [concrete = constants.%f.patt] // CHECK:STDOUT: } @@ -1598,7 +1598,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %M_UTF8_CHAR.ref: %char = name_ref M_UTF8_CHAR, constants.%int_88 [concrete = constants.%int_88] // CHECK:STDOUT: %char.loc13: type = type_literal constants.%char [concrete = constants.%char] -// CHECK:STDOUT: %f: %char = value_binding f, %M_UTF8_CHAR.ref +// CHECK:STDOUT: %f: %char = wrapper_binding f, %M_UTF8_CHAR.ref // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1637,7 +1637,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %M_CONDITIONAL.ref: %char = name_ref M_CONDITIONAL, constants.%int_97 [concrete = constants.%int_97] // CHECK:STDOUT: %char.loc8: type = type_literal constants.%char [concrete = constants.%char] -// CHECK:STDOUT: %a: %char = value_binding a, %M_CONDITIONAL.ref +// CHECK:STDOUT: %a: %char = wrapper_binding a, %M_CONDITIONAL.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } @@ -1645,14 +1645,14 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %M_A_PLUS_ONE.ref: %i32 = name_ref M_A_PLUS_ONE, constants.%int_98 [concrete = constants.%int_98] // CHECK:STDOUT: %i32.loc9: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: %i32 = value_binding b, %M_A_PLUS_ONE.ref +// CHECK:STDOUT: %b: %i32 = wrapper_binding b, %M_A_PLUS_ONE.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.831 = value_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %Cpp.ref.loc10: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %M_A_EQUAL.ref: bool = name_ref M_A_EQUAL, constants.%true [concrete = constants.%true] // CHECK:STDOUT: %.loc10: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %c: bool = value_binding c, %M_A_EQUAL.ref +// CHECK:STDOUT: %c: bool = wrapper_binding c, %M_A_EQUAL.ref // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1705,63 +1705,63 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc8: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %M_TRUE.ref: bool = name_ref M_TRUE, constants.%true [concrete = constants.%true] // CHECK:STDOUT: %.loc8: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %a: bool = value_binding a, %M_TRUE.ref +// CHECK:STDOUT: %a: bool = wrapper_binding a, %M_TRUE.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.831 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %Cpp.ref.loc9: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %M_FALSE.ref: bool = name_ref M_FALSE, constants.%false [concrete = constants.%false] // CHECK:STDOUT: %.loc9: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %b: bool = value_binding b, %M_FALSE.ref +// CHECK:STDOUT: %b: bool = wrapper_binding b, %M_FALSE.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.831 = value_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %Cpp.ref.loc10: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %M_NOT_TRUE.ref: bool = name_ref M_NOT_TRUE, constants.%false [concrete = constants.%false] // CHECK:STDOUT: %.loc10: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %c: bool = value_binding c, %M_NOT_TRUE.ref +// CHECK:STDOUT: %c: bool = wrapper_binding c, %M_NOT_TRUE.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.831 = value_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %Cpp.ref.loc11: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %M_NOT_ZERO.ref: bool = name_ref M_NOT_ZERO, constants.%true [concrete = constants.%true] // CHECK:STDOUT: %.loc11: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %d: bool = value_binding d, %M_NOT_ZERO.ref +// CHECK:STDOUT: %d: bool = wrapper_binding d, %M_NOT_ZERO.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %e.patt: %pattern_type.831 = value_binding_pattern e [concrete = constants.%e.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %Cpp.ref.loc12: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %M_ONE_EQ_ONE.ref: bool = name_ref M_ONE_EQ_ONE, constants.%true [concrete = constants.%true] // CHECK:STDOUT: %.loc12: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %e: bool = value_binding e, %M_ONE_EQ_ONE.ref +// CHECK:STDOUT: %e: bool = wrapper_binding e, %M_ONE_EQ_ONE.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %f.patt: %pattern_type.831 = value_binding_pattern f [concrete = constants.%f.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %Cpp.ref.loc13: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %M_ONE_NEQ_ONE.ref: bool = name_ref M_ONE_NEQ_ONE, constants.%false [concrete = constants.%false] // CHECK:STDOUT: %.loc13: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %f: bool = value_binding f, %M_ONE_NEQ_ONE.ref +// CHECK:STDOUT: %f: bool = wrapper_binding f, %M_ONE_NEQ_ONE.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %g.patt: %pattern_type.831 = value_binding_pattern g [concrete = constants.%g.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %Cpp.ref.loc14: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %M_AND.ref: bool = name_ref M_AND, constants.%true [concrete = constants.%true] // CHECK:STDOUT: %.loc14: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %g: bool = value_binding g, %M_AND.ref +// CHECK:STDOUT: %g: bool = wrapper_binding g, %M_AND.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %h.patt: %pattern_type.831 = value_binding_pattern h [concrete = constants.%h.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %Cpp.ref.loc15: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %M_OR.ref: bool = name_ref M_OR, constants.%true [concrete = constants.%true] // CHECK:STDOUT: %.loc15: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %h: bool = value_binding h, %M_OR.ref +// CHECK:STDOUT: %h: bool = wrapper_binding h, %M_OR.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %i.patt: %pattern_type.831 = value_binding_pattern i [concrete = constants.%i.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %Cpp.ref.loc16: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %M_COMPLEX.ref: bool = name_ref M_COMPLEX, constants.%true [concrete = constants.%true] // CHECK:STDOUT: %.loc16: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %i: bool = value_binding i, %M_COMPLEX.ref +// CHECK:STDOUT: %i: bool = wrapper_binding i, %M_COMPLEX.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %j.patt: %pattern_type.6b6 = value_binding_pattern j [concrete = constants.%j.patt] // CHECK:STDOUT: } @@ -1769,7 +1769,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %M_ONE.ref: %i32 = name_ref M_ONE, constants.%int_1 [concrete = constants.%int_1] // CHECK:STDOUT: %i32.loc18: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %j: %i32 = value_binding j, %M_ONE.ref +// CHECK:STDOUT: %j: %i32 = wrapper_binding j, %M_ONE.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %k.patt: %pattern_type.6b6 = value_binding_pattern k [concrete = constants.%k.patt] // CHECK:STDOUT: } @@ -1777,7 +1777,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %M_ZERO.ref: %i32 = name_ref M_ZERO, constants.%int_0 [concrete = constants.%int_0] // CHECK:STDOUT: %i32.loc19: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %k: %i32 = value_binding k, %M_ZERO.ref +// CHECK:STDOUT: %k: %i32 = wrapper_binding k, %M_ZERO.ref // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1924,7 +1924,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc11_17: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %A.ref: type = name_ref A, imports.%A.decl [concrete = constants.%A] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %A = value_binding a, %M_A.ref +// CHECK:STDOUT: %a: %A = wrapper_binding a, %M_A.ref // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1966,7 +1966,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %.loc11_26.3: %i32 = acquire_value %.loc11_26.2 [concrete = constants.%int_1] // CHECK:STDOUT: %i32.loc11: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %.loc11_26.3 +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %.loc11_26.3 // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -2004,7 +2004,7 @@ fn F() { // CHECK:STDOUT: %const: type = const_type %i32 [concrete = constants.%const] // CHECK:STDOUT: %ptr: type = ptr_type %const [concrete = constants.%ptr] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr = value_binding p, @__global_init.%addr +// CHECK:STDOUT: %p: %ptr = wrapper_binding p, @__global_init.%addr // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -2042,7 +2042,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %MyIntLambda.ref: %i32 = name_ref MyIntLambda, constants.%int_7 [concrete = constants.%int_7] // CHECK:STDOUT: %i32.loc10: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %i: %i32 = value_binding i, %MyIntLambda.ref +// CHECK:STDOUT: %i: %i32 = wrapper_binding i, %MyIntLambda.ref // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -2072,7 +2072,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %REDEF_NAME.ref: %i32 = name_ref REDEF_NAME, constants.%int_2 [concrete = constants.%int_2] // CHECK:STDOUT: %i32.loc8: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %REDEF_NAME.ref +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %REDEF_NAME.ref // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -2102,7 +2102,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %TWICE_DEF.ref: %i32 = name_ref TWICE_DEF, constants.%int_2 [concrete = constants.%int_2] // CHECK:STDOUT: %i32.loc17: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, %TWICE_DEF.ref +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, %TWICE_DEF.ref // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interop/cpp/operators/operators.carbon b/toolchain/check/testdata/interop/cpp/operators/operators.carbon index f03f0ca833a5..ebc695708134 100644 --- a/toolchain/check/testdata/interop/cpp/operators/operators.carbon +++ b/toolchain/check/testdata/interop/cpp/operators/operators.carbon @@ -1106,7 +1106,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc8_10: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc8_13: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var // CHECK:STDOUT: %c.ref.loc11: ref %C = name_ref c, %c // CHECK:STDOUT: %cpp_operator.call.loc11: ref %C = call imports.%cpp_operator.decl.5ce91d.1(%c.ref.loc11) // CHECK:STDOUT: %c.ref.loc12: ref %C = name_ref c, %c @@ -1128,7 +1128,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc15: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc15: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %minus: %C = value_binding minus, %.loc15_29.4 +// CHECK:STDOUT: %minus: %C = wrapper_binding minus, %.loc15_29.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %complement.patt: %pattern_type.bbc = value_binding_pattern complement [concrete = constants.%complement.patt] // CHECK:STDOUT: } @@ -1146,7 +1146,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc18: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc18: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %complement: %C = value_binding complement, %.loc18_34.4 +// CHECK:STDOUT: %complement: %C = wrapper_binding complement, %.loc18_34.4 // CHECK:STDOUT: // CHECK:STDOUT: %C.Op.bound.loc18: = bound_method %.loc18_34.3, constants.%C.Op // CHECK:STDOUT: %Op.ref.loc18: %C.cpp_destructor.type = name_ref Op, imports.%C.cpp_destructor.decl [concrete = constants.%C.cpp_destructor] @@ -1460,7 +1460,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc8_11: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc8_14: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c1: ref %C = ref_binding c1, %c1.var +// CHECK:STDOUT: %c1: ref %C = wrapper_binding c1, %c1.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c2.patt: %pattern_type.bbc = ref_binding_pattern c2 [concrete = constants.%c2.patt] // CHECK:STDOUT: %c2.var_patt: %pattern_type.bbc = var_pattern %c2.patt [concrete = constants.%c2.var_patt] @@ -1478,7 +1478,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc9_11: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc9_14: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c2: ref %C = ref_binding c2, %c2.var +// CHECK:STDOUT: %c2: ref %C = wrapper_binding c2, %c2.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %addition.patt: %pattern_type.bbc = value_binding_pattern addition [concrete = constants.%addition.patt] // CHECK:STDOUT: } @@ -1500,7 +1500,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc12: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc12: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %addition: %C = value_binding addition, %.loc12_35.4 +// CHECK:STDOUT: %addition: %C = wrapper_binding addition, %.loc12_35.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %subtraction.patt: %pattern_type.bbc = value_binding_pattern subtraction [concrete = constants.%subtraction.patt] // CHECK:STDOUT: } @@ -1522,7 +1522,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc13: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc13: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %subtraction: %C = value_binding subtraction, %.loc13_38.4 +// CHECK:STDOUT: %subtraction: %C = wrapper_binding subtraction, %.loc13_38.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %multiplication.patt: %pattern_type.bbc = value_binding_pattern multiplication [concrete = constants.%multiplication.patt] // CHECK:STDOUT: } @@ -1544,7 +1544,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc14: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc14: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %multiplication: %C = value_binding multiplication, %.loc14_41.4 +// CHECK:STDOUT: %multiplication: %C = wrapper_binding multiplication, %.loc14_41.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %division.patt: %pattern_type.bbc = value_binding_pattern division [concrete = constants.%division.patt] // CHECK:STDOUT: } @@ -1566,7 +1566,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc15: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc15: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %division: %C = value_binding division, %.loc15_35.4 +// CHECK:STDOUT: %division: %C = wrapper_binding division, %.loc15_35.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %modulo.patt: %pattern_type.bbc = value_binding_pattern modulo [concrete = constants.%modulo.patt] // CHECK:STDOUT: } @@ -1588,7 +1588,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc16: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc16: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %modulo: %C = value_binding modulo, %.loc16_33.4 +// CHECK:STDOUT: %modulo: %C = wrapper_binding modulo, %.loc16_33.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %bitwise_and.patt: %pattern_type.bbc = value_binding_pattern bitwise_and [concrete = constants.%bitwise_and.patt] // CHECK:STDOUT: } @@ -1610,7 +1610,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc19: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc19: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %bitwise_and: %C = value_binding bitwise_and, %.loc19_38.4 +// CHECK:STDOUT: %bitwise_and: %C = wrapper_binding bitwise_and, %.loc19_38.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %bitwise_or.patt: %pattern_type.bbc = value_binding_pattern bitwise_or [concrete = constants.%bitwise_or.patt] // CHECK:STDOUT: } @@ -1632,7 +1632,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc20: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc20: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %bitwise_or: %C = value_binding bitwise_or, %.loc20_37.4 +// CHECK:STDOUT: %bitwise_or: %C = wrapper_binding bitwise_or, %.loc20_37.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %bitwise_xor.patt: %pattern_type.bbc = value_binding_pattern bitwise_xor [concrete = constants.%bitwise_xor.patt] // CHECK:STDOUT: } @@ -1654,7 +1654,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc21: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc21: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %bitwise_xor: %C = value_binding bitwise_xor, %.loc21_38.4 +// CHECK:STDOUT: %bitwise_xor: %C = wrapper_binding bitwise_xor, %.loc21_38.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %left_shift.patt: %pattern_type.bbc = value_binding_pattern left_shift [concrete = constants.%left_shift.patt] // CHECK:STDOUT: } @@ -1680,7 +1680,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc22: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc22: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %left_shift: %C = value_binding left_shift, %.loc22_37.4 +// CHECK:STDOUT: %left_shift: %C = wrapper_binding left_shift, %.loc22_37.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %right_shift.patt: %pattern_type.bbc = value_binding_pattern right_shift [concrete = constants.%right_shift.patt] // CHECK:STDOUT: } @@ -1706,7 +1706,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc23: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc23: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %right_shift: %C = value_binding right_shift, %.loc23_38.4 +// CHECK:STDOUT: %right_shift: %C = wrapper_binding right_shift, %.loc23_38.4 // CHECK:STDOUT: %c1.ref.loc26: ref %C = name_ref c1, %c1 // CHECK:STDOUT: %c2.ref.loc26: ref %C = name_ref c2, %c2 // CHECK:STDOUT: %.loc26_9.1: %C = acquire_value %c2.ref.loc26 @@ -1793,7 +1793,7 @@ fn F() { // CHECK:STDOUT: %.loc40_31.3: ref bool = temporary %.loc40_31.1, %.loc40_31.2 // CHECK:STDOUT: %.loc40_31.4: bool = acquire_value %.loc40_31.3 // CHECK:STDOUT: %.loc40_21: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %equal: bool = value_binding equal, %.loc40_31.4 +// CHECK:STDOUT: %equal: bool = wrapper_binding equal, %.loc40_31.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %not_equal.patt: %pattern_type.831 = value_binding_pattern not_equal [concrete = constants.%not_equal.patt] // CHECK:STDOUT: } @@ -1812,7 +1812,7 @@ fn F() { // CHECK:STDOUT: %.loc41_35.3: ref bool = temporary %.loc41_35.1, %.loc41_35.2 // CHECK:STDOUT: %.loc41_35.4: bool = acquire_value %.loc41_35.3 // CHECK:STDOUT: %.loc41_25: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %not_equal: bool = value_binding not_equal, %.loc41_35.4 +// CHECK:STDOUT: %not_equal: bool = wrapper_binding not_equal, %.loc41_35.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %greater_than.patt: %pattern_type.831 = value_binding_pattern greater_than [concrete = constants.%greater_than.patt] // CHECK:STDOUT: } @@ -1831,7 +1831,7 @@ fn F() { // CHECK:STDOUT: %.loc42_38.3: ref bool = temporary %.loc42_38.1, %.loc42_38.2 // CHECK:STDOUT: %.loc42_38.4: bool = acquire_value %.loc42_38.3 // CHECK:STDOUT: %.loc42_28: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %greater_than: bool = value_binding greater_than, %.loc42_38.4 +// CHECK:STDOUT: %greater_than: bool = wrapper_binding greater_than, %.loc42_38.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %less_than.patt: %pattern_type.831 = value_binding_pattern less_than [concrete = constants.%less_than.patt] // CHECK:STDOUT: } @@ -1850,7 +1850,7 @@ fn F() { // CHECK:STDOUT: %.loc43_35.3: ref bool = temporary %.loc43_35.1, %.loc43_35.2 // CHECK:STDOUT: %.loc43_35.4: bool = acquire_value %.loc43_35.3 // CHECK:STDOUT: %.loc43_25: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %less_than: bool = value_binding less_than, %.loc43_35.4 +// CHECK:STDOUT: %less_than: bool = wrapper_binding less_than, %.loc43_35.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %greater_than_or_equal.patt: %pattern_type.831 = value_binding_pattern greater_than_or_equal [concrete = constants.%greater_than_or_equal.patt] // CHECK:STDOUT: } @@ -1869,7 +1869,7 @@ fn F() { // CHECK:STDOUT: %.loc44_47.3: ref bool = temporary %.loc44_47.1, %.loc44_47.2 // CHECK:STDOUT: %.loc44_47.4: bool = acquire_value %.loc44_47.3 // CHECK:STDOUT: %.loc44_37: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %greater_than_or_equal: bool = value_binding greater_than_or_equal, %.loc44_47.4 +// CHECK:STDOUT: %greater_than_or_equal: bool = wrapper_binding greater_than_or_equal, %.loc44_47.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %less_than_or_equal.patt: %pattern_type.831 = value_binding_pattern less_than_or_equal [concrete = constants.%less_than_or_equal.patt] // CHECK:STDOUT: } @@ -1888,7 +1888,7 @@ fn F() { // CHECK:STDOUT: %.loc45_44.3: ref bool = temporary %.loc45_44.1, %.loc45_44.2 // CHECK:STDOUT: %.loc45_44.4: bool = acquire_value %.loc45_44.3 // CHECK:STDOUT: %.loc45_34: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %less_than_or_equal: bool = value_binding less_than_or_equal, %.loc45_44.4 +// CHECK:STDOUT: %less_than_or_equal: bool = wrapper_binding less_than_or_equal, %.loc45_44.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %index.patt: %pattern_type.6b6 = value_binding_pattern index [concrete = constants.%index.patt] // CHECK:STDOUT: } @@ -1905,7 +1905,7 @@ fn F() { // CHECK:STDOUT: %.loc48_32.1: %i32 = value_of_initializer %C.cpp_operator.call // CHECK:STDOUT: %.loc48_32.2: %i32 = converted %C.cpp_operator.call, %.loc48_32.1 // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %index: %i32 = value_binding index, %.loc48_32.2 +// CHECK:STDOUT: %index: %i32 = wrapper_binding index, %.loc48_32.2 // CHECK:STDOUT: %Destroy.Op.bound.loc45: = bound_method %.loc45_44.3, constants.%Destroy.Op // CHECK:STDOUT: %Destroy.Op.call.loc45: init %empty_tuple.type = call %Destroy.Op.bound.loc45(%.loc45_44.3) // CHECK:STDOUT: %Destroy.Op.bound.loc44: = bound_method %.loc44_47.3, constants.%Destroy.Op @@ -2038,7 +2038,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc8_11: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc8_14: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c1: %C = value_binding c1, %.loc8_27.4 +// CHECK:STDOUT: %c1: %C = wrapper_binding c1, %.loc8_27.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c2.patt: %pattern_type.bbc = value_binding_pattern c2 [concrete = constants.%c2.patt] // CHECK:STDOUT: } @@ -2055,7 +2055,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc9_11: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc9_14: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c2: %C = value_binding c2, %.loc9_27.4 +// CHECK:STDOUT: %c2: %C = wrapper_binding c2, %.loc9_27.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c3.patt: %pattern_type.bbc = value_binding_pattern c3 [concrete = constants.%c3.patt] // CHECK:STDOUT: } @@ -2075,7 +2075,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc10: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc10: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c3: %C = value_binding c3, %.loc10_22.4 +// CHECK:STDOUT: %c3: %C = wrapper_binding c3, %.loc10_22.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c4.patt: %pattern_type.bbc = value_binding_pattern c4 [concrete = constants.%c4.patt] // CHECK:STDOUT: } @@ -2095,7 +2095,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc11: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc11: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c4: %C = value_binding c4, %.loc11_22.4 +// CHECK:STDOUT: %c4: %C = wrapper_binding c4, %.loc11_22.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c5.patt: %pattern_type.bbc = value_binding_pattern c5 [concrete = constants.%c5.patt] // CHECK:STDOUT: } @@ -2115,7 +2115,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc12: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc12: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c5: %C = value_binding c5, %.loc12_29.4 +// CHECK:STDOUT: %c5: %C = wrapper_binding c5, %.loc12_29.4 // CHECK:STDOUT: // CHECK:STDOUT: %C.Op.bound.loc12: = bound_method %.loc12_29.3, constants.%C.Op // CHECK:STDOUT: %Op.ref.loc12: %C.cpp_destructor.type = name_ref Op, imports.%C.cpp_destructor.decl [concrete = constants.%C.cpp_destructor] @@ -2221,7 +2221,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc15_11: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc15_14: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c1: ref %C = ref_binding c1, %c1.var +// CHECK:STDOUT: %c1: ref %C = wrapper_binding c1, %c1.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c2.patt: %pattern_type.bbc = ref_binding_pattern c2 [concrete = constants.%c2.patt] // CHECK:STDOUT: %c2.var_patt: %pattern_type.bbc = var_pattern %c2.patt [concrete = constants.%c2.var_patt] @@ -2239,7 +2239,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc16_11: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc16_14: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c2: ref %C = ref_binding c2, %c2.var +// CHECK:STDOUT: %c2: ref %C = wrapper_binding c2, %c2.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %greater_than.patt: %pattern_type.831 = value_binding_pattern greater_than [concrete = constants.%greater_than.patt] // CHECK:STDOUT: } @@ -2258,21 +2258,21 @@ fn F() { // CHECK:STDOUT: %.loc19_38.3: ref bool = temporary %.loc19_38.1, %.loc19_38.2 // CHECK:STDOUT: %.loc19_38.4: bool = acquire_value %.loc19_38.3 // CHECK:STDOUT: %.loc19_28: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %greater_than: bool = value_binding greater_than, %.loc19_38.4 +// CHECK:STDOUT: %greater_than: bool = wrapper_binding greater_than, %.loc19_38.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %less_than.patt: %pattern_type.831 = value_binding_pattern less_than [concrete = constants.%less_than.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %c1.ref.loc26: ref %C = name_ref c1, %c1 // CHECK:STDOUT: %c2.ref.loc26: ref %C = name_ref c2, %c2 // CHECK:STDOUT: %.loc26: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %less_than: bool = value_binding less_than, [concrete = ] +// CHECK:STDOUT: %less_than: bool = wrapper_binding less_than, [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %greater_than_or_equal.patt: %pattern_type.831 = value_binding_pattern greater_than_or_equal [concrete = constants.%greater_than_or_equal.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %c1.ref.loc33: ref %C = name_ref c1, %c1 // CHECK:STDOUT: %c2.ref.loc33: ref %C = name_ref c2, %c2 // CHECK:STDOUT: %.loc33: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %greater_than_or_equal: bool = value_binding greater_than_or_equal, [concrete = ] +// CHECK:STDOUT: %greater_than_or_equal: bool = wrapper_binding greater_than_or_equal, [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %less_than_or_equal.patt: %pattern_type.831 = value_binding_pattern less_than_or_equal [concrete = constants.%less_than_or_equal.patt] // CHECK:STDOUT: } @@ -2291,7 +2291,7 @@ fn F() { // CHECK:STDOUT: %.loc36_44.3: ref bool = temporary %.loc36_44.1, %.loc36_44.2 // CHECK:STDOUT: %.loc36_44.4: bool = acquire_value %.loc36_44.3 // CHECK:STDOUT: %.loc36_34: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %less_than_or_equal: bool = value_binding less_than_or_equal, %.loc36_44.4 +// CHECK:STDOUT: %less_than_or_equal: bool = wrapper_binding less_than_or_equal, %.loc36_44.4 // CHECK:STDOUT: %Destroy.Op.bound.loc36: = bound_method %.loc36_44.3, constants.%Destroy.Op // CHECK:STDOUT: %Destroy.Op.call.loc36: init %empty_tuple.type = call %Destroy.Op.bound.loc36(%.loc36_44.3) // CHECK:STDOUT: %Destroy.Op.bound.loc19: = bound_method %.loc19_38.3, constants.%Destroy.Op @@ -2382,7 +2382,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc12_11: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc12_14: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c1: ref %C = ref_binding c1, %c1.var +// CHECK:STDOUT: %c1: ref %C = wrapper_binding c1, %c1.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c2.patt: %pattern_type.bbc = ref_binding_pattern c2 [concrete = constants.%c2.patt] // CHECK:STDOUT: %c2.var_patt: %pattern_type.bbc = var_pattern %c2.patt [concrete = constants.%c2.var_patt] @@ -2400,7 +2400,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc13_11: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc13_14: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c2: ref %C = ref_binding c2, %c2.var +// CHECK:STDOUT: %c2: ref %C = wrapper_binding c2, %c2.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %equal.patt: %pattern_type.831 = value_binding_pattern equal [concrete = constants.%equal.patt] // CHECK:STDOUT: } @@ -2419,14 +2419,14 @@ fn F() { // CHECK:STDOUT: %.loc16_31.3: ref bool = temporary %.loc16_31.1, %.loc16_31.2 // CHECK:STDOUT: %.loc16_31.4: bool = acquire_value %.loc16_31.3 // CHECK:STDOUT: %.loc16_21: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %equal: bool = value_binding equal, %.loc16_31.4 +// CHECK:STDOUT: %equal: bool = wrapper_binding equal, %.loc16_31.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %not_equal.patt: %pattern_type.831 = value_binding_pattern not_equal [concrete = constants.%not_equal.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %c1.ref.loc23: ref %C = name_ref c1, %c1 // CHECK:STDOUT: %c2.ref.loc23: ref %C = name_ref c2, %c2 // CHECK:STDOUT: %.loc23: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %not_equal: bool = value_binding not_equal, [concrete = ] +// CHECK:STDOUT: %not_equal: bool = wrapper_binding not_equal, [concrete = ] // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %.loc16_31.3, constants.%Destroy.Op // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%.loc16_31.3) // CHECK:STDOUT: @@ -2513,7 +2513,7 @@ fn F() { // CHECK:STDOUT: %N.ref.loc8_14: = name_ref N, imports.%N [concrete = imports.%N] // CHECK:STDOUT: %C.ref.loc8_16: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c1: %C = value_binding c1, %.loc8_31.4 +// CHECK:STDOUT: %c1: %C = wrapper_binding c1, %.loc8_31.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c2.patt: %pattern_type.7cb = value_binding_pattern c2 [concrete = constants.%c2.patt] // CHECK:STDOUT: } @@ -2532,7 +2532,7 @@ fn F() { // CHECK:STDOUT: %N.ref.loc9_14: = name_ref N, imports.%N [concrete = imports.%N] // CHECK:STDOUT: %C.ref.loc9_16: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c2: %C = value_binding c2, %.loc9_31.4 +// CHECK:STDOUT: %c2: %C = wrapper_binding c2, %.loc9_31.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c3.patt: %pattern_type.7cb = value_binding_pattern c3 [concrete = constants.%c3.patt] // CHECK:STDOUT: } @@ -2553,7 +2553,7 @@ fn F() { // CHECK:STDOUT: %N.ref.loc10: = name_ref N, imports.%N [concrete = imports.%N] // CHECK:STDOUT: %C.ref.loc10: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c3: %C = value_binding c3, %.loc10_31.4 +// CHECK:STDOUT: %c3: %C = wrapper_binding c3, %.loc10_31.4 // CHECK:STDOUT: // CHECK:STDOUT: %C.Op.bound.loc10: = bound_method %.loc10_31.3, constants.%C.Op // CHECK:STDOUT: %Op.ref.loc10: %C.cpp_destructor.type = name_ref Op, imports.%C.cpp_destructor.decl [concrete = constants.%C.cpp_destructor] @@ -2676,7 +2676,7 @@ fn F() { // CHECK:STDOUT: %N1.ref.loc8_14: = name_ref N1, imports.%N1 [concrete = imports.%N1] // CHECK:STDOUT: %C1.ref.loc8_17: type = name_ref C1, imports.%C1.decl [concrete = constants.%C1] // CHECK:STDOUT: } -// CHECK:STDOUT: %c1: %C1 = value_binding c1, %.loc8_36.4 +// CHECK:STDOUT: %c1: %C1 = wrapper_binding c1, %.loc8_36.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c2.patt: %pattern_type.00d = value_binding_pattern c2 [concrete = constants.%c2.patt] // CHECK:STDOUT: } @@ -2695,7 +2695,7 @@ fn F() { // CHECK:STDOUT: %N2.ref.loc9_14: = name_ref N2, imports.%N2 [concrete = imports.%N2] // CHECK:STDOUT: %C2.ref.loc9_17: type = name_ref C2, imports.%C2.decl [concrete = constants.%C2] // CHECK:STDOUT: } -// CHECK:STDOUT: %c2: %C2 = value_binding c2, %.loc9_36.4 +// CHECK:STDOUT: %c2: %C2 = wrapper_binding c2, %.loc9_36.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c3.patt: %pattern_type.00d = value_binding_pattern c3 [concrete = constants.%c3.patt] // CHECK:STDOUT: } @@ -2716,7 +2716,7 @@ fn F() { // CHECK:STDOUT: %N2.ref.loc10: = name_ref N2, imports.%N2 [concrete = imports.%N2] // CHECK:STDOUT: %C2.ref.loc10: type = name_ref C2, imports.%C2.decl [concrete = constants.%C2] // CHECK:STDOUT: } -// CHECK:STDOUT: %c3: %C2 = value_binding c3, %.loc10_33.4 +// CHECK:STDOUT: %c3: %C2 = wrapper_binding c3, %.loc10_33.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c4.patt: %pattern_type.00d = value_binding_pattern c4 [concrete = constants.%c4.patt] // CHECK:STDOUT: } @@ -2737,7 +2737,7 @@ fn F() { // CHECK:STDOUT: %N2.ref.loc11: = name_ref N2, imports.%N2 [concrete = imports.%N2] // CHECK:STDOUT: %C2.ref.loc11: type = name_ref C2, imports.%C2.decl [concrete = constants.%C2] // CHECK:STDOUT: } -// CHECK:STDOUT: %c4: %C2 = value_binding c4, %.loc11_33.4 +// CHECK:STDOUT: %c4: %C2 = wrapper_binding c4, %.loc11_33.4 // CHECK:STDOUT: // CHECK:STDOUT: %C2.Op.bound.loc11: = bound_method %.loc11_33.3, constants.%C2.Op // CHECK:STDOUT: %Op.ref.loc11: %C2.cpp_destructor.type = name_ref Op, imports.%C2.cpp_destructor.decl [concrete = constants.%C2.cpp_destructor] @@ -2822,7 +2822,7 @@ fn F() { // CHECK:STDOUT: %N.ref.loc8_14: = name_ref N, imports.%N [concrete = imports.%N] // CHECK:STDOUT: %C.ref.loc8_16: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c1: %C = value_binding c1, %.loc8_31.4 +// CHECK:STDOUT: %c1: %C = wrapper_binding c1, %.loc8_31.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c2.patt: %pattern_type.7cb = value_binding_pattern c2 [concrete = constants.%c2.patt] // CHECK:STDOUT: } @@ -2841,7 +2841,7 @@ fn F() { // CHECK:STDOUT: %N.ref.loc9_14: = name_ref N, imports.%N [concrete = imports.%N] // CHECK:STDOUT: %C.ref.loc9_16: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c2: %C = value_binding c2, %.loc9_31.4 +// CHECK:STDOUT: %c2: %C = wrapper_binding c2, %.loc9_31.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c3.patt: %pattern_type.7cb = value_binding_pattern c3 [concrete = constants.%c3.patt] // CHECK:STDOUT: } @@ -2852,7 +2852,7 @@ fn F() { // CHECK:STDOUT: %N.ref.loc14: = name_ref N, imports.%N [concrete = imports.%N] // CHECK:STDOUT: %C.ref.loc14: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c3: %C = value_binding c3, [concrete = ] +// CHECK:STDOUT: %c3: %C = wrapper_binding c3, [concrete = ] // CHECK:STDOUT: // CHECK:STDOUT: %C.Op.bound.loc9: = bound_method %.loc9_31.3, constants.%C.Op // CHECK:STDOUT: %Op.ref.loc9: %C.cpp_destructor.type = name_ref Op, imports.%C.cpp_destructor.decl [concrete = constants.%C.cpp_destructor] @@ -2933,7 +2933,7 @@ fn F() { // CHECK:STDOUT: %O.ref.loc8_14: type = name_ref O, imports.%O.decl [concrete = constants.%O] // CHECK:STDOUT: %C.ref.loc8_16: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c1: %C = value_binding c1, %.loc8_31.4 +// CHECK:STDOUT: %c1: %C = wrapper_binding c1, %.loc8_31.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c2.patt: %pattern_type.aac = value_binding_pattern c2 [concrete = constants.%c2.patt] // CHECK:STDOUT: } @@ -2952,7 +2952,7 @@ fn F() { // CHECK:STDOUT: %O.ref.loc9_14: type = name_ref O, imports.%O.decl [concrete = constants.%O] // CHECK:STDOUT: %C.ref.loc9_16: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c2: %C = value_binding c2, %.loc9_31.4 +// CHECK:STDOUT: %c2: %C = wrapper_binding c2, %.loc9_31.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c3.patt: %pattern_type.aac = value_binding_pattern c3 [concrete = constants.%c3.patt] // CHECK:STDOUT: } @@ -2973,7 +2973,7 @@ fn F() { // CHECK:STDOUT: %O.ref.loc10: type = name_ref O, imports.%O.decl [concrete = constants.%O] // CHECK:STDOUT: %C.ref.loc10: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c3: %C = value_binding c3, %.loc10_31.4 +// CHECK:STDOUT: %c3: %C = wrapper_binding c3, %.loc10_31.4 // CHECK:STDOUT: // CHECK:STDOUT: %C.Op.bound.loc10: = bound_method %.loc10_31.3, constants.%C.Op // CHECK:STDOUT: %Op.ref.loc10: %C.cpp_destructor.type = name_ref Op, imports.%C.cpp_destructor.decl [concrete = constants.%C.cpp_destructor] @@ -3064,7 +3064,7 @@ fn F() { // CHECK:STDOUT: %O.ref.loc8_16: type = name_ref O, imports.%O.decl [concrete = constants.%O] // CHECK:STDOUT: %C.ref.loc8_18: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c1: %C = value_binding c1, %.loc8_35.4 +// CHECK:STDOUT: %c1: %C = wrapper_binding c1, %.loc8_35.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c2.patt: %pattern_type.f6e = value_binding_pattern c2 [concrete = constants.%c2.patt] // CHECK:STDOUT: } @@ -3085,7 +3085,7 @@ fn F() { // CHECK:STDOUT: %O.ref.loc9_16: type = name_ref O, imports.%O.decl [concrete = constants.%O] // CHECK:STDOUT: %C.ref.loc9_18: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c2: %C = value_binding c2, %.loc9_35.4 +// CHECK:STDOUT: %c2: %C = wrapper_binding c2, %.loc9_35.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c3.patt: %pattern_type.f6e = value_binding_pattern c3 [concrete = constants.%c3.patt] // CHECK:STDOUT: } @@ -3107,7 +3107,7 @@ fn F() { // CHECK:STDOUT: %O.ref.loc10: type = name_ref O, imports.%O.decl [concrete = constants.%O] // CHECK:STDOUT: %C.ref.loc10: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c3: %C = value_binding c3, %.loc10_33.4 +// CHECK:STDOUT: %c3: %C = wrapper_binding c3, %.loc10_33.4 // CHECK:STDOUT: // CHECK:STDOUT: %C.Op.bound.loc10: = bound_method %.loc10_33.3, constants.%C.Op // CHECK:STDOUT: %Op.ref.loc10: %C.cpp_destructor.type = name_ref Op, imports.%C.cpp_destructor.decl [concrete = constants.%C.cpp_destructor] @@ -3199,7 +3199,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc8_11: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc8_14: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c1: ref %C = ref_binding c1, %c1.var +// CHECK:STDOUT: %c1: ref %C = wrapper_binding c1, %c1.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c2.patt: %pattern_type.bbc = ref_binding_pattern c2 [concrete = constants.%c2.patt] // CHECK:STDOUT: %c2.var_patt: %pattern_type.bbc = var_pattern %c2.patt [concrete = constants.%c2.var_patt] @@ -3215,7 +3215,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc9: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc9: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c2: ref %C = ref_binding c2, %c2.var +// CHECK:STDOUT: %c2: ref %C = wrapper_binding c2, %c2.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c3.patt: %pattern_type.bbc = ref_binding_pattern c3 [concrete = constants.%c3.patt] // CHECK:STDOUT: %c3.var_patt: %pattern_type.bbc = var_pattern %c3.patt [concrete = constants.%c3.var_patt] @@ -3235,7 +3235,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc10: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc10: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c3: ref %C = ref_binding c3, %c3.var +// CHECK:STDOUT: %c3: ref %C = wrapper_binding c3, %c3.var // CHECK:STDOUT: // CHECK:STDOUT: %C.Op.bound.loc10: = bound_method %c3.var, constants.%C.Op // CHECK:STDOUT: %Op.ref.loc10: %C.cpp_destructor.type = name_ref Op, imports.%C.cpp_destructor.decl [concrete = constants.%C.cpp_destructor] @@ -3339,7 +3339,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc10: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc10: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c3: %C = value_binding c3, %.loc10_29.4 +// CHECK:STDOUT: %c3: %C = wrapper_binding c3, %.loc10_29.4 // CHECK:STDOUT: // CHECK:STDOUT: %C.Op.bound.loc10: = bound_method %.loc10_29.3, constants.%C.Op // CHECK:STDOUT: %Op.ref.loc10: %C.cpp_destructor.type = name_ref Op, imports.%C.cpp_destructor.decl [concrete = constants.%C.cpp_destructor] diff --git a/toolchain/check/testdata/interop/cpp/primitive_types/arithmetic.carbon b/toolchain/check/testdata/interop/cpp/primitive_types/arithmetic.carbon index f362a54974f7..f0210d0e2d46 100644 --- a/toolchain/check/testdata/interop/cpp/primitive_types/arithmetic.carbon +++ b/toolchain/check/testdata/interop/cpp/primitive_types/arithmetic.carbon @@ -289,13 +289,13 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %signed_char.ref: type = name_ref signed_char, %i8.2 [concrete = constants.%i8] // CHECK:STDOUT: } -// CHECK:STDOUT: %cpp_signed_char: %i8 = value_binding cpp_signed_char, %.loc8_45.2 +// CHECK:STDOUT: %cpp_signed_char: %i8 = wrapper_binding cpp_signed_char, %.loc8_45.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %carbon_signed_char.patt: %pattern_type.0cf = value_binding_pattern carbon_signed_char [concrete = constants.%carbon_signed_char.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %cpp_signed_char.ref: %i8 = name_ref cpp_signed_char, %cpp_signed_char // CHECK:STDOUT: %i8.loc9: type = type_literal constants.%i8 [concrete = constants.%i8] -// CHECK:STDOUT: %carbon_signed_char: %i8 = value_binding carbon_signed_char, %cpp_signed_char.ref +// CHECK:STDOUT: %carbon_signed_char: %i8 = wrapper_binding carbon_signed_char, %cpp_signed_char.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %cpp_short.patt: %pattern_type.203 = value_binding_pattern cpp_short [concrete = constants.%cpp_short.patt] // CHECK:STDOUT: } @@ -313,13 +313,13 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %short.ref: type = name_ref short, %i16.2 [concrete = constants.%i16] // CHECK:STDOUT: } -// CHECK:STDOUT: %cpp_short: %i16 = value_binding cpp_short, %.loc11_33.2 +// CHECK:STDOUT: %cpp_short: %i16 = wrapper_binding cpp_short, %.loc11_33.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %carbon_short.patt: %pattern_type.203 = value_binding_pattern carbon_short [concrete = constants.%carbon_short.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %cpp_short.ref: %i16 = name_ref cpp_short, %cpp_short // CHECK:STDOUT: %i16.loc12: type = type_literal constants.%i16 [concrete = constants.%i16] -// CHECK:STDOUT: %carbon_short: %i16 = value_binding carbon_short, %cpp_short.ref +// CHECK:STDOUT: %carbon_short: %i16 = wrapper_binding carbon_short, %cpp_short.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %cpp_int.patt: %pattern_type.6b6 = value_binding_pattern cpp_int [concrete = constants.%cpp_int.patt] // CHECK:STDOUT: } @@ -337,13 +337,13 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %int.ref: type = name_ref int, %i32.2 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %cpp_int: %i32 = value_binding cpp_int, %.loc14_29.2 +// CHECK:STDOUT: %cpp_int: %i32 = wrapper_binding cpp_int, %.loc14_29.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %carbon_int.patt: %pattern_type.6b6 = value_binding_pattern carbon_int [concrete = constants.%carbon_int.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %cpp_int.ref: %i32 = name_ref cpp_int, %cpp_int // CHECK:STDOUT: %i32.loc15: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %carbon_int: %i32 = value_binding carbon_int, %cpp_int.ref +// CHECK:STDOUT: %carbon_int: %i32 = wrapper_binding carbon_int, %cpp_int.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %cpp_unsigned_char.patt: %pattern_type.186 = value_binding_pattern cpp_unsigned_char [concrete = constants.%cpp_unsigned_char.patt] // CHECK:STDOUT: } @@ -361,13 +361,13 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %unsigned_char.ref: type = name_ref unsigned_char, %u8.2 [concrete = constants.%u8] // CHECK:STDOUT: } -// CHECK:STDOUT: %cpp_unsigned_char: %u8 = value_binding cpp_unsigned_char, %.loc17_49.2 +// CHECK:STDOUT: %cpp_unsigned_char: %u8 = wrapper_binding cpp_unsigned_char, %.loc17_49.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %carbon_unsigned_char.patt: %pattern_type.186 = value_binding_pattern carbon_unsigned_char [concrete = constants.%carbon_unsigned_char.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %cpp_unsigned_char.ref: %u8 = name_ref cpp_unsigned_char, %cpp_unsigned_char // CHECK:STDOUT: %u8.loc18: type = type_literal constants.%u8 [concrete = constants.%u8] -// CHECK:STDOUT: %carbon_unsigned_char: %u8 = value_binding carbon_unsigned_char, %cpp_unsigned_char.ref +// CHECK:STDOUT: %carbon_unsigned_char: %u8 = wrapper_binding carbon_unsigned_char, %cpp_unsigned_char.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %cpp_unsigned_short.patt: %pattern_type.17c = value_binding_pattern cpp_unsigned_short [concrete = constants.%cpp_unsigned_short.patt] // CHECK:STDOUT: } @@ -385,13 +385,13 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %unsigned_short.ref: type = name_ref unsigned_short, %u16.2 [concrete = constants.%u16] // CHECK:STDOUT: } -// CHECK:STDOUT: %cpp_unsigned_short: %u16 = value_binding cpp_unsigned_short, %.loc20_51.2 +// CHECK:STDOUT: %cpp_unsigned_short: %u16 = wrapper_binding cpp_unsigned_short, %.loc20_51.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %carbon_unsigned_short.patt: %pattern_type.17c = value_binding_pattern carbon_unsigned_short [concrete = constants.%carbon_unsigned_short.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %cpp_unsigned_short.ref: %u16 = name_ref cpp_unsigned_short, %cpp_unsigned_short // CHECK:STDOUT: %u16.loc21: type = type_literal constants.%u16 [concrete = constants.%u16] -// CHECK:STDOUT: %carbon_unsigned_short: %u16 = value_binding carbon_unsigned_short, %cpp_unsigned_short.ref +// CHECK:STDOUT: %carbon_unsigned_short: %u16 = wrapper_binding carbon_unsigned_short, %cpp_unsigned_short.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %cpp_unsigned_int.patt: %pattern_type.668 = value_binding_pattern cpp_unsigned_int [concrete = constants.%cpp_unsigned_int.patt] // CHECK:STDOUT: } @@ -409,13 +409,13 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %unsigned_int.ref: type = name_ref unsigned_int, %u32.2 [concrete = constants.%u32] // CHECK:STDOUT: } -// CHECK:STDOUT: %cpp_unsigned_int: %u32 = value_binding cpp_unsigned_int, %.loc23_47.2 +// CHECK:STDOUT: %cpp_unsigned_int: %u32 = wrapper_binding cpp_unsigned_int, %.loc23_47.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %carbon_unsigned_int.patt: %pattern_type.668 = value_binding_pattern carbon_unsigned_int [concrete = constants.%carbon_unsigned_int.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %cpp_unsigned_int.ref: %u32 = name_ref cpp_unsigned_int, %cpp_unsigned_int // CHECK:STDOUT: %u32.loc24: type = type_literal constants.%u32 [concrete = constants.%u32] -// CHECK:STDOUT: %carbon_unsigned_int: %u32 = value_binding carbon_unsigned_int, %cpp_unsigned_int.ref +// CHECK:STDOUT: %carbon_unsigned_int: %u32 = wrapper_binding carbon_unsigned_int, %cpp_unsigned_int.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %cpp_float.patt: %pattern_type.240 = value_binding_pattern cpp_float [concrete = constants.%cpp_float.patt] // CHECK:STDOUT: } @@ -433,13 +433,13 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %float.ref: type = name_ref float, %f32.2 [concrete = constants.%f32.c73] // CHECK:STDOUT: } -// CHECK:STDOUT: %cpp_float: %f32.c73 = value_binding cpp_float, %.loc26_35.2 +// CHECK:STDOUT: %cpp_float: %f32.c73 = wrapper_binding cpp_float, %.loc26_35.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %carbon_float.patt: %pattern_type.240 = value_binding_pattern carbon_float [concrete = constants.%carbon_float.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %cpp_float.ref: %f32.c73 = name_ref cpp_float, %cpp_float // CHECK:STDOUT: %f32.loc27: type = type_literal constants.%f32.c73 [concrete = constants.%f32.c73] -// CHECK:STDOUT: %carbon_float: %f32.c73 = value_binding carbon_float, %cpp_float.ref +// CHECK:STDOUT: %carbon_float: %f32.c73 = wrapper_binding carbon_float, %cpp_float.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %cpp_double.patt: %pattern_type.fb7 = value_binding_pattern cpp_double [concrete = constants.%cpp_double.patt] // CHECK:STDOUT: } @@ -457,13 +457,13 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: %double.ref: type = name_ref double, %f64.2 [concrete = constants.%f64.dc1] // CHECK:STDOUT: } -// CHECK:STDOUT: %cpp_double: %f64.dc1 = value_binding cpp_double, %.loc29_37.2 +// CHECK:STDOUT: %cpp_double: %f64.dc1 = wrapper_binding cpp_double, %.loc29_37.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %carbon_double.patt: %pattern_type.fb7 = value_binding_pattern carbon_double [concrete = constants.%carbon_double.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %cpp_double.ref: %f64.dc1 = name_ref cpp_double, %cpp_double // CHECK:STDOUT: %f64.loc30: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %carbon_double: %f64.dc1 = value_binding carbon_double, %cpp_double.ref +// CHECK:STDOUT: %carbon_double: %f64.dc1 = wrapper_binding carbon_double, %cpp_double.ref // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -511,13 +511,13 @@ fn F() { // CHECK:STDOUT: %.loc15_47.1: %f64.dc1 = value_of_initializer %Core.FloatLiteral.as.As.impl.Convert.call [concrete = constants.%float.3b9] // CHECK:STDOUT: %.loc15_47.2: %f64.dc1 = converted %float, %.loc15_47.1 [concrete = constants.%float.3b9] // CHECK:STDOUT: -// CHECK:STDOUT: %cpp_long_double: = value_binding cpp_long_double, [concrete = ] +// CHECK:STDOUT: %cpp_long_double: = wrapper_binding cpp_long_double, [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %carbon_long_double.patt: %pattern_type.fb7 = value_binding_pattern carbon_long_double [concrete = constants.%carbon_long_double.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %cpp_long_double.ref: = name_ref cpp_long_double, %cpp_long_double [concrete = ] // CHECK:STDOUT: %f64.loc16: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %carbon_long_double: %f64.dc1 = value_binding carbon_long_double, [concrete = ] +// CHECK:STDOUT: %carbon_long_double: %f64.dc1 = wrapper_binding carbon_long_double, [concrete = ] // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -587,7 +587,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %unsigned_int.ref.loc12: type = name_ref unsigned_int, imports.%unsigned_int.decl [concrete = constants.%unsigned_int] // CHECK:STDOUT: } -// CHECK:STDOUT: %unsigned_int: ref %unsigned_int = ref_binding unsigned_int, %unsigned_int.var +// CHECK:STDOUT: %unsigned_int: ref %unsigned_int = wrapper_binding unsigned_int, %unsigned_int.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %x.patt: %pattern_type.668 = value_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: } @@ -598,7 +598,7 @@ fn F() { // CHECK:STDOUT: %.loc13_40.1: %u32 = value_of_initializer %unsigned_int.foo.call // CHECK:STDOUT: %.loc13_40.2: %u32 = converted %unsigned_int.foo.call, %.loc13_40.1 // CHECK:STDOUT: %u32: type = type_literal constants.%u32 [concrete = constants.%u32] -// CHECK:STDOUT: %x: %u32 = value_binding x, %.loc13_40.2 +// CHECK:STDOUT: %x: %u32 = wrapper_binding x, %.loc13_40.2 // CHECK:STDOUT: %unsigned_int.cpp_destructor.bound: = bound_method %unsigned_int.var, constants.%unsigned_int.cpp_destructor // CHECK:STDOUT: %unsigned_int.cpp_destructor.call: init %empty_tuple.type = call %unsigned_int.cpp_destructor.bound(%unsigned_int.var) // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interop/cpp/primitive_types/long_and_long_long.llp64.carbon b/toolchain/check/testdata/interop/cpp/primitive_types/long_and_long_long.llp64.carbon index 674a8f96f79f..35f5e0b6dfac 100644 --- a/toolchain/check/testdata/interop/cpp/primitive_types/long_and_long_long.llp64.carbon +++ b/toolchain/check/testdata/interop/cpp/primitive_types/long_and_long_long.llp64.carbon @@ -796,13 +796,13 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: // CHECK:STDOUT: %long_long.ref.loc8: type = name_ref long_long, %i64.2 [concrete = constants.%i64] // CHECK:STDOUT: } -// CHECK:STDOUT: %cpp_long_long: %i64 = value_binding cpp_long_long, %.loc8_38.2 +// CHECK:STDOUT: %cpp_long_long: %i64 = wrapper_binding cpp_long_long, %.loc8_38.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %carbon_long_long.patt: %pattern_type.f57 = value_binding_pattern carbon_long_long [concrete = constants.%carbon_long_long.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %cpp_long_long.ref: %i64 = name_ref cpp_long_long, %cpp_long_long // CHECK:STDOUT: %i64.loc9: type = type_literal constants.%i64 [concrete = constants.%i64] -// CHECK:STDOUT: %carbon_long_long: %i64 = value_binding carbon_long_long, %cpp_long_long.ref +// CHECK:STDOUT: %carbon_long_long: %i64 = wrapper_binding carbon_long_long, %cpp_long_long.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %a.patt: %pattern_type.18b = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.18b = var_pattern %a.patt [concrete = constants.%a.var_patt] @@ -843,7 +843,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %.loc11_30.4: Core.IntLiteral = converted %.loc11_30.2, %.loc11_30.3 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %array_type: type = array_type %.loc11_30.4, %f32 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %array_type = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %array_type = wrapper_binding a, %a.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %a.var, constants.%Destroy.Op.1a2547.3 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%a.var) // CHECK:STDOUT: @@ -973,13 +973,13 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: // CHECK:STDOUT: %unsigned_long_long.ref.loc8: type = name_ref unsigned_long_long, %u64.2 [concrete = constants.%u64] // CHECK:STDOUT: } -// CHECK:STDOUT: %cpp_unsigned_long_long: %u64 = value_binding cpp_unsigned_long_long, %.loc8_56.2 +// CHECK:STDOUT: %cpp_unsigned_long_long: %u64 = wrapper_binding cpp_unsigned_long_long, %.loc8_56.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %carbon_unsigned_long_long.patt: %pattern_type.b35 = value_binding_pattern carbon_unsigned_long_long [concrete = constants.%carbon_unsigned_long_long.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %cpp_unsigned_long_long.ref: %u64 = name_ref cpp_unsigned_long_long, %cpp_unsigned_long_long // CHECK:STDOUT: %u64.loc9: type = type_literal constants.%u64 [concrete = constants.%u64] -// CHECK:STDOUT: %carbon_unsigned_long_long: %u64 = value_binding carbon_unsigned_long_long, %cpp_unsigned_long_long.ref +// CHECK:STDOUT: %carbon_unsigned_long_long: %u64 = wrapper_binding carbon_unsigned_long_long, %cpp_unsigned_long_long.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %a.patt: %pattern_type.18b = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.18b = var_pattern %a.patt [concrete = constants.%a.var_patt] @@ -1020,7 +1020,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %.loc11_30.4: Core.IntLiteral = converted %.loc11_30.2, %.loc11_30.3 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %array_type: type = array_type %.loc11_30.4, %f32 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %array_type = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %array_type = wrapper_binding a, %a.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %a.var, constants.%Destroy.Op.1a2547.3 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%a.var) // CHECK:STDOUT: @@ -1214,7 +1214,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref.loc15: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long.ref.loc15: type = name_ref long, constants.%Cpp.long [concrete = constants.%Cpp.long] // CHECK:STDOUT: } -// CHECK:STDOUT: %cpp_long: %Cpp.long = value_binding cpp_long, %.loc15_28.2 +// CHECK:STDOUT: %cpp_long: %Cpp.long = wrapper_binding cpp_long, %.loc15_28.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %cpp_long_result.patt: %pattern_type.142c0 = value_binding_pattern cpp_long_result [concrete = constants.%cpp_long_result.patt] // CHECK:STDOUT: } @@ -1231,7 +1231,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref.loc16_31: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %LongResult.ref.loc16: type = name_ref LongResult, imports.%LongResult.decl [concrete = constants.%LongResult] // CHECK:STDOUT: } -// CHECK:STDOUT: %cpp_long_result: %LongResult = value_binding cpp_long_result, %.loc16_69.4 +// CHECK:STDOUT: %cpp_long_result: %LongResult = wrapper_binding cpp_long_result, %.loc16_69.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %cpp_compat_long.patt: %pattern_type.25e = value_binding_pattern cpp_compat_long [concrete = constants.%cpp_compat_long.patt] // CHECK:STDOUT: } @@ -1241,7 +1241,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %CppCompat.ref: = name_ref CppCompat, imports.%CppCompat.f0dbf9.1 [concrete = imports.%CppCompat.f0dbf9.1] // CHECK:STDOUT: %Long32.ref: type = name_ref Long32, imports.%Core.Long32 [concrete = constants.%Cpp.long] // CHECK:STDOUT: } -// CHECK:STDOUT: %cpp_compat_long: %Cpp.long = value_binding cpp_compat_long, %cpp_long.ref.loc18 +// CHECK:STDOUT: %cpp_compat_long: %Cpp.long = wrapper_binding cpp_compat_long, %cpp_long.ref.loc18 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %cpp_compat_long_result.patt: %pattern_type.142c0 = value_binding_pattern cpp_compat_long_result [concrete = constants.%cpp_compat_long_result.patt] // CHECK:STDOUT: } @@ -1258,7 +1258,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref.loc19_38: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %LongResult.ref.loc19: type = name_ref LongResult, imports.%LongResult.decl [concrete = constants.%LongResult] // CHECK:STDOUT: } -// CHECK:STDOUT: %cpp_compat_long_result: %LongResult = value_binding cpp_compat_long_result, %.loc19_83.4 +// CHECK:STDOUT: %cpp_compat_long_result: %LongResult = wrapper_binding cpp_compat_long_result, %.loc19_83.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %carbon_i32.patt: %pattern_type.6b6 = value_binding_pattern carbon_i32 [concrete = constants.%carbon_i32.patt] // CHECK:STDOUT: } @@ -1267,7 +1267,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %.loc21_34.1: %i32 = as_compatible %cpp_long.ref.loc21 // CHECK:STDOUT: %.loc21_34.2: %i32 = converted %cpp_long.ref.loc21, %.loc21_34.1 // CHECK:STDOUT: %i32.loc21_19: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %carbon_i32: %i32 = value_binding carbon_i32, %.loc21_34.2 +// CHECK:STDOUT: %carbon_i32: %i32 = wrapper_binding carbon_i32, %.loc21_34.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %carbon_i32_result.patt: %pattern_type.596 = value_binding_pattern carbon_i32_result [concrete = constants.%carbon_i32_result.patt] // CHECK:STDOUT: } @@ -1284,7 +1284,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref.loc22_33: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %IntResult.ref: type = name_ref IntResult, imports.%IntResult.decl [concrete = constants.%IntResult] // CHECK:STDOUT: } -// CHECK:STDOUT: %carbon_i32_result: %IntResult = value_binding carbon_i32_result, %.loc22_72.4 +// CHECK:STDOUT: %carbon_i32_result: %IntResult = wrapper_binding carbon_i32_result, %.loc22_72.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %carbon_i64.patt: %pattern_type.f57 = value_binding_pattern carbon_i64 [concrete = constants.%carbon_i64.patt] // CHECK:STDOUT: } @@ -1295,7 +1295,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %.loc24_32.1: %i64 = value_of_initializer %Cpp.long.as.ImplicitAs.impl.Convert.call.loc24 // CHECK:STDOUT: %.loc24_32.2: %i64 = converted %cpp_long.ref.loc24, %.loc24_32.1 // CHECK:STDOUT: %i64: type = type_literal constants.%i64 [concrete = constants.%i64] -// CHECK:STDOUT: %carbon_i64: %i64 = value_binding carbon_i64, %.loc24_32.2 +// CHECK:STDOUT: %carbon_i64: %i64 = wrapper_binding carbon_i64, %.loc24_32.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %a.patt: %pattern_type.18b = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.18b = var_pattern %a.patt [concrete = constants.%a.var_patt] @@ -1332,7 +1332,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %.loc26_30.4: Core.IntLiteral = converted %.loc26_30.2, %.loc26_30.3 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %array_type: type = array_type %.loc26_30.4, %f32 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %array_type = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %array_type = wrapper_binding a, %a.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %a.var, constants.%Destroy.Op.1a2547.3 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%a.var) // CHECK:STDOUT: %IntResult.cpp_destructor.bound: = bound_method %.loc22_72.3, constants.%IntResult.cpp_destructor @@ -1418,7 +1418,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref.loc8: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long.ref.loc8: type = name_ref long, constants.%Cpp.long [concrete = constants.%Cpp.long] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %Cpp.long = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %Cpp.long = wrapper_binding a, %a.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.25e = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.25e = var_pattern %b.patt [concrete = constants.%b.var_patt] @@ -1434,7 +1434,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref.loc9: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long.ref.loc9: type = name_ref long, constants.%Cpp.long [concrete = constants.%Cpp.long] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: ref %Cpp.long = ref_binding b, %b.var +// CHECK:STDOUT: %b: ref %Cpp.long = wrapper_binding b, %b.var // CHECK:STDOUT: %Destroy.Op.bound.loc9: = bound_method %b.var, constants.%Destroy.Op.1a2547.3 // CHECK:STDOUT: %Destroy.Op.call.loc9: init %empty_tuple.type = call %Destroy.Op.bound.loc9(%b.var) // CHECK:STDOUT: %Destroy.Op.bound.loc8: = bound_method %a.var, constants.%Destroy.Op.1a2547.3 @@ -1535,7 +1535,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref.loc8: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long.ref.loc8: type = name_ref long, constants.%Cpp.long [concrete = constants.%Cpp.long] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %Cpp.long = value_binding a, %.loc8_21.2 +// CHECK:STDOUT: %a: %Cpp.long = wrapper_binding a, %.loc8_21.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.25e = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } @@ -1549,7 +1549,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref.loc9: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long.ref.loc9: type = name_ref long, constants.%Cpp.long [concrete = constants.%Cpp.long] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %Cpp.long = value_binding b, %.loc9_21.2 +// CHECK:STDOUT: %b: %Cpp.long = wrapper_binding b, %.loc9_21.2 // CHECK:STDOUT: %a.ref.loc10: %Cpp.long = name_ref a, %a // CHECK:STDOUT: %b.ref.loc10: %Cpp.long = name_ref b, %b // CHECK:STDOUT: %impl.elem0.loc10: %.b25 = impl_witness_access constants.%EqWith.impl_witness.cd4, element0 [concrete = constants.%Cpp.long.as.EqWith.impl.Equal.1ca] @@ -1783,7 +1783,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long.ref: type = name_ref long, constants.%Cpp.long [concrete = constants.%Cpp.long] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %Cpp.long = value_binding a, %.loc9_21.2 +// CHECK:STDOUT: %a: %Cpp.long = wrapper_binding a, %.loc9_21.2 // CHECK:STDOUT: %a.ref.loc10: %Cpp.long = name_ref a, %a // CHECK:STDOUT: %b.ref.loc10: %i32 = name_ref b, %b // CHECK:STDOUT: %impl.elem0.loc10_5: %.ad3 = impl_witness_access constants.%EqWith.impl_witness.f8a, element0 [concrete = constants.%Cpp.long.as.EqWith.impl.Equal.1a881e.2] @@ -2261,7 +2261,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long.ref: type = name_ref long, constants.%Cpp.long [concrete = constants.%Cpp.long] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %Cpp.long = value_binding a, %.loc9_21.2 +// CHECK:STDOUT: %a: %Cpp.long = wrapper_binding a, %.loc9_21.2 // CHECK:STDOUT: %b.ref.loc10: %i32 = name_ref b, %b // CHECK:STDOUT: %a.ref.loc10: %Cpp.long = name_ref a, %a // CHECK:STDOUT: %impl.elem0.loc10_5: %.a04 = impl_witness_access constants.%EqWith.impl_witness.95d, element0 [concrete = constants.%T.as_type.as.EqWith.impl.Equal.f0911b.2] @@ -2626,7 +2626,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref.loc8: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long.ref.loc8: type = name_ref long, constants.%Cpp.long [concrete = constants.%Cpp.long] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %Cpp.long = value_binding x, %.loc8_21.2 +// CHECK:STDOUT: %x: %Cpp.long = wrapper_binding x, %.loc8_21.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %y.patt: %pattern_type.25e = value_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: } @@ -2640,7 +2640,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref.loc9: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long.ref.loc9: type = name_ref long, constants.%Cpp.long [concrete = constants.%Cpp.long] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: %Cpp.long = value_binding y, %.loc9_21.2 +// CHECK:STDOUT: %y: %Cpp.long = wrapper_binding y, %.loc9_21.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %a.patt: %pattern_type.25e = value_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: } @@ -2654,7 +2654,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref.loc11: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long.ref.loc11: type = name_ref long, constants.%Cpp.long [concrete = constants.%Cpp.long] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %Cpp.long = value_binding a, %.loc11_28.2 +// CHECK:STDOUT: %a: %Cpp.long = wrapper_binding a, %.loc11_28.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.25e = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } @@ -2669,7 +2669,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref.loc12: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long.ref.loc12: type = name_ref long, constants.%Cpp.long [concrete = constants.%Cpp.long] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %Cpp.long = value_binding b, %.loc12_30.2 +// CHECK:STDOUT: %b: %Cpp.long = wrapper_binding b, %.loc12_30.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.25e = value_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: } @@ -2684,7 +2684,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref.loc13: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long.ref.loc13: type = name_ref long, constants.%Cpp.long [concrete = constants.%Cpp.long] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: %Cpp.long = value_binding c, %.loc13_30.2 +// CHECK:STDOUT: %c: %Cpp.long = wrapper_binding c, %.loc13_30.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.25e = value_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: } @@ -2699,7 +2699,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref.loc14: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long.ref.loc14: type = name_ref long, constants.%Cpp.long [concrete = constants.%Cpp.long] // CHECK:STDOUT: } -// CHECK:STDOUT: %d: %Cpp.long = value_binding d, %.loc14_30.2 +// CHECK:STDOUT: %d: %Cpp.long = wrapper_binding d, %.loc14_30.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %e.patt: %pattern_type.25e = value_binding_pattern e [concrete = constants.%e.patt] // CHECK:STDOUT: } @@ -2714,7 +2714,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref.loc15: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long.ref.loc15: type = name_ref long, constants.%Cpp.long [concrete = constants.%Cpp.long] // CHECK:STDOUT: } -// CHECK:STDOUT: %e: %Cpp.long = value_binding e, %.loc15_30.2 +// CHECK:STDOUT: %e: %Cpp.long = wrapper_binding e, %.loc15_30.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %f.patt: %pattern_type.25e = value_binding_pattern f [concrete = constants.%f.patt] // CHECK:STDOUT: } @@ -2729,7 +2729,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref.loc16: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long.ref.loc16: type = name_ref long, constants.%Cpp.long [concrete = constants.%Cpp.long] // CHECK:STDOUT: } -// CHECK:STDOUT: %f: %Cpp.long = value_binding f, %.loc16_30.2 +// CHECK:STDOUT: %f: %Cpp.long = wrapper_binding f, %.loc16_30.2 // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -2981,7 +2981,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref.loc8: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long.ref.loc8: type = name_ref long, constants.%Cpp.long [concrete = constants.%Cpp.long] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %Cpp.long = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %Cpp.long = wrapper_binding a, %a.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.25e = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.25e = var_pattern %b.patt [concrete = constants.%b.var_patt] @@ -2997,7 +2997,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref.loc9: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long.ref.loc9: type = name_ref long, constants.%Cpp.long [concrete = constants.%Cpp.long] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: ref %Cpp.long = ref_binding b, %b.var +// CHECK:STDOUT: %b: ref %Cpp.long = wrapper_binding b, %b.var // CHECK:STDOUT: %a.ref.loc11: ref %Cpp.long = name_ref a, %a // CHECK:STDOUT: %b.ref.loc11: ref %Cpp.long = name_ref b, %b // CHECK:STDOUT: %impl.elem0.loc11: %.705 = impl_witness_access constants.%AddAssignWith.impl_witness.515, element0 [concrete = constants.%Cpp.long.as.AddAssignWith.impl.Op.3976e1.2] @@ -3428,7 +3428,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long.ref: type = name_ref long, constants.%Cpp.long [concrete = constants.%Cpp.long] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %Cpp.long = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %Cpp.long = wrapper_binding a, %a.var // CHECK:STDOUT: %a.ref.loc10: ref %Cpp.long = name_ref a, %a // CHECK:STDOUT: %b.ref.loc10: %i32 = name_ref b, %b // CHECK:STDOUT: %impl.elem0.loc10_5: %.68d = impl_witness_access constants.%AddAssignWith.impl_witness.b48, element0 [concrete = constants.%Cpp.long.as.AddAssignWith.impl.Op.d3c936.2] @@ -3726,7 +3726,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long.ref: type = name_ref long, constants.%Cpp.long [concrete = constants.%Cpp.long] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %Cpp.long = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %Cpp.long = wrapper_binding a, %a.var // CHECK:STDOUT: %a.ref: ref %Cpp.long = name_ref a, %a // CHECK:STDOUT: %int_1.loc9: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc9_5: %.f86 = impl_witness_access constants.%AddAssignWith.impl_witness.e58, element0 [concrete = constants.%Cpp.long.as.AddAssignWith.impl.Op.2303e0.2] @@ -3861,7 +3861,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long.ref: type = name_ref long, constants.%Cpp.long [concrete = constants.%Cpp.long] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %Cpp.long = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %Cpp.long = wrapper_binding a, %a.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } @@ -3874,7 +3874,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %.loc9_16.1: %i32 = value_of_initializer %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc9 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %.loc9_16.2: %i32 = converted %int_1.loc9, %.loc9_16.1 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: %i32 = value_binding b, %.loc9_16.2 +// CHECK:STDOUT: %b: %i32 = wrapper_binding b, %.loc9_16.2 // CHECK:STDOUT: %a.ref: ref %Cpp.long = name_ref a, %a // CHECK:STDOUT: %b.ref: %i32 = name_ref b, %b // CHECK:STDOUT: %impl.elem0.loc10_5: %.68d = impl_witness_access constants.%AddAssignWith.impl_witness.b48, element0 [concrete = constants.%Cpp.long.as.AddAssignWith.impl.Op.d3c936.2] @@ -3982,7 +3982,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long.ref: type = name_ref long, constants.%Cpp.long [concrete = constants.%Cpp.long] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %Cpp.long = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %Cpp.long = wrapper_binding a, %a.var // CHECK:STDOUT: %a.ref.loc9: ref %Cpp.long = name_ref a, %a // CHECK:STDOUT: %impl.elem0.loc9: %.466 = impl_witness_access constants.%Inc.impl_witness, element0 [concrete = constants.%Cpp.long.as.Inc.impl.Op] // CHECK:STDOUT: %bound_method.loc9: = bound_method %a.ref.loc9, %impl.elem0.loc9 @@ -4187,7 +4187,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref.loc15: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %unsigned_long.ref.loc15: type = name_ref unsigned_long, constants.%Cpp.unsigned_long [concrete = constants.%Cpp.unsigned_long] // CHECK:STDOUT: } -// CHECK:STDOUT: %cpp_unsigned_long: %Cpp.unsigned_long = value_binding cpp_unsigned_long, %.loc15_46.2 +// CHECK:STDOUT: %cpp_unsigned_long: %Cpp.unsigned_long = wrapper_binding cpp_unsigned_long, %.loc15_46.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %cpp_unsigned_long_result.patt: %pattern_type.f8a = value_binding_pattern cpp_unsigned_long_result [concrete = constants.%cpp_unsigned_long_result.patt] // CHECK:STDOUT: } @@ -4204,7 +4204,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref.loc16_40: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %ULongResult.ref.loc16: type = name_ref ULongResult, imports.%ULongResult.decl [concrete = constants.%ULongResult] // CHECK:STDOUT: } -// CHECK:STDOUT: %cpp_unsigned_long_result: %ULongResult = value_binding cpp_unsigned_long_result, %.loc16_89.4 +// CHECK:STDOUT: %cpp_unsigned_long_result: %ULongResult = wrapper_binding cpp_unsigned_long_result, %.loc16_89.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %cpp_compat_ulong.patt: %pattern_type.1a0 = value_binding_pattern cpp_compat_ulong [concrete = constants.%cpp_compat_ulong.patt] // CHECK:STDOUT: } @@ -4214,7 +4214,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %CppCompat.ref: = name_ref CppCompat, imports.%CppCompat.f0dbf9.1 [concrete = imports.%CppCompat.f0dbf9.1] // CHECK:STDOUT: %ULong32.ref: type = name_ref ULong32, imports.%Core.ULong32 [concrete = constants.%Cpp.unsigned_long] // CHECK:STDOUT: } -// CHECK:STDOUT: %cpp_compat_ulong: %Cpp.unsigned_long = value_binding cpp_compat_ulong, %cpp_unsigned_long.ref.loc18 +// CHECK:STDOUT: %cpp_compat_ulong: %Cpp.unsigned_long = wrapper_binding cpp_compat_ulong, %cpp_unsigned_long.ref.loc18 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %cpp_compat_ulong_result.patt: %pattern_type.f8a = value_binding_pattern cpp_compat_ulong_result [concrete = constants.%cpp_compat_ulong_result.patt] // CHECK:STDOUT: } @@ -4231,7 +4231,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref.loc19_39: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %ULongResult.ref.loc19: type = name_ref ULongResult, imports.%ULongResult.decl [concrete = constants.%ULongResult] // CHECK:STDOUT: } -// CHECK:STDOUT: %cpp_compat_ulong_result: %ULongResult = value_binding cpp_compat_ulong_result, %.loc19_87.4 +// CHECK:STDOUT: %cpp_compat_ulong_result: %ULongResult = wrapper_binding cpp_compat_ulong_result, %.loc19_87.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %carbon_u32.patt: %pattern_type.668 = value_binding_pattern carbon_u32 [concrete = constants.%carbon_u32.patt] // CHECK:STDOUT: } @@ -4244,7 +4244,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %.loc21_25.1: %u32 = value_of_initializer %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc21 [concrete = constants.%int_1.92d] // CHECK:STDOUT: %.loc21_25.2: %u32 = converted %int_1.loc21, %.loc21_25.1 [concrete = constants.%int_1.92d] // CHECK:STDOUT: %u32: type = type_literal constants.%u32 [concrete = constants.%u32] -// CHECK:STDOUT: %carbon_u32: %u32 = value_binding carbon_u32, %.loc21_25.2 +// CHECK:STDOUT: %carbon_u32: %u32 = wrapper_binding carbon_u32, %.loc21_25.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %carbon_u32_result.patt: %pattern_type.116 = value_binding_pattern carbon_u32_result [concrete = constants.%carbon_u32_result.patt] // CHECK:STDOUT: } @@ -4261,7 +4261,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref.loc22_33: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %UIntResult.ref: type = name_ref UIntResult, imports.%UIntResult.decl [concrete = constants.%UIntResult] // CHECK:STDOUT: } -// CHECK:STDOUT: %carbon_u32_result: %UIntResult = value_binding carbon_u32_result, %.loc22_74.4 +// CHECK:STDOUT: %carbon_u32_result: %UIntResult = wrapper_binding carbon_u32_result, %.loc22_74.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %a.patt: %pattern_type.18b = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.18b = var_pattern %a.patt [concrete = constants.%a.var_patt] @@ -4298,7 +4298,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %.loc24_30.4: Core.IntLiteral = converted %.loc24_30.2, %.loc24_30.3 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %array_type: type = array_type %.loc24_30.4, %f32 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %array_type = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %array_type = wrapper_binding a, %a.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %a.var, constants.%Destroy.Op.1a2547.3 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%a.var) // CHECK:STDOUT: %UIntResult.cpp_destructor.bound: = bound_method %.loc22_74.3, constants.%UIntResult.cpp_destructor @@ -4384,7 +4384,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref.loc8: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %unsigned_long.ref.loc8: type = name_ref unsigned_long, constants.%Cpp.unsigned_long [concrete = constants.%Cpp.unsigned_long] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %Cpp.unsigned_long = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %Cpp.unsigned_long = wrapper_binding a, %a.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.1a0 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.1a0 = var_pattern %b.patt [concrete = constants.%b.var_patt] @@ -4400,7 +4400,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Cpp.ref.loc9: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %unsigned_long.ref.loc9: type = name_ref unsigned_long, constants.%Cpp.unsigned_long [concrete = constants.%Cpp.unsigned_long] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: ref %Cpp.unsigned_long = ref_binding b, %b.var +// CHECK:STDOUT: %b: ref %Cpp.unsigned_long = wrapper_binding b, %b.var // CHECK:STDOUT: %Destroy.Op.bound.loc9: = bound_method %b.var, constants.%Destroy.Op.1a2547.3 // CHECK:STDOUT: %Destroy.Op.call.loc9: init %empty_tuple.type = call %Destroy.Op.bound.loc9(%b.var) // CHECK:STDOUT: %Destroy.Op.bound.loc8: = bound_method %a.var, constants.%Destroy.Op.1a2547.3 diff --git a/toolchain/check/testdata/interop/cpp/primitive_types/long_and_long_long.lp64.carbon b/toolchain/check/testdata/interop/cpp/primitive_types/long_and_long_long.lp64.carbon index ecc05bf40919..76de422f582a 100644 --- a/toolchain/check/testdata/interop/cpp/primitive_types/long_and_long_long.lp64.carbon +++ b/toolchain/check/testdata/interop/cpp/primitive_types/long_and_long_long.lp64.carbon @@ -744,13 +744,13 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: // CHECK:STDOUT: %long.ref.loc8: type = name_ref long, %i64.2 [concrete = constants.%i64] // CHECK:STDOUT: } -// CHECK:STDOUT: %cpp_long: %i64 = value_binding cpp_long, %.loc8_28.2 +// CHECK:STDOUT: %cpp_long: %i64 = wrapper_binding cpp_long, %.loc8_28.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %carbon_long.patt: %pattern_type.f57 = value_binding_pattern carbon_long [concrete = constants.%carbon_long.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %cpp_long.ref: %i64 = name_ref cpp_long, %cpp_long // CHECK:STDOUT: %i64.loc9: type = type_literal constants.%i64 [concrete = constants.%i64] -// CHECK:STDOUT: %carbon_long: %i64 = value_binding carbon_long, %cpp_long.ref +// CHECK:STDOUT: %carbon_long: %i64 = wrapper_binding carbon_long, %cpp_long.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %a.patt: %pattern_type.18b = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.18b = var_pattern %a.patt [concrete = constants.%a.var_patt] @@ -791,7 +791,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %.loc11_30.4: Core.IntLiteral = converted %.loc11_30.2, %.loc11_30.3 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %array_type: type = array_type %.loc11_30.4, %f32 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %array_type = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %array_type = wrapper_binding a, %a.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %a.var, constants.%Destroy.Op.1a2547.3 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%a.var) // CHECK:STDOUT: @@ -921,13 +921,13 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: // CHECK:STDOUT: %unsigned_long.ref.loc8: type = name_ref unsigned_long, %u64.2 [concrete = constants.%u64] // CHECK:STDOUT: } -// CHECK:STDOUT: %cpp_unsigned_long: %u64 = value_binding cpp_unsigned_long, %.loc8_46.2 +// CHECK:STDOUT: %cpp_unsigned_long: %u64 = wrapper_binding cpp_unsigned_long, %.loc8_46.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %carbon_unsigned_long.patt: %pattern_type.b35 = value_binding_pattern carbon_unsigned_long [concrete = constants.%carbon_unsigned_long.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %cpp_unsigned_long.ref: %u64 = name_ref cpp_unsigned_long, %cpp_unsigned_long // CHECK:STDOUT: %u64.loc9: type = type_literal constants.%u64 [concrete = constants.%u64] -// CHECK:STDOUT: %carbon_unsigned_long: %u64 = value_binding carbon_unsigned_long, %cpp_unsigned_long.ref +// CHECK:STDOUT: %carbon_unsigned_long: %u64 = wrapper_binding carbon_unsigned_long, %cpp_unsigned_long.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %a.patt: %pattern_type.18b = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.18b = var_pattern %a.patt [concrete = constants.%a.var_patt] @@ -968,7 +968,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %.loc11_30.4: Core.IntLiteral = converted %.loc11_30.2, %.loc11_30.3 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %array_type: type = array_type %.loc11_30.4, %f32 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %array_type = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %array_type = wrapper_binding a, %a.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %a.var, constants.%Destroy.Op.1a2547.3 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%a.var) // CHECK:STDOUT: @@ -1150,7 +1150,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %Cpp.ref.loc15: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long_long.ref.loc15: type = name_ref long_long, constants.%Cpp.long_long [concrete = constants.%Cpp.long_long] // CHECK:STDOUT: } -// CHECK:STDOUT: %cpp_long_long: %Cpp.long_long = value_binding cpp_long_long, %.loc15_38.2 +// CHECK:STDOUT: %cpp_long_long: %Cpp.long_long = wrapper_binding cpp_long_long, %.loc15_38.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %cpp_long_long_result.patt: %pattern_type.357 = value_binding_pattern cpp_long_long_result [concrete = constants.%cpp_long_long_result.patt] // CHECK:STDOUT: } @@ -1167,7 +1167,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %Cpp.ref.loc16_36: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %LongLongResult.ref.loc16: type = name_ref LongLongResult, imports.%LongLongResult.decl [concrete = constants.%LongLongResult] // CHECK:STDOUT: } -// CHECK:STDOUT: %cpp_long_long_result: %LongLongResult = value_binding cpp_long_long_result, %.loc16_87.4 +// CHECK:STDOUT: %cpp_long_long_result: %LongLongResult = wrapper_binding cpp_long_long_result, %.loc16_87.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %cpp_compat_long_long.patt: %pattern_type.d58 = value_binding_pattern cpp_compat_long_long [concrete = constants.%cpp_compat_long_long.patt] // CHECK:STDOUT: } @@ -1177,7 +1177,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %CppCompat.ref: = name_ref CppCompat, imports.%CppCompat.f0dbf9.1 [concrete = imports.%CppCompat.f0dbf9.1] // CHECK:STDOUT: %LongLong64.ref: type = name_ref LongLong64, imports.%Core.LongLong64 [concrete = constants.%Cpp.long_long] // CHECK:STDOUT: } -// CHECK:STDOUT: %cpp_compat_long_long: %Cpp.long_long = value_binding cpp_compat_long_long, %cpp_long_long.ref.loc18 +// CHECK:STDOUT: %cpp_compat_long_long: %Cpp.long_long = wrapper_binding cpp_compat_long_long, %cpp_long_long.ref.loc18 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %cpp_compat_long_long_result.patt: %pattern_type.357 = value_binding_pattern cpp_compat_long_long_result [concrete = constants.%cpp_compat_long_long_result.patt] // CHECK:STDOUT: } @@ -1194,7 +1194,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %Cpp.ref.loc19_43: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %LongLongResult.ref.loc19: type = name_ref LongLongResult, imports.%LongLongResult.decl [concrete = constants.%LongLongResult] // CHECK:STDOUT: } -// CHECK:STDOUT: %cpp_compat_long_long_result: %LongLongResult = value_binding cpp_compat_long_long_result, %.loc19_101.4 +// CHECK:STDOUT: %cpp_compat_long_long_result: %LongLongResult = wrapper_binding cpp_compat_long_long_result, %.loc19_101.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %carbon_i64.patt: %pattern_type.f57 = value_binding_pattern carbon_i64 [concrete = constants.%carbon_i64.patt] // CHECK:STDOUT: } @@ -1203,7 +1203,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %.loc21_39.1: %i64 = as_compatible %cpp_long_long.ref.loc21 // CHECK:STDOUT: %.loc21_39.2: %i64 = converted %cpp_long_long.ref.loc21, %.loc21_39.1 // CHECK:STDOUT: %i64.loc21_19: type = type_literal constants.%i64 [concrete = constants.%i64] -// CHECK:STDOUT: %carbon_i64: %i64 = value_binding carbon_i64, %.loc21_39.2 +// CHECK:STDOUT: %carbon_i64: %i64 = wrapper_binding carbon_i64, %.loc21_39.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %carbon_i64_result.patt: %pattern_type.ae7 = value_binding_pattern carbon_i64_result [concrete = constants.%carbon_i64_result.patt] // CHECK:STDOUT: } @@ -1220,7 +1220,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %Cpp.ref.loc22_33: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %LongResult.ref: type = name_ref LongResult, imports.%LongResult.decl [concrete = constants.%LongResult] // CHECK:STDOUT: } -// CHECK:STDOUT: %carbon_i64_result: %LongResult = value_binding carbon_i64_result, %.loc22_77.4 +// CHECK:STDOUT: %carbon_i64_result: %LongResult = wrapper_binding carbon_i64_result, %.loc22_77.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %a.patt: %pattern_type.18b = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.18b = var_pattern %a.patt [concrete = constants.%a.var_patt] @@ -1257,7 +1257,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %.loc24_30.4: Core.IntLiteral = converted %.loc24_30.2, %.loc24_30.3 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %array_type: type = array_type %.loc24_30.4, %f32 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %array_type = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %array_type = wrapper_binding a, %a.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %a.var, constants.%Destroy.Op.1a2547.3 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%a.var) // CHECK:STDOUT: %LongResult.cpp_destructor.bound: = bound_method %.loc22_77.3, constants.%LongResult.cpp_destructor @@ -1343,7 +1343,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %Cpp.ref.loc8: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long_long.ref.loc8: type = name_ref long_long, constants.%Cpp.long_long [concrete = constants.%Cpp.long_long] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %Cpp.long_long = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %Cpp.long_long = wrapper_binding a, %a.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.d58 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.d58 = var_pattern %b.patt [concrete = constants.%b.var_patt] @@ -1359,7 +1359,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %Cpp.ref.loc9: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long_long.ref.loc9: type = name_ref long_long, constants.%Cpp.long_long [concrete = constants.%Cpp.long_long] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: ref %Cpp.long_long = ref_binding b, %b.var +// CHECK:STDOUT: %b: ref %Cpp.long_long = wrapper_binding b, %b.var // CHECK:STDOUT: %Destroy.Op.bound.loc9: = bound_method %b.var, constants.%Destroy.Op.1a2547.3 // CHECK:STDOUT: %Destroy.Op.call.loc9: init %empty_tuple.type = call %Destroy.Op.bound.loc9(%b.var) // CHECK:STDOUT: %Destroy.Op.bound.loc8: = bound_method %a.var, constants.%Destroy.Op.1a2547.3 @@ -1460,7 +1460,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %Cpp.ref.loc8: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long_long.ref.loc8: type = name_ref long_long, constants.%Cpp.long_long [concrete = constants.%Cpp.long_long] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %Cpp.long_long = value_binding a, %.loc8_26.2 +// CHECK:STDOUT: %a: %Cpp.long_long = wrapper_binding a, %.loc8_26.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.d58 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } @@ -1474,7 +1474,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %Cpp.ref.loc9: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long_long.ref.loc9: type = name_ref long_long, constants.%Cpp.long_long [concrete = constants.%Cpp.long_long] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %Cpp.long_long = value_binding b, %.loc9_26.2 +// CHECK:STDOUT: %b: %Cpp.long_long = wrapper_binding b, %.loc9_26.2 // CHECK:STDOUT: %a.ref.loc10: %Cpp.long_long = name_ref a, %a // CHECK:STDOUT: %b.ref.loc10: %Cpp.long_long = name_ref b, %b // CHECK:STDOUT: %impl.elem0.loc10: %.ac4 = impl_witness_access constants.%EqWith.impl_witness.77a, element0 [concrete = constants.%Cpp.long_long.as.EqWith.impl.Equal.1ca] @@ -1708,7 +1708,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %Cpp.ref: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long_long.ref: type = name_ref long_long, constants.%Cpp.long_long [concrete = constants.%Cpp.long_long] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %Cpp.long_long = value_binding a, %.loc9_26.2 +// CHECK:STDOUT: %a: %Cpp.long_long = wrapper_binding a, %.loc9_26.2 // CHECK:STDOUT: %a.ref.loc10: %Cpp.long_long = name_ref a, %a // CHECK:STDOUT: %b.ref.loc10: %i64 = name_ref b, %b // CHECK:STDOUT: %impl.elem0.loc10_5: %.5d2 = impl_witness_access constants.%EqWith.impl_witness.621, element0 [concrete = constants.%Cpp.long_long.as.EqWith.impl.Equal.01ccf4.2] @@ -2186,7 +2186,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %Cpp.ref: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long_long.ref: type = name_ref long_long, constants.%Cpp.long_long [concrete = constants.%Cpp.long_long] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %Cpp.long_long = value_binding a, %.loc9_26.2 +// CHECK:STDOUT: %a: %Cpp.long_long = wrapper_binding a, %.loc9_26.2 // CHECK:STDOUT: %b.ref.loc10: %i64 = name_ref b, %b // CHECK:STDOUT: %a.ref.loc10: %Cpp.long_long = name_ref a, %a // CHECK:STDOUT: %impl.elem0.loc10_5: %.183 = impl_witness_access constants.%EqWith.impl_witness.084, element0 [concrete = constants.%T.as_type.as.EqWith.impl.Equal.817082.2] @@ -2690,7 +2690,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %Cpp.ref.loc8: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long_long.ref.loc8: type = name_ref long_long, constants.%Cpp.long_long [concrete = constants.%Cpp.long_long] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %Cpp.long_long = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %Cpp.long_long = wrapper_binding a, %a.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.d58 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.d58 = var_pattern %b.patt [concrete = constants.%b.var_patt] @@ -2706,7 +2706,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %Cpp.ref.loc9: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long_long.ref.loc9: type = name_ref long_long, constants.%Cpp.long_long [concrete = constants.%Cpp.long_long] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: ref %Cpp.long_long = ref_binding b, %b.var +// CHECK:STDOUT: %b: ref %Cpp.long_long = wrapper_binding b, %b.var // CHECK:STDOUT: %a.ref.loc11: ref %Cpp.long_long = name_ref a, %a // CHECK:STDOUT: %b.ref.loc11: ref %Cpp.long_long = name_ref b, %b // CHECK:STDOUT: %impl.elem0.loc11: %.a99 = impl_witness_access constants.%AddAssignWith.impl_witness.82d, element0 [concrete = constants.%Cpp.long_long.as.AddAssignWith.impl.Op.57b7c2.2] @@ -3137,7 +3137,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %Cpp.ref: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long_long.ref: type = name_ref long_long, constants.%Cpp.long_long [concrete = constants.%Cpp.long_long] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %Cpp.long_long = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %Cpp.long_long = wrapper_binding a, %a.var // CHECK:STDOUT: %a.ref.loc10: ref %Cpp.long_long = name_ref a, %a // CHECK:STDOUT: %b.ref.loc10: %i64 = name_ref b, %b // CHECK:STDOUT: %impl.elem0.loc10_5: %.4c9 = impl_witness_access constants.%AddAssignWith.impl_witness.610, element0 [concrete = constants.%Cpp.long_long.as.AddAssignWith.impl.Op.0167bf.2] @@ -3435,7 +3435,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %Cpp.ref: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long_long.ref: type = name_ref long_long, constants.%Cpp.long_long [concrete = constants.%Cpp.long_long] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %Cpp.long_long = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %Cpp.long_long = wrapper_binding a, %a.var // CHECK:STDOUT: %a.ref: ref %Cpp.long_long = name_ref a, %a // CHECK:STDOUT: %int_1.loc9: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc9_5: %.eab = impl_witness_access constants.%AddAssignWith.impl_witness.b05, element0 [concrete = constants.%Cpp.long_long.as.AddAssignWith.impl.Op.7e3843.2] @@ -3570,7 +3570,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %Cpp.ref: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long_long.ref: type = name_ref long_long, constants.%Cpp.long_long [concrete = constants.%Cpp.long_long] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %Cpp.long_long = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %Cpp.long_long = wrapper_binding a, %a.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.f57 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } @@ -3583,7 +3583,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %.loc9_16.1: %i64 = value_of_initializer %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc9 [concrete = constants.%int_1.d98] // CHECK:STDOUT: %.loc9_16.2: %i64 = converted %int_1.loc9, %.loc9_16.1 [concrete = constants.%int_1.d98] // CHECK:STDOUT: %i64: type = type_literal constants.%i64 [concrete = constants.%i64] -// CHECK:STDOUT: %b: %i64 = value_binding b, %.loc9_16.2 +// CHECK:STDOUT: %b: %i64 = wrapper_binding b, %.loc9_16.2 // CHECK:STDOUT: %a.ref: ref %Cpp.long_long = name_ref a, %a // CHECK:STDOUT: %b.ref: %i64 = name_ref b, %b // CHECK:STDOUT: %impl.elem0.loc10_5: %.4c9 = impl_witness_access constants.%AddAssignWith.impl_witness.610, element0 [concrete = constants.%Cpp.long_long.as.AddAssignWith.impl.Op.0167bf.2] @@ -3691,7 +3691,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %Cpp.ref: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %long_long.ref: type = name_ref long_long, constants.%Cpp.long_long [concrete = constants.%Cpp.long_long] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %Cpp.long_long = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %Cpp.long_long = wrapper_binding a, %a.var // CHECK:STDOUT: %a.ref.loc9: ref %Cpp.long_long = name_ref a, %a // CHECK:STDOUT: %impl.elem0.loc9: %.ac5 = impl_witness_access constants.%Inc.impl_witness, element0 [concrete = constants.%Cpp.long_long.as.Inc.impl.Op] // CHECK:STDOUT: %bound_method.loc9: = bound_method %a.ref.loc9, %impl.elem0.loc9 @@ -3897,7 +3897,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %Cpp.ref.loc15: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %unsigned_long_long.ref.loc15: type = name_ref unsigned_long_long, constants.%Cpp.unsigned_long_long [concrete = constants.%Cpp.unsigned_long_long] // CHECK:STDOUT: } -// CHECK:STDOUT: %cpp_unsigned_long_long: %Cpp.unsigned_long_long = value_binding cpp_unsigned_long_long, %.loc15_56.2 +// CHECK:STDOUT: %cpp_unsigned_long_long: %Cpp.unsigned_long_long = wrapper_binding cpp_unsigned_long_long, %.loc15_56.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %cpp_unsigned_long_long_result.patt: %pattern_type.97e = value_binding_pattern cpp_unsigned_long_long_result [concrete = constants.%cpp_unsigned_long_long_result.patt] // CHECK:STDOUT: } @@ -3914,7 +3914,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %Cpp.ref.loc16_45: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %ULongLongResult.ref.loc16: type = name_ref ULongLongResult, imports.%ULongLongResult.decl [concrete = constants.%ULongLongResult] // CHECK:STDOUT: } -// CHECK:STDOUT: %cpp_unsigned_long_long_result: %ULongLongResult = value_binding cpp_unsigned_long_long_result, %.loc16_107.4 +// CHECK:STDOUT: %cpp_unsigned_long_long_result: %ULongLongResult = wrapper_binding cpp_unsigned_long_long_result, %.loc16_107.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %cpp_compat_ulong_long.patt: %pattern_type.4cd = value_binding_pattern cpp_compat_ulong_long [concrete = constants.%cpp_compat_ulong_long.patt] // CHECK:STDOUT: } @@ -3924,7 +3924,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %CppCompat.ref: = name_ref CppCompat, imports.%CppCompat.f0dbf9.1 [concrete = imports.%CppCompat.f0dbf9.1] // CHECK:STDOUT: %ULongLong64.ref: type = name_ref ULongLong64, imports.%Core.ULongLong64 [concrete = constants.%Cpp.unsigned_long_long] // CHECK:STDOUT: } -// CHECK:STDOUT: %cpp_compat_ulong_long: %Cpp.unsigned_long_long = value_binding cpp_compat_ulong_long, %cpp_unsigned_long_long.ref.loc18 +// CHECK:STDOUT: %cpp_compat_ulong_long: %Cpp.unsigned_long_long = wrapper_binding cpp_compat_ulong_long, %cpp_unsigned_long_long.ref.loc18 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %cpp_compat_ulong_long_result.patt: %pattern_type.97e = value_binding_pattern cpp_compat_ulong_long_result [concrete = constants.%cpp_compat_ulong_long_result.patt] // CHECK:STDOUT: } @@ -3941,7 +3941,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %Cpp.ref.loc19_44: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %ULongLongResult.ref.loc19: type = name_ref ULongLongResult, imports.%ULongLongResult.decl [concrete = constants.%ULongLongResult] // CHECK:STDOUT: } -// CHECK:STDOUT: %cpp_compat_ulong_long_result: %ULongLongResult = value_binding cpp_compat_ulong_long_result, %.loc19_105.4 +// CHECK:STDOUT: %cpp_compat_ulong_long_result: %ULongLongResult = wrapper_binding cpp_compat_ulong_long_result, %.loc19_105.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %carbon_u64.patt: %pattern_type.b35 = value_binding_pattern carbon_u64 [concrete = constants.%carbon_u64.patt] // CHECK:STDOUT: } @@ -3954,7 +3954,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %.loc21_25.1: %u64 = value_of_initializer %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc21 [concrete = constants.%int_1.01f] // CHECK:STDOUT: %.loc21_25.2: %u64 = converted %int_1.loc21, %.loc21_25.1 [concrete = constants.%int_1.01f] // CHECK:STDOUT: %u64: type = type_literal constants.%u64 [concrete = constants.%u64] -// CHECK:STDOUT: %carbon_u64: %u64 = value_binding carbon_u64, %.loc21_25.2 +// CHECK:STDOUT: %carbon_u64: %u64 = wrapper_binding carbon_u64, %.loc21_25.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %carbon_u64_result.patt: %pattern_type.97f = value_binding_pattern carbon_u64_result [concrete = constants.%carbon_u64_result.patt] // CHECK:STDOUT: } @@ -3971,7 +3971,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %Cpp.ref.loc22_33: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %ULongResult.ref: type = name_ref ULongResult, imports.%ULongResult.decl [concrete = constants.%ULongResult] // CHECK:STDOUT: } -// CHECK:STDOUT: %carbon_u64_result: %ULongResult = value_binding carbon_u64_result, %.loc22_79.4 +// CHECK:STDOUT: %carbon_u64_result: %ULongResult = wrapper_binding carbon_u64_result, %.loc22_79.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %a.patt: %pattern_type.18b = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.18b = var_pattern %a.patt [concrete = constants.%a.var_patt] @@ -4008,7 +4008,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %.loc24_30.4: Core.IntLiteral = converted %.loc24_30.2, %.loc24_30.3 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %array_type: type = array_type %.loc24_30.4, %f32 [concrete = constants.%array_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %array_type = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %array_type = wrapper_binding a, %a.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %a.var, constants.%Destroy.Op.1a2547.3 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%a.var) // CHECK:STDOUT: %ULongResult.cpp_destructor.bound: = bound_method %.loc22_79.3, constants.%ULongResult.cpp_destructor @@ -4094,7 +4094,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %Cpp.ref.loc8: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %unsigned_long_long.ref.loc8: type = name_ref unsigned_long_long, constants.%Cpp.unsigned_long_long [concrete = constants.%Cpp.unsigned_long_long] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %Cpp.unsigned_long_long = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %Cpp.unsigned_long_long = wrapper_binding a, %a.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.4cd = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.4cd = var_pattern %b.patt [concrete = constants.%b.var_patt] @@ -4110,7 +4110,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %Cpp.ref.loc9: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %unsigned_long_long.ref.loc9: type = name_ref unsigned_long_long, constants.%Cpp.unsigned_long_long [concrete = constants.%Cpp.unsigned_long_long] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: ref %Cpp.unsigned_long_long = ref_binding b, %b.var +// CHECK:STDOUT: %b: ref %Cpp.unsigned_long_long = wrapper_binding b, %b.var // CHECK:STDOUT: %Destroy.Op.bound.loc9: = bound_method %b.var, constants.%Destroy.Op.1a2547.3 // CHECK:STDOUT: %Destroy.Op.call.loc9: init %empty_tuple.type = call %Destroy.Op.bound.loc9(%b.var) // CHECK:STDOUT: %Destroy.Op.bound.loc8: = bound_method %a.var, constants.%Destroy.Op.1a2547.3 diff --git a/toolchain/check/testdata/interop/cpp/primitive_types/void_pointer.carbon b/toolchain/check/testdata/interop/cpp/primitive_types/void_pointer.carbon index 1842c1a29b59..4a5680f18dae 100644 --- a/toolchain/check/testdata/interop/cpp/primitive_types/void_pointer.carbon +++ b/toolchain/check/testdata/interop/cpp/primitive_types/void_pointer.carbon @@ -187,7 +187,7 @@ fn F(input: Cpp.void*) { // CHECK:STDOUT: %void.ref: type = name_ref void, constants.%Cpp.void [concrete = constants.%Cpp.void] // CHECK:STDOUT: %ptr.loc10: type = ptr_type %void.ref [concrete = constants.%ptr.00a] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.00a = value_binding p, %.loc10_29.2 +// CHECK:STDOUT: %p: %ptr.00a = wrapper_binding p, %.loc10_29.2 // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -240,7 +240,7 @@ fn F(input: Cpp.void*) { // CHECK:STDOUT: %void.ref: type = name_ref void, constants.%Cpp.void [concrete = constants.%Cpp.void] // CHECK:STDOUT: %ptr.loc10: type = ptr_type %void.ref [concrete = constants.%ptr.00a] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.00a = value_binding p, %.loc10_29.2 +// CHECK:STDOUT: %p: %ptr.00a = wrapper_binding p, %.loc10_29.2 // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -308,7 +308,7 @@ fn F(input: Cpp.void*) { // CHECK:STDOUT: %void.ref.loc10_20: type = name_ref void, constants.%Cpp.void [concrete = constants.%Cpp.void] // CHECK:STDOUT: %ptr.loc10_25: type = ptr_type %void.ref.loc10_20 [concrete = constants.%ptr.00a] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.00a = value_binding p, %.loc10_35.2 +// CHECK:STDOUT: %p: %ptr.00a = wrapper_binding p, %.loc10_35.2 // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -374,7 +374,7 @@ fn F(input: Cpp.void*) { // CHECK:STDOUT: %void.ref.loc10_20: type = name_ref void, constants.%Cpp.void [concrete = constants.%Cpp.void] // CHECK:STDOUT: %ptr.loc10_25: type = ptr_type %void.ref.loc10_20 [concrete = constants.%ptr.00a] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.00a = value_binding p, %.loc10_35.2 +// CHECK:STDOUT: %p: %ptr.00a = wrapper_binding p, %.loc10_35.2 // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -413,7 +413,7 @@ fn F(input: Cpp.void*) { // CHECK:STDOUT: %S.ref.loc17_20: type = name_ref S, imports.%S.decl [concrete = constants.%S] // CHECK:STDOUT: %ptr.loc17_22: type = ptr_type %S.ref.loc17_20 [concrete = constants.%ptr.037] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.037 = value_binding p, [concrete = ] +// CHECK:STDOUT: %p: %ptr.037 = wrapper_binding p, [concrete = ] // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -441,7 +441,7 @@ fn F(input: Cpp.void*) { // CHECK:STDOUT: %C.ref.loc17_17: type = name_ref C, file.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %ptr.loc17_18: type = ptr_type %C.ref.loc17_17 [concrete = constants.%ptr.6b6] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.6b6 = value_binding p, [concrete = ] +// CHECK:STDOUT: %p: %ptr.6b6 = wrapper_binding p, [concrete = ] // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -500,7 +500,7 @@ fn F(input: Cpp.void*) { // CHECK:STDOUT: %S.ref.loc10_20: type = name_ref S, imports.%S.decl [concrete = constants.%S] // CHECK:STDOUT: %ptr.loc10_22: type = ptr_type %S.ref.loc10_20 [concrete = constants.%ptr.037] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.037 = value_binding p, %.loc10_39.2 +// CHECK:STDOUT: %p: %ptr.037 = wrapper_binding p, %.loc10_39.2 // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -551,7 +551,7 @@ fn F(input: Cpp.void*) { // CHECK:STDOUT: %C.ref.loc10_17: type = name_ref C, file.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %ptr.loc10_18: type = ptr_type %C.ref.loc10_17 [concrete = constants.%ptr.6b6] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.6b6 = value_binding p, %.loc10_35.2 +// CHECK:STDOUT: %p: %ptr.6b6 = wrapper_binding p, %.loc10_35.2 // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interop/cpp/range_for.carbon b/toolchain/check/testdata/interop/cpp/range_for.carbon index 1b0e5bc27225..d2db2ad0a3c8 100644 --- a/toolchain/check/testdata/interop/cpp/range_for.carbon +++ b/toolchain/check/testdata/interop/cpp/range_for.carbon @@ -1059,7 +1059,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %.loc34_19.15: %i32 = value_of_initializer %Optional.Get.call // CHECK:STDOUT: %.loc34_19.16: %i32 = converted %Optional.Get.call, %.loc34_19.15 // CHECK:STDOUT: %i32.loc34: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %i: %i32 = value_binding i, %.loc34_19.16 +// CHECK:STDOUT: %i: %i32 = wrapper_binding i, %.loc34_19.16 // CHECK:STDOUT: %sum.ref: ref %i32 = name_ref sum, %sum // CHECK:STDOUT: %i.ref: %i32 = name_ref i, %i // CHECK:STDOUT: %impl.elem0.loc35: %.b28 = impl_witness_access constants.%AddAssignWith.impl_witness.22e, element0 [concrete = constants.%Int.as.AddAssignWith.impl.Op.00e760.2] @@ -1172,7 +1172,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %.loc49_19.13: %i32 = value_of_initializer %Optional.Get.call.loc49 // CHECK:STDOUT: %.loc49_19.14: %i32 = converted %Optional.Get.call.loc49, %.loc49_19.13 // CHECK:STDOUT: %i32.loc49: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %i.loc49: %i32 = value_binding i, %.loc49_19.14 +// CHECK:STDOUT: %i.loc49: %i32 = wrapper_binding i, %.loc49_19.14 // CHECK:STDOUT: %sum.ref.loc50: ref %i32 = name_ref sum, %sum // CHECK:STDOUT: %i.ref.loc50: %i32 = name_ref i, %i.loc49 // CHECK:STDOUT: %impl.elem0.loc50: %.b28 = impl_witness_access constants.%AddAssignWith.impl_witness.22e, element0 [concrete = constants.%Int.as.AddAssignWith.impl.Op.00e760.2] @@ -1240,7 +1240,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %.loc55_19.13: %i32 = value_of_initializer %Optional.Get.call.loc55 // CHECK:STDOUT: %.loc55_19.14: %i32 = converted %Optional.Get.call.loc55, %.loc55_19.13 // CHECK:STDOUT: %i32.loc55: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %i.loc55: %i32 = value_binding i, %.loc55_19.14 +// CHECK:STDOUT: %i.loc55: %i32 = wrapper_binding i, %.loc55_19.14 // CHECK:STDOUT: %sum.ref.loc56: ref %i32 = name_ref sum, %sum // CHECK:STDOUT: %i.ref.loc56: %i32 = name_ref i, %i.loc55 // CHECK:STDOUT: %impl.elem0.loc56: %.b28 = impl_witness_access constants.%AddAssignWith.impl_witness.22e, element0 [concrete = constants.%Int.as.AddAssignWith.impl.Op.00e760.2] @@ -1687,7 +1687,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %Cpp.ref.loc44: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %ValueType.ref.loc44: type = name_ref ValueType, imports.%ValueType.decl [concrete = constants.%ValueType] // CHECK:STDOUT: } -// CHECK:STDOUT: %i: %ValueType = value_binding i, %.loc44_29.17 +// CHECK:STDOUT: %i: %ValueType = wrapper_binding i, %.loc44_29.17 // CHECK:STDOUT: %sum.ref: ref %ValueType = name_ref sum, %sum // CHECK:STDOUT: %i.ref: %ValueType = name_ref i, %i // CHECK:STDOUT: %.loc45_12: ref %ValueType = value_as_ref %i.ref @@ -1803,7 +1803,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %Cpp.ref.loc59: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %ValueType.ref.loc59: type = name_ref ValueType, imports.%ValueType.decl [concrete = constants.%ValueType] // CHECK:STDOUT: } -// CHECK:STDOUT: %i.loc59: %ValueType = value_binding i, %.loc59_29.15 +// CHECK:STDOUT: %i.loc59: %ValueType = wrapper_binding i, %.loc59_29.15 // CHECK:STDOUT: %sum.ref.loc60: ref %ValueType = name_ref sum, %sum // CHECK:STDOUT: %i.ref.loc60: %ValueType = name_ref i, %i.loc59 // CHECK:STDOUT: %.loc60_12: ref %ValueType = value_as_ref %i.ref.loc60 @@ -1870,7 +1870,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %Cpp.ref.loc63: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %ValueType.ref.loc63: type = name_ref ValueType, imports.%ValueType.decl [concrete = constants.%ValueType] // CHECK:STDOUT: } -// CHECK:STDOUT: %i.loc63: %ValueType = value_binding i, %.loc63_29.15 +// CHECK:STDOUT: %i.loc63: %ValueType = wrapper_binding i, %.loc63_29.15 // CHECK:STDOUT: %sum.ref.loc64: ref %ValueType = name_ref sum, %sum // CHECK:STDOUT: %i.ref.loc64: %ValueType = name_ref i, %i.loc63 // CHECK:STDOUT: %.loc64_12: ref %ValueType = value_as_ref %i.ref.loc64 @@ -2240,7 +2240,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %.loc24_19.15: %f64.dc1 = value_of_initializer %Optional.Get.call // CHECK:STDOUT: %.loc24_19.16: %f64.dc1 = converted %Optional.Get.call, %.loc24_19.15 // CHECK:STDOUT: %f64.loc24: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %i: %f64.dc1 = value_binding i, %.loc24_19.16 +// CHECK:STDOUT: %i: %f64.dc1 = wrapper_binding i, %.loc24_19.16 // CHECK:STDOUT: %sum.ref: ref %f64.dc1 = name_ref sum, %sum // CHECK:STDOUT: %i.ref: %f64.dc1 = name_ref i, %i // CHECK:STDOUT: %impl.elem0.loc25: %.746 = impl_witness_access constants.%AddAssignWith.impl_witness.e85, element0 [concrete = constants.%Float.as.AddAssignWith.impl.Op.ac1] @@ -2346,7 +2346,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %.loc38_19.13: %f64.dc1 = value_of_initializer %Optional.Get.call // CHECK:STDOUT: %.loc38_19.14: %f64.dc1 = converted %Optional.Get.call, %.loc38_19.13 // CHECK:STDOUT: %f64.loc38: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %i: %f64.dc1 = value_binding i, %.loc38_19.14 +// CHECK:STDOUT: %i: %f64.dc1 = wrapper_binding i, %.loc38_19.14 // CHECK:STDOUT: %sum.ref: ref %f64.dc1 = name_ref sum, %sum // CHECK:STDOUT: %i.ref: %f64.dc1 = name_ref i, %i // CHECK:STDOUT: %impl.elem0.loc39: %.746 = impl_witness_access constants.%AddAssignWith.impl_witness.e85, element0 [concrete = constants.%Float.as.AddAssignWith.impl.Op.ac1] @@ -2673,7 +2673,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %.loc26_19.15: %f64.dc1 = value_of_initializer %Optional.Get.call // CHECK:STDOUT: %.loc26_19.16: %f64.dc1 = converted %Optional.Get.call, %.loc26_19.15 // CHECK:STDOUT: %f64.loc26: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %i: %f64.dc1 = value_binding i, %.loc26_19.16 +// CHECK:STDOUT: %i: %f64.dc1 = wrapper_binding i, %.loc26_19.16 // CHECK:STDOUT: %sum.ref: ref %f64.dc1 = name_ref sum, %sum // CHECK:STDOUT: %i.ref: %f64.dc1 = name_ref i, %i // CHECK:STDOUT: %impl.elem0.loc27: %.746 = impl_witness_access constants.%AddAssignWith.impl_witness.e85, element0 [concrete = constants.%Float.as.AddAssignWith.impl.Op.ac1] @@ -2781,7 +2781,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %.loc68_19.13: %f64.dc1 = value_of_initializer %Optional.Get.call // CHECK:STDOUT: %.loc68_19.14: %f64.dc1 = converted %Optional.Get.call, %.loc68_19.13 // CHECK:STDOUT: %f64.loc68: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %i: %f64.dc1 = value_binding i, %.loc68_19.14 +// CHECK:STDOUT: %i: %f64.dc1 = wrapper_binding i, %.loc68_19.14 // CHECK:STDOUT: %sum.ref: ref %f64.dc1 = name_ref sum, %sum // CHECK:STDOUT: %i.ref: %f64.dc1 = name_ref i, %i // CHECK:STDOUT: %impl.elem0.loc69: %.746 = impl_witness_access constants.%AddAssignWith.impl_witness.e85, element0 [concrete = constants.%Float.as.AddAssignWith.impl.Op.ac1] @@ -3132,7 +3132,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %N.ref.loc31: = name_ref N, imports.%N [concrete = imports.%N] // CHECK:STDOUT: %ValueType.ref.loc31: type = name_ref ValueType, imports.%ValueType.decl [concrete = constants.%ValueType] // CHECK:STDOUT: } -// CHECK:STDOUT: %i: %ValueType = value_binding i, %.loc31_31.17 +// CHECK:STDOUT: %i: %ValueType = wrapper_binding i, %.loc31_31.17 // CHECK:STDOUT: %sum.ref: ref %ValueType = name_ref sum, %sum // CHECK:STDOUT: %i.ref: %ValueType = name_ref i, %i // CHECK:STDOUT: %.loc32_12: ref %ValueType = value_as_ref %i.ref @@ -3247,7 +3247,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %N.ref.loc45: = name_ref N, imports.%N [concrete = imports.%N] // CHECK:STDOUT: %ValueType.ref.loc45: type = name_ref ValueType, imports.%ValueType.decl [concrete = constants.%ValueType] // CHECK:STDOUT: } -// CHECK:STDOUT: %i: %ValueType = value_binding i, %.loc45_31.15 +// CHECK:STDOUT: %i: %ValueType = wrapper_binding i, %.loc45_31.15 // CHECK:STDOUT: %sum.ref: ref %ValueType = name_ref sum, %sum // CHECK:STDOUT: %i.ref: %ValueType = name_ref i, %i // CHECK:STDOUT: %.loc46_12: ref %ValueType = value_as_ref %i.ref @@ -3511,7 +3511,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %N.ref.loc31: = name_ref N, imports.%N [concrete = imports.%N] // CHECK:STDOUT: %ValueType.ref.loc31: type = name_ref ValueType, imports.%ValueType.decl [concrete = constants.%ValueType] // CHECK:STDOUT: } -// CHECK:STDOUT: %i: %ValueType = value_binding i, %.loc31_31.17 +// CHECK:STDOUT: %i: %ValueType = wrapper_binding i, %.loc31_31.17 // CHECK:STDOUT: %sum.ref: ref %ValueType = name_ref sum, %sum // CHECK:STDOUT: %i.ref: %ValueType = name_ref i, %i // CHECK:STDOUT: %.loc32_12: ref %ValueType = value_as_ref %i.ref @@ -3589,14 +3589,9 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %N.ref.loc95: = name_ref N, imports.%N [concrete = imports.%N] // CHECK:STDOUT: %ValueType.ref.loc95: type = name_ref ValueType, imports.%ValueType.decl [concrete = constants.%ValueType] // CHECK:STDOUT: } -// CHECK:STDOUT: %i: %ValueType = value_binding i, [concrete = ] +// CHECK:STDOUT: %i: %ValueType = wrapper_binding i, [concrete = ] // CHECK:STDOUT: %sum.ref: ref %ValueType = name_ref sum, %sum // CHECK:STDOUT: %i.ref: %ValueType = name_ref i, %i [concrete = ] -// CHECK:STDOUT: %.loc96_12: ref %ValueType = value_as_ref %i.ref -// CHECK:STDOUT: %addr.loc96: %ptr.9d3 = addr_of %.loc96_12 -// CHECK:STDOUT: %.loc96_9.1: %ptr.32e = as_compatible %addr.loc96 -// CHECK:STDOUT: %.loc96_9.2: %ptr.32e = converted %addr.loc96, %.loc96_9.1 -// CHECK:STDOUT: %operator_PlusEqual__carbon_thunk.call: ref %ValueType = call imports.%operator_PlusEqual__carbon_thunk.decl(%sum.ref, %.loc96_9.2) // CHECK:STDOUT: br !for.next // CHECK:STDOUT: // CHECK:STDOUT: !for.done: @@ -3898,7 +3893,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %N.ref.loc38: = name_ref N, imports.%N [concrete = imports.%N] // CHECK:STDOUT: %ValueType.ref.loc38: type = name_ref ValueType, imports.%ValueType.decl [concrete = constants.%ValueType] // CHECK:STDOUT: } -// CHECK:STDOUT: %i: %ValueType = value_binding i, %.loc38_31.17 +// CHECK:STDOUT: %i: %ValueType = wrapper_binding i, %.loc38_31.17 // CHECK:STDOUT: %sum.ref: ref %ValueType = name_ref sum, %sum // CHECK:STDOUT: %i.ref: %ValueType = name_ref i, %i // CHECK:STDOUT: %.loc39_12: ref %ValueType = value_as_ref %i.ref @@ -4015,7 +4010,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %N.ref.loc80: = name_ref N, imports.%N [concrete = imports.%N] // CHECK:STDOUT: %ValueType.ref.loc80: type = name_ref ValueType, imports.%ValueType.decl [concrete = constants.%ValueType] // CHECK:STDOUT: } -// CHECK:STDOUT: %i: %ValueType = value_binding i, %.loc80_32.15 +// CHECK:STDOUT: %i: %ValueType = wrapper_binding i, %.loc80_32.15 // CHECK:STDOUT: %sum.ref: ref %ValueType = name_ref sum, %sum // CHECK:STDOUT: %i.ref: %ValueType = name_ref i, %i // CHECK:STDOUT: %.loc81_12: ref %ValueType = value_as_ref %i.ref diff --git a/toolchain/check/testdata/interop/cpp/stdlib/initializer_list.carbon b/toolchain/check/testdata/interop/cpp/stdlib/initializer_list.carbon index 8cefd5fe592d..e2bd468a5e29 100644 --- a/toolchain/check/testdata/interop/cpp/stdlib/initializer_list.carbon +++ b/toolchain/check/testdata/interop/cpp/stdlib/initializer_list.carbon @@ -162,7 +162,7 @@ fn F() { // CHECK:STDOUT: } { // CHECK:STDOUT: %.loc8: Core.Form = init_form constants.%initializer_list [concrete = constants.%.0ee] // CHECK:STDOUT: %_.param: %array_type = value_param call_param0 -// CHECK:STDOUT: %_: %array_type = value_binding _, %_.param +// CHECK:STDOUT: %_: %array_type = wrapper_binding _, %_.param // CHECK:STDOUT: %return.param: ref %initializer_list = out_param call_param1 // CHECK:STDOUT: %return: ref %initializer_list = return_slot %return.param // CHECK:STDOUT: } @@ -174,7 +174,7 @@ fn F() { // CHECK:STDOUT: } { // CHECK:STDOUT: %.loc10: Core.Form = init_form constants.%initializer_list [concrete = constants.%.0ee] // CHECK:STDOUT: %_.param: %array_type = value_param call_param0 -// CHECK:STDOUT: %_: %array_type = value_binding _, %_.param +// CHECK:STDOUT: %_: %array_type = wrapper_binding _, %_.param // CHECK:STDOUT: %return.param: ref %initializer_list = out_param call_param1 // CHECK:STDOUT: %return: ref %initializer_list = return_slot %return.param // CHECK:STDOUT: } @@ -186,7 +186,7 @@ fn F() { // CHECK:STDOUT: } { // CHECK:STDOUT: %.loc12: Core.Form = init_form constants.%initializer_list [concrete = constants.%.0ee] // CHECK:STDOUT: %_.param: %array_type = value_param call_param0 -// CHECK:STDOUT: %_: %array_type = value_binding _, %_.param +// CHECK:STDOUT: %_: %array_type = wrapper_binding _, %_.param // CHECK:STDOUT: %return.param: ref %initializer_list = out_param call_param1 // CHECK:STDOUT: %return: ref %initializer_list = return_slot %return.param // CHECK:STDOUT: } @@ -246,7 +246,7 @@ fn F() { // CHECK:STDOUT: %.loc8_50.18: ref %initializer_list = temporary %.loc8_50.2, %.loc8_50.17 // CHECK:STDOUT: %.loc8_50.19: %initializer_list = acquire_value %.loc8_50.18 // CHECK:STDOUT: -// CHECK:STDOUT: %_.loc8: %initializer_list = value_binding _, %.loc8_50.19 +// CHECK:STDOUT: %_.loc8: %initializer_list = wrapper_binding _, %.loc8_50.19 // CHECK:STDOUT: %Cpp.ref.loc10: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Consume.ref: %Consume.cpp_overload_set.type = name_ref Consume, imports.%Consume.cpp_overload_set.value [concrete = constants.%Consume.cpp_overload_set.value] // CHECK:STDOUT: %int_1.loc10_16: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] @@ -356,7 +356,7 @@ fn F() { // CHECK:STDOUT: %Cpp.ref.loc12: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %InitListConstructor.ref: type = name_ref InitListConstructor, imports.%InitListConstructor.decl [concrete = constants.%InitListConstructor] // CHECK:STDOUT: } -// CHECK:STDOUT: %_.loc12: %InitListConstructor = value_binding _, %.loc12_44.25 +// CHECK:STDOUT: %_.loc12: %InitListConstructor = wrapper_binding _, %.loc12_44.25 // CHECK:STDOUT: %InitListConstructor.cpp_destructor.bound: = bound_method %.loc12_44.24, constants.%InitListConstructor.cpp_destructor // CHECK:STDOUT: %InitListConstructor.cpp_destructor.call: init %empty_tuple.type = call %InitListConstructor.cpp_destructor.bound(%.loc12_44.24) // CHECK:STDOUT: %initializer_list.cpp_destructor.bound.loc12: = bound_method %.loc12_44.19, constants.%initializer_list.cpp_destructor diff --git a/toolchain/check/testdata/interop/cpp/stdlib/string_view.carbon b/toolchain/check/testdata/interop/cpp/stdlib/string_view.carbon index b132ca089096..6c24d8ca5dba 100644 --- a/toolchain/check/testdata/interop/cpp/stdlib/string_view.carbon +++ b/toolchain/check/testdata/interop/cpp/stdlib/string_view.carbon @@ -213,10 +213,10 @@ fn StarstWith(a: str, b: str) -> bool { // CHECK:STDOUT: %.loc7_34.2: Core.Form = init_form %.loc7_34.1 [concrete = constants.%.f34] // CHECK:STDOUT: %a.param: %str = value_param call_param0 // CHECK:STDOUT: %str.loc7_18: type = type_literal constants.%str [concrete = constants.%str] -// CHECK:STDOUT: %a: %str = value_binding a, %a.param +// CHECK:STDOUT: %a: %str = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %str = value_param call_param1 // CHECK:STDOUT: %str.loc7_26: type = type_literal constants.%str [concrete = constants.%str] -// CHECK:STDOUT: %b: %str = value_binding b, %b.param +// CHECK:STDOUT: %b: %str = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/interop/cpp/template/alias_template.carbon b/toolchain/check/testdata/interop/cpp/template/alias_template.carbon index 4e7d6386a6e1..7ba4a69dcc5f 100644 --- a/toolchain/check/testdata/interop/cpp/template/alias_template.carbon +++ b/toolchain/check/testdata/interop/cpp/template/alias_template.carbon @@ -95,25 +95,25 @@ var a2: Cpp.Second(Cpp.B, Cpp.A) = Cpp.A.A(); // CHECK:STDOUT: %a1.var_patt: %pattern_type.3fa = var_pattern %a1.patt [concrete = constants.%a1.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %a1.var: ref %A = var %a1.var_patt [concrete] -// CHECK:STDOUT: %a1: ref %A = ref_binding a1, %a1.var [concrete = %a1.var] +// CHECK:STDOUT: %a1: ref %A = wrapper_binding a1, %a1.var [concrete = %a1.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b1.patt: %pattern_type.65a = ref_binding_pattern b1 [concrete = constants.%b1.patt] // CHECK:STDOUT: %b1.var_patt: %pattern_type.65a = var_pattern %b1.patt [concrete = constants.%b1.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %b1.var: ref %B = var %b1.var_patt [concrete] -// CHECK:STDOUT: %b1: ref %B = ref_binding b1, %b1.var [concrete = %b1.var] +// CHECK:STDOUT: %b1: ref %B = wrapper_binding b1, %b1.var [concrete = %b1.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b2.patt: %pattern_type.65a = ref_binding_pattern b2 [concrete = constants.%b2.patt] // CHECK:STDOUT: %b2.var_patt: %pattern_type.65a = var_pattern %b2.patt [concrete = constants.%b2.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %b2.var: ref %B = var %b2.var_patt [concrete] -// CHECK:STDOUT: %b2: ref %B = ref_binding b2, %b2.var [concrete = %b2.var] +// CHECK:STDOUT: %b2: ref %B = wrapper_binding b2, %b2.var [concrete = %b2.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %a2.patt: %pattern_type.3fa = ref_binding_pattern a2 [concrete = constants.%a2.patt] // CHECK:STDOUT: %a2.var_patt: %pattern_type.3fa = var_pattern %a2.patt [concrete = constants.%a2.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %a2.var: ref %A = var %a2.var_patt [concrete] -// CHECK:STDOUT: %a2: ref %A = ref_binding a2, %a2.var [concrete = %a2.var] +// CHECK:STDOUT: %a2: ref %A = wrapper_binding a2, %a2.var [concrete = %a2.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/interop/cpp/template/argument_count.carbon b/toolchain/check/testdata/interop/cpp/template/argument_count.carbon index 81863eac53a8..456a88f288d0 100644 --- a/toolchain/check/testdata/interop/cpp/template/argument_count.carbon +++ b/toolchain/check/testdata/interop/cpp/template/argument_count.carbon @@ -149,7 +149,7 @@ var too_many: Cpp.FixedSizePack(Cpp.A, Cpp.A).Inner(Cpp.B, Cpp.B, Cpp.B); // CHECK:STDOUT: %x.var_patt: %pattern_type.83a = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %x.var: ref %TwoTypes = var %x.var_patt [concrete] -// CHECK:STDOUT: %x: ref %TwoTypes = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %TwoTypes = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -226,25 +226,25 @@ var too_many: Cpp.FixedSizePack(Cpp.A, Cpp.A).Inner(Cpp.B, Cpp.B, Cpp.B); // CHECK:STDOUT: %a0.var_patt: %pattern_type.a64 = var_pattern %a0.patt [concrete = constants.%a0.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %a0.var: ref %TypePack.78f = var %a0.var_patt [concrete] -// CHECK:STDOUT: %a0: ref %TypePack.78f = ref_binding a0, %a0.var [concrete = %a0.var] +// CHECK:STDOUT: %a0: ref %TypePack.78f = wrapper_binding a0, %a0.var [concrete = %a0.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %a1.patt: %pattern_type.20e = ref_binding_pattern a1 [concrete = constants.%a1.patt] // CHECK:STDOUT: %a1.var_patt: %pattern_type.20e = var_pattern %a1.patt [concrete = constants.%a1.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %a1.var: ref %TypePack.0bc = var %a1.var_patt [concrete] -// CHECK:STDOUT: %a1: ref %TypePack.0bc = ref_binding a1, %a1.var [concrete = %a1.var] +// CHECK:STDOUT: %a1: ref %TypePack.0bc = wrapper_binding a1, %a1.var [concrete = %a1.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %a2.patt: %pattern_type.c25 = ref_binding_pattern a2 [concrete = constants.%a2.patt] // CHECK:STDOUT: %a2.var_patt: %pattern_type.c25 = var_pattern %a2.patt [concrete = constants.%a2.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %a2.var: ref %TypePack.0ec = var %a2.var_patt [concrete] -// CHECK:STDOUT: %a2: ref %TypePack.0ec = ref_binding a2, %a2.var [concrete = %a2.var] +// CHECK:STDOUT: %a2: ref %TypePack.0ec = wrapper_binding a2, %a2.var [concrete = %a2.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %a3.patt: %pattern_type.678 = ref_binding_pattern a3 [concrete = constants.%a3.patt] // CHECK:STDOUT: %a3.var_patt: %pattern_type.678 = var_pattern %a3.patt [concrete = constants.%a3.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %a3.var: ref %TypePack.186 = var %a3.var_patt [concrete] -// CHECK:STDOUT: %a3: ref %TypePack.186 = ref_binding a3, %a3.var [concrete = %a3.var] +// CHECK:STDOUT: %a3: ref %TypePack.186 = wrapper_binding a3, %a3.var [concrete = %a3.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/interop/cpp/template/class_template.carbon b/toolchain/check/testdata/interop/cpp/template/class_template.carbon index 7b60129ea907..bca1ead73409 100644 --- a/toolchain/check/testdata/interop/cpp/template/class_template.carbon +++ b/toolchain/check/testdata/interop/cpp/template/class_template.carbon @@ -81,7 +81,7 @@ var a: Cpp.A = Cpp.X(Cpp.A, Cpp.B).f({} as Cpp.B); // CHECK:STDOUT: %Cpp.ref: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %A.ref: type = name_ref A, imports.%A.decl [concrete = constants.%A] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %A = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %A = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/interop/cpp/template/concept.carbon b/toolchain/check/testdata/interop/cpp/template/concept.carbon index 71c6b7dea013..8c92846c13e1 100644 --- a/toolchain/check/testdata/interop/cpp/template/concept.carbon +++ b/toolchain/check/testdata/interop/cpp/template/concept.carbon @@ -87,7 +87,7 @@ var x2: X(Cpp.IsLarge(Cpp.Large)) = X(true).Make(); // CHECK:STDOUT: %false: bool = bool_literal false [concrete = constants.%false] // CHECK:STDOUT: %X.loc11: type = class_type @X, @X(constants.%false) [concrete = constants.%X.541] // CHECK:STDOUT: } -// CHECK:STDOUT: %x1: ref %X.541 = ref_binding x1, %x1.var [concrete = %x1.var] +// CHECK:STDOUT: %x1: ref %X.541 = wrapper_binding x1, %x1.var [concrete = %x1.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %x2.patt: %pattern_type.795 = ref_binding_pattern x2 [concrete = constants.%x2.patt] // CHECK:STDOUT: %x2.var_patt: %pattern_type.795 = var_pattern %x2.patt [concrete = constants.%x2.var_patt] @@ -102,7 +102,7 @@ var x2: X(Cpp.IsLarge(Cpp.Large)) = X(true).Make(); // CHECK:STDOUT: %true: bool = bool_literal true [concrete = constants.%true] // CHECK:STDOUT: %X.loc12: type = class_type @X, @X(constants.%true) [concrete = constants.%X.7b4] // CHECK:STDOUT: } -// CHECK:STDOUT: %x2: ref %X.7b4 = ref_binding x2, %x2.var [concrete = %x2.var] +// CHECK:STDOUT: %x2: ref %X.7b4 = wrapper_binding x2, %x2.var [concrete = %x2.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/interop/cpp/template/non_type_param.carbon b/toolchain/check/testdata/interop/cpp/template/non_type_param.carbon index e55efd35fb0b..3b7089bcbf0d 100644 --- a/toolchain/check/testdata/interop/cpp/template/non_type_param.carbon +++ b/toolchain/check/testdata/interop/cpp/template/non_type_param.carbon @@ -196,7 +196,7 @@ fn G() -> i32 { // CHECK:STDOUT: %x.var_patt: %pattern_type.2aa = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %x.var: ref %TwoNonType = var %x.var_patt [concrete] -// CHECK:STDOUT: %x: ref %TwoNonType = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %TwoNonType = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -262,13 +262,13 @@ fn G() -> i32 { // CHECK:STDOUT: %x.var_patt: %pattern_type.eef = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %x.var: ref %DependentNonType.43e = var %x.var_patt [concrete] -// CHECK:STDOUT: %x: ref %DependentNonType.43e = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %DependentNonType.43e = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %y.patt: %pattern_type.70d = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type.70d = var_pattern %y.patt [concrete = constants.%y.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %y.var: ref %DependentNonType.d43 = var %y.var_patt [concrete] -// CHECK:STDOUT: %y: ref %DependentNonType.d43 = ref_binding y, %y.var [concrete = %y.var] +// CHECK:STDOUT: %y: ref %DependentNonType.d43 = wrapper_binding y, %y.var [concrete = %y.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/interop/cpp/template/template_template_param.carbon b/toolchain/check/testdata/interop/cpp/template/template_template_param.carbon index 4638aef255bb..2f86e85714c1 100644 --- a/toolchain/check/testdata/interop/cpp/template/template_template_param.carbon +++ b/toolchain/check/testdata/interop/cpp/template/template_template_param.carbon @@ -111,7 +111,7 @@ var x: Cpp.TwoTemplates(Cpp.A, true); // CHECK:STDOUT: %x.var_patt: %pattern_type.f5e = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %x.var: ref %TwoTemplates = var %x.var_patt [concrete] -// CHECK:STDOUT: %x: ref %TwoTemplates = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %TwoTemplates = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -135,7 +135,7 @@ var x: Cpp.TwoTemplates(Cpp.A, true); // CHECK:STDOUT: %x.var_patt: = var_pattern %x.patt [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: %x.var: ref = var %x.var_patt [concrete = ] -// CHECK:STDOUT: %x: ref = ref_binding x, [concrete = ] +// CHECK:STDOUT: %x: = wrapper_binding x, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/interop/cpp/template/type_param.carbon b/toolchain/check/testdata/interop/cpp/template/type_param.carbon index e7b622220526..1d4def78be3c 100644 --- a/toolchain/check/testdata/interop/cpp/template/type_param.carbon +++ b/toolchain/check/testdata/interop/cpp/template/type_param.carbon @@ -95,7 +95,7 @@ var x: Cpp.TwoTypes(Cpp.A, {}); // CHECK:STDOUT: %x.var_patt: %pattern_type.83a = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %x.var: ref %TwoTypes = var %x.var_patt [concrete] -// CHECK:STDOUT: %x: ref %TwoTypes = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %TwoTypes = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -142,7 +142,7 @@ var x: Cpp.TwoTypes(Cpp.A, {}); // CHECK:STDOUT: %x.var_patt: %pattern_type.0c3 = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %x.var: ref %TwoTypes = var %x.var_patt [concrete] -// CHECK:STDOUT: %x: ref %TwoTypes = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %TwoTypes = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/interop/cpp/template/var_template.carbon b/toolchain/check/testdata/interop/cpp/template/var_template.carbon index 2d707a103177..38d3bbbfff57 100644 --- a/toolchain/check/testdata/interop/cpp/template/var_template.carbon +++ b/toolchain/check/testdata/interop/cpp/template/var_template.carbon @@ -104,7 +104,7 @@ let pwb: Cpp.B* = &Cpp.Wrap.r#var(Cpp.B); // CHECK:STDOUT: %A.ref.loc7: type = name_ref A, imports.%A.decl [concrete = constants.%A] // CHECK:STDOUT: %ptr.loc7: type = ptr_type %A.ref.loc7 [concrete = constants.%ptr.25f] // CHECK:STDOUT: } -// CHECK:STDOUT: %pa: %ptr.25f = value_binding pa, @__global_init.%addr.loc7 +// CHECK:STDOUT: %pa: %ptr.25f = wrapper_binding pa, @__global_init.%addr.loc7 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %pb.patt: %pattern_type.733 = value_binding_pattern pb [concrete = constants.%pb.patt] // CHECK:STDOUT: } @@ -113,7 +113,7 @@ let pwb: Cpp.B* = &Cpp.Wrap.r#var(Cpp.B); // CHECK:STDOUT: %B.ref.loc8: type = name_ref B, imports.%B.decl [concrete = constants.%B] // CHECK:STDOUT: %ptr.loc8: type = ptr_type %B.ref.loc8 [concrete = constants.%ptr.dc0] // CHECK:STDOUT: } -// CHECK:STDOUT: %pb: %ptr.dc0 = value_binding pb, @__global_init.%addr.loc8 +// CHECK:STDOUT: %pb: %ptr.dc0 = wrapper_binding pb, @__global_init.%addr.loc8 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %pwa.patt: %pattern_type.1fa = value_binding_pattern pwa [concrete = constants.%pwa.patt] // CHECK:STDOUT: } @@ -122,7 +122,7 @@ let pwb: Cpp.B* = &Cpp.Wrap.r#var(Cpp.B); // CHECK:STDOUT: %A.ref.loc9: type = name_ref A, imports.%A.decl [concrete = constants.%A] // CHECK:STDOUT: %ptr.loc9: type = ptr_type %A.ref.loc9 [concrete = constants.%ptr.25f] // CHECK:STDOUT: } -// CHECK:STDOUT: %pwa: %ptr.25f = value_binding pwa, @__global_init.%addr.loc9 +// CHECK:STDOUT: %pwa: %ptr.25f = wrapper_binding pwa, @__global_init.%addr.loc9 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %pwb.patt: %pattern_type.733 = value_binding_pattern pwb [concrete = constants.%pwb.patt] // CHECK:STDOUT: } @@ -131,7 +131,7 @@ let pwb: Cpp.B* = &Cpp.Wrap.r#var(Cpp.B); // CHECK:STDOUT: %B.ref.loc10: type = name_ref B, imports.%B.decl [concrete = constants.%B] // CHECK:STDOUT: %ptr.loc10: type = ptr_type %B.ref.loc10 [concrete = constants.%ptr.dc0] // CHECK:STDOUT: } -// CHECK:STDOUT: %pwb: %ptr.dc0 = value_binding pwb, @__global_init.%addr.loc10 +// CHECK:STDOUT: %pwb: %ptr.dc0 = wrapper_binding pwb, @__global_init.%addr.loc10 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/interop/cpp/type_alias/import.carbon b/toolchain/check/testdata/interop/cpp/type_alias/import.carbon index ad7b43661780..6e26a72d326b 100644 --- a/toolchain/check/testdata/interop/cpp/type_alias/import.carbon +++ b/toolchain/check/testdata/interop/cpp/type_alias/import.carbon @@ -127,7 +127,7 @@ fn H(var c: Cpp.C, var d: Cpp.D) { // CHECK:STDOUT: // CHECK:STDOUT: %foo.ref: type = name_ref foo, %i32.4 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %n: ref %i32 = ref_binding n, %n.var +// 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] @@ -147,7 +147,7 @@ fn H(var c: Cpp.C, var d: Cpp.D) { // CHECK:STDOUT: %bar.ref: type = name_ref bar, %i32.2 [concrete = constants.%i32] // CHECK:STDOUT: %ptr: type = ptr_type %bar.ref [concrete = constants.%ptr.d08] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: ref %ptr.d08 = ref_binding p, %p.var +// CHECK:STDOUT: %p: ref %ptr.d08 = wrapper_binding p, %p.var // CHECK:STDOUT: %Destroy.Op.bound.loc10: = bound_method %p.var, constants.%Destroy.Op.1a2547.1 // CHECK:STDOUT: %Destroy.Op.call.loc10: init %empty_tuple.type = call %Destroy.Op.bound.loc10(%p.var) // CHECK:STDOUT: %Destroy.Op.bound.loc8: = bound_method %n.var, constants.%Destroy.Op.1a2547.3 @@ -221,7 +221,7 @@ fn H(var c: Cpp.C, var d: Cpp.D) { // CHECK:STDOUT: %D.ref.loc9: type = name_ref D, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %ptr.loc9: type = ptr_type %D.ref.loc9 [concrete = constants.%ptr.0a2] // CHECK:STDOUT: } -// CHECK:STDOUT: %pd: ref %ptr.0a2 = ref_binding pd, %pd.var +// CHECK:STDOUT: %pd: ref %ptr.0a2 = wrapper_binding pd, %pd.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %pc.patt: %pattern_type.8fa = ref_binding_pattern pc [concrete = constants.%pc.patt] // CHECK:STDOUT: %pc.var_patt: %pattern_type.8fa = var_pattern %pc.patt [concrete = constants.%pc.var_patt] @@ -240,7 +240,7 @@ fn H(var c: Cpp.C, var d: Cpp.D) { // CHECK:STDOUT: %C.ref.loc10: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %ptr.loc10: type = ptr_type %C.ref.loc10 [concrete = constants.%ptr.0a2] // CHECK:STDOUT: } -// CHECK:STDOUT: %pc: ref %ptr.0a2 = ref_binding pc, %pc.var +// CHECK:STDOUT: %pc: ref %ptr.0a2 = wrapper_binding pc, %pc.var // CHECK:STDOUT: %Destroy.Op.bound.loc10: = bound_method %pc.var, constants.%Destroy.Op // CHECK:STDOUT: %Destroy.Op.call.loc10: init %empty_tuple.type = call %Destroy.Op.bound.loc10(%pc.var) // CHECK:STDOUT: %Destroy.Op.bound.loc9: = bound_method %pd.var, constants.%Destroy.Op diff --git a/toolchain/check/testdata/interop/cpp/var/import/global.carbon b/toolchain/check/testdata/interop/cpp/var/import/global.carbon index 89dea22bfee0..fa651642cd18 100644 --- a/toolchain/check/testdata/interop/cpp/var/import/global.carbon +++ b/toolchain/check/testdata/interop/cpp/var/import/global.carbon @@ -153,7 +153,7 @@ fn MyF() { // CHECK:STDOUT: %Cpp.ref.loc7_21: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc7: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %local: %C = value_binding local, %.loc7_32 +// CHECK:STDOUT: %local: %C = wrapper_binding local, %.loc7_32 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %local_ptr.patt: %pattern_type.8fa = value_binding_pattern local_ptr [concrete = constants.%local_ptr.patt] // CHECK:STDOUT: } @@ -165,7 +165,7 @@ fn MyF() { // CHECK:STDOUT: %C.ref.loc8: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %ptr.loc8: type = ptr_type %C.ref.loc8 [concrete = constants.%ptr.0a2] // CHECK:STDOUT: } -// CHECK:STDOUT: %local_ptr: %ptr.0a2 = value_binding local_ptr, %.loc8_37 +// CHECK:STDOUT: %local_ptr: %ptr.0a2 = wrapper_binding local_ptr, %.loc8_37 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %local_ref.patt: %pattern_type.8fa = value_binding_pattern local_ref [concrete = constants.%local_ref.patt] // CHECK:STDOUT: } @@ -180,7 +180,7 @@ fn MyF() { // CHECK:STDOUT: %C.ref.loc9: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %ptr.loc9: type = ptr_type %C.ref.loc9 [concrete = constants.%ptr.0a2] // CHECK:STDOUT: } -// CHECK:STDOUT: %local_ref: %ptr.0a2 = value_binding local_ref, %.loc9_37.3 +// CHECK:STDOUT: %local_ref: %ptr.0a2 = wrapper_binding local_ref, %.loc9_37.3 // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: @@ -227,7 +227,7 @@ fn MyF() { // CHECK:STDOUT: %Cpp.ref.loc22_21: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %UnusupportedType.ref: = name_ref UnusupportedType, [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %local: = value_binding local, [concrete = ] +// CHECK:STDOUT: %local: = wrapper_binding local, [concrete = ] // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/compile_time_bindings.carbon b/toolchain/check/testdata/let/compile_time_bindings.carbon index fa0b4cd3d8a1..231733270e91 100644 --- a/toolchain/check/testdata/let/compile_time_bindings.carbon +++ b/toolchain/check/testdata/let/compile_time_bindings.carbon @@ -229,7 +229,7 @@ impl i32 as Empty { // CHECK:STDOUT: %.loc10_12.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc10_12.3: type = converted %.loc10_12.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %empty_tuple.type = value_binding x, %.loc10_17.2 +// CHECK:STDOUT: %x: %empty_tuple.type = wrapper_binding x, %.loc10_17.2 // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%empty_struct_type [concrete = constants.%complete_type] // CHECK:STDOUT: complete_type_witness = %complete_type // CHECK:STDOUT: @@ -294,7 +294,7 @@ impl i32 as Empty { // CHECK:STDOUT: %.loc9_12.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc9_12.3: type = converted %.loc9_12.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %empty_tuple.type = value_binding x, %.loc9_17.2 +// CHECK:STDOUT: %x: %empty_tuple.type = wrapper_binding x, %.loc9_17.2 // CHECK:STDOUT: %C.F.decl: %C.F.type = fn_decl @C.F [concrete = constants.%C.F] { // CHECK:STDOUT: %return.param_patt: %pattern_type = out_param_pattern [concrete = constants.%return.param_patt] // CHECK:STDOUT: %return.patt: %pattern_type = return_slot_pattern %return.param_patt, %.loc10_14.2 [concrete = constants.%return.patt] @@ -359,7 +359,7 @@ impl i32 as Empty { // CHECK:STDOUT: %.loc9_12.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc9_12.3: type = converted %.loc9_12.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %empty_tuple.type = value_binding a, %.loc9_17.2 +// CHECK:STDOUT: %a: %empty_tuple.type = wrapper_binding a, %.loc9_17.2 // CHECK:STDOUT: %C.F.decl: %C.F.type = fn_decl @C.F [concrete = constants.%C.F] { // CHECK:STDOUT: %b.patt.loc10_9.1: %pattern_type.559 = symbolic_binding_pattern b, 0 [symbolic = %b.patt.loc10_9.2 (constants.%b.patt)] // CHECK:STDOUT: } { @@ -398,7 +398,7 @@ impl i32 as Empty { // CHECK:STDOUT: %.loc26_22.5: type = converted constants.%empty_tuple, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: %.loc26_22.6: type = converted %.loc26_22.2, constants.%tuple.type.2d5 [concrete = constants.%tuple.type.2d5] // CHECK:STDOUT: } -// CHECK:STDOUT: %d: %tuple.type.2d5 = value_binding d, %.loc26_37.5 +// CHECK:STDOUT: %d: %tuple.type.2d5 = wrapper_binding d, %.loc26_37.5 // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%empty_struct_type [concrete = constants.%complete_type] // CHECK:STDOUT: complete_type_witness = %complete_type // CHECK:STDOUT: @@ -642,7 +642,7 @@ impl i32 as Empty { // CHECK:STDOUT: %.Self: %type = symbolic_binding .Self [symbolic_self = constants.%.Self] // CHECK:STDOUT: %.loc9_11.2: type = type_literal type [concrete = type] // CHECK:STDOUT: } -// CHECK:STDOUT: %T: type = value_binding T, %i32 +// CHECK:STDOUT: %T: type = wrapper_binding T, %i32 // CHECK:STDOUT: %I.F.decl: %I.F.type = fn_decl @I.F [concrete = constants.%I.F] { // CHECK:STDOUT: %return.patt: = return_slot_pattern , [concrete = ] // CHECK:STDOUT: } { @@ -698,7 +698,7 @@ impl i32 as Empty { // CHECK:STDOUT: %.Self: %type = symbolic_binding .Self [symbolic_self = constants.%.Self] // CHECK:STDOUT: %.loc8_9.2: type = type_literal type [concrete = type] // CHECK:STDOUT: } -// CHECK:STDOUT: %T: type = value_binding T, @__global_init.%i32 +// CHECK:STDOUT: %T: type = wrapper_binding T, @__global_init.%i32 // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [concrete = constants.%F] { // CHECK:STDOUT: %return.patt: = return_slot_pattern , [concrete = ] // CHECK:STDOUT: } { @@ -802,7 +802,7 @@ impl i32 as Empty { // CHECK:STDOUT: %.Self: %type = symbolic_binding .Self [symbolic_self = constants.%.Self] // CHECK:STDOUT: %i32.loc11: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %Zero: %i32 = value_binding Zero, %.loc11_20.2 +// CHECK:STDOUT: %Zero: %i32 = wrapper_binding Zero, %.loc11_20.2 // CHECK:STDOUT: %Empty.impl_witness_table = impl_witness_table (), @i32.as.Empty.impl [concrete] // CHECK:STDOUT: %Empty.impl_witness: = impl_witness %Empty.impl_witness_table [concrete = constants.%Empty.impl_witness] // CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/convert.carbon b/toolchain/check/testdata/let/convert.carbon index e7b7e1d086fb..6abf57e80da7 100644 --- a/toolchain/check/testdata/let/convert.carbon +++ b/toolchain/check/testdata/let/convert.carbon @@ -78,7 +78,7 @@ fn G() { // CHECK:STDOUT: %.loc8_24.2: %tuple.type.ff9 = tuple_literal (%i32.loc8_11, %i32.loc8_16, %i32.loc8_21) [concrete = constants.%tuple.04d] // CHECK:STDOUT: %.loc8_24.3: type = converted %.loc8_24.2, constants.%tuple.type.555 [concrete = constants.%tuple.type.555] // CHECK:STDOUT: } -// CHECK:STDOUT: %w: %tuple.type.555 = value_binding w, %.loc8_28.4 +// CHECK:STDOUT: %w: %tuple.type.555 = wrapper_binding w, %.loc8_28.4 // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/fail_duplicate_decl.carbon b/toolchain/check/testdata/let/fail_duplicate_decl.carbon index a2040291306d..bb67d890b402 100644 --- a/toolchain/check/testdata/let/fail_duplicate_decl.carbon +++ b/toolchain/check/testdata/let/fail_duplicate_decl.carbon @@ -95,7 +95,7 @@ fn F() { // CHECK:STDOUT: %.loc16_23.1: %i32 = value_of_initializer %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc16 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %.loc16_23.2: %i32 = converted %int_1, %.loc16_23.1 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %i32.loc16: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a.loc16: %i32 = value_binding a, %.loc16_23.2 +// CHECK:STDOUT: %a.loc16: %i32 = wrapper_binding a, %.loc16_23.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %a.patt.loc24: %pattern_type.6b6 = value_binding_pattern a [concrete = constants.%a.patt.bb2e5b.2] // CHECK:STDOUT: } @@ -108,7 +108,7 @@ fn F() { // CHECK:STDOUT: %.loc24_23.1: %i32 = value_of_initializer %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc24 [concrete = constants.%int_2.295] // CHECK:STDOUT: %.loc24_23.2: %i32 = converted %int_2, %.loc24_23.1 [concrete = constants.%int_2.295] // CHECK:STDOUT: %i32.loc24: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a.loc24: %i32 = value_binding a, %.loc24_23.2 +// CHECK:STDOUT: %a.loc24: %i32 = wrapper_binding a, %.loc24_23.2 // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/fail_generic_import.carbon b/toolchain/check/testdata/let/fail_generic_import.carbon index 50d74b86f7d0..f09e1276a781 100644 --- a/toolchain/check/testdata/let/fail_generic_import.carbon +++ b/toolchain/check/testdata/let/fail_generic_import.carbon @@ -68,7 +68,7 @@ let a: T = 0; // CHECK:STDOUT: %.Self: %type = symbolic_binding .Self [symbolic_self = constants.%.Self] // CHECK:STDOUT: %.loc8_9.2: type = type_literal type [concrete = type] // CHECK:STDOUT: } -// CHECK:STDOUT: %T: type = value_binding T, @__global_init.%i32 +// CHECK:STDOUT: %T: type = wrapper_binding T, @__global_init.%i32 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -104,7 +104,7 @@ let a: T = 0; // CHECK:STDOUT: %a.patt: = value_binding_pattern a [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: %T.ref: type = name_ref T, imports.%Implicit.T -// CHECK:STDOUT: %a: = value_binding a, [concrete = ] +// CHECK:STDOUT: %a: = wrapper_binding a, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/let/fail_modifiers.carbon b/toolchain/check/testdata/let/fail_modifiers.carbon index 18d3e6fd9465..63c502a308d2 100644 --- a/toolchain/check/testdata/let/fail_modifiers.carbon +++ b/toolchain/check/testdata/let/fail_modifiers.carbon @@ -160,7 +160,7 @@ protected protected let i: i32 = 1; // CHECK:STDOUT: %.loc19_24.1: %i32 = value_of_initializer %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc19 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %.loc19_24.2: %i32 = converted @__global_init.%int_1.loc19, %.loc19_24.1 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %i32.loc19: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: %i32 = value_binding b, %.loc19_24.2 +// CHECK:STDOUT: %b: %i32 = wrapper_binding b, %.loc19_24.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.6b6 = value_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: } @@ -172,7 +172,7 @@ protected protected let i: i32 = 1; // CHECK:STDOUT: %.loc25_22.1: %i32 = value_of_initializer %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc25 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %.loc25_22.2: %i32 = converted @__global_init.%int_1.loc25, %.loc25_22.1 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %i32.loc25: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %c: %i32 = value_binding c, %.loc25_22.2 +// CHECK:STDOUT: %c: %i32 = wrapper_binding c, %.loc25_22.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.6b6 = value_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: } @@ -184,7 +184,7 @@ protected protected let i: i32 = 1; // CHECK:STDOUT: %.loc31_20.1: %i32 = value_of_initializer %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc31 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %.loc31_20.2: %i32 = converted @__global_init.%int_1.loc31, %.loc31_20.1 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %i32.loc31: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %d: %i32 = value_binding d, %.loc31_20.2 +// CHECK:STDOUT: %d: %i32 = wrapper_binding d, %.loc31_20.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %e.patt: %pattern_type.6b6 = value_binding_pattern e [concrete = constants.%e.patt] // CHECK:STDOUT: } @@ -196,7 +196,7 @@ protected protected let i: i32 = 1; // CHECK:STDOUT: %.loc37_22.1: %i32 = value_of_initializer %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc37 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %.loc37_22.2: %i32 = converted @__global_init.%int_1.loc37, %.loc37_22.1 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %i32.loc37: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %e: %i32 = value_binding e, %.loc37_22.2 +// CHECK:STDOUT: %e: %i32 = wrapper_binding e, %.loc37_22.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %f.patt: %pattern_type.6b6 = value_binding_pattern f [concrete = constants.%f.patt] // CHECK:STDOUT: } @@ -208,7 +208,7 @@ protected protected let i: i32 = 1; // CHECK:STDOUT: %.loc50_28.1: %i32 = value_of_initializer %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc50 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %.loc50_28.2: %i32 = converted @__global_init.%int_1.loc50, %.loc50_28.1 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %i32.loc50: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %f: %i32 = value_binding f, %.loc50_28.2 +// CHECK:STDOUT: %f: %i32 = wrapper_binding f, %.loc50_28.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %g.patt: %pattern_type.6b6 = value_binding_pattern g [concrete = constants.%g.patt] // CHECK:STDOUT: } @@ -220,7 +220,7 @@ protected protected let i: i32 = 1; // CHECK:STDOUT: %.loc63_30.1: %i32 = value_of_initializer %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc63 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %.loc63_30.2: %i32 = converted @__global_init.%int_1.loc63, %.loc63_30.1 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %i32.loc63: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %g: %i32 = value_binding g, %.loc63_30.2 +// CHECK:STDOUT: %g: %i32 = wrapper_binding g, %.loc63_30.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %h.patt: %pattern_type.6b6 = value_binding_pattern h [concrete = constants.%h.patt] // CHECK:STDOUT: } @@ -232,7 +232,7 @@ protected protected let i: i32 = 1; // CHECK:STDOUT: %.loc76_32.1: %i32 = value_of_initializer %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc76 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %.loc76_32.2: %i32 = converted @__global_init.%int_1.loc76, %.loc76_32.1 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %i32.loc76: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %h: %i32 = value_binding h, %.loc76_32.2 +// CHECK:STDOUT: %h: %i32 = wrapper_binding h, %.loc76_32.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %i.patt: %pattern_type.6b6 = value_binding_pattern i [concrete = constants.%i.patt] // CHECK:STDOUT: } @@ -244,7 +244,7 @@ protected protected let i: i32 = 1; // CHECK:STDOUT: %.loc89_34.1: %i32 = value_of_initializer %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc89 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %.loc89_34.2: %i32 = converted @__global_init.%int_1.loc89, %.loc89_34.1 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %i32.loc89: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %i: %i32 = value_binding i, %.loc89_34.2 +// CHECK:STDOUT: %i: %i32 = wrapper_binding i, %.loc89_34.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/let/fail_use_in_init.carbon b/toolchain/check/testdata/let/fail_use_in_init.carbon index f7dfda003231..10fb20096985 100644 --- a/toolchain/check/testdata/let/fail_use_in_init.carbon +++ b/toolchain/check/testdata/let/fail_use_in_init.carbon @@ -65,7 +65,7 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: %a.ref: = name_ref a, [concrete = ] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: %i32 = value_binding a, [concrete = ] +// CHECK:STDOUT: %a: %i32 = wrapper_binding a, [concrete = ] // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/generic_import.carbon b/toolchain/check/testdata/let/generic_import.carbon index ee4dc4837b1c..aff5f6eb4005 100644 --- a/toolchain/check/testdata/let/generic_import.carbon +++ b/toolchain/check/testdata/let/generic_import.carbon @@ -72,7 +72,7 @@ var b: T = *a; // CHECK:STDOUT: %.Self: %type = symbolic_binding .Self [symbolic_self = constants.%.Self] // CHECK:STDOUT: %.loc8_9.2: type = type_literal type [concrete = type] // CHECK:STDOUT: } -// CHECK:STDOUT: %T: type = value_binding T, @__global_init.%i32 +// CHECK:STDOUT: %T: type = wrapper_binding T, @__global_init.%i32 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -110,20 +110,20 @@ var b: T = *a; // CHECK:STDOUT: %T.ref.loc8: type = name_ref T, imports.%Implicit.T // CHECK:STDOUT: %ptr: type = ptr_type [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref = ref_binding a, [concrete = ] +// CHECK:STDOUT: %a: = wrapper_binding a, [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: = ref_binding_pattern b [concrete = ] // CHECK:STDOUT: %b.var_patt: = var_pattern %b.patt [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: %b.var: ref = var %b.var_patt [concrete = ] // CHECK:STDOUT: %T.ref.loc13: type = name_ref T, imports.%Implicit.T -// CHECK:STDOUT: %b: ref = ref_binding b, [concrete = ] +// CHECK:STDOUT: %b: = wrapper_binding b, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: // CHECK:STDOUT: assign file.%a.var, -// CHECK:STDOUT: %a.ref: ref = name_ref a, file.%a [concrete = ] +// CHECK:STDOUT: %a.ref: = name_ref a, file.%a [concrete = ] // CHECK:STDOUT: %.loc13: ref = deref [concrete = ] // CHECK:STDOUT: assign file.%b.var, // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/let/global.carbon b/toolchain/check/testdata/let/global.carbon index 63b6bfe85b35..30fa6a44fb0c 100644 --- a/toolchain/check/testdata/let/global.carbon +++ b/toolchain/check/testdata/let/global.carbon @@ -95,7 +95,7 @@ fn F() -> i32 { return n; } // CHECK:STDOUT: %.loc15_14.1: %i32 = value_of_initializer %Core.IntLiteral.as.ImplicitAs.impl.Convert.call [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %.loc15_14.2: %i32 = converted @__global_init.%int_1, %.loc15_14.1 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: %i32 = value_binding n, %.loc15_14.2 +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, %.loc15_14.2 // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [concrete = constants.%F] { // CHECK:STDOUT: %return.param_patt: %pattern_type.6b6 = out_param_pattern [concrete = constants.%return.param_patt.a9a] // CHECK:STDOUT: %return.patt: %pattern_type.6b6 = return_slot_pattern %return.param_patt, %i32 [concrete = constants.%return.patt.e1b] diff --git a/toolchain/check/testdata/let/import.carbon b/toolchain/check/testdata/let/import.carbon index 5658f4327da0..7914282a5443 100644 --- a/toolchain/check/testdata/let/import.carbon +++ b/toolchain/check/testdata/let/import.carbon @@ -58,7 +58,7 @@ let b: () = Other.a; // CHECK:STDOUT: %.loc4_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_9.3: type = converted %.loc4_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %empty_tuple.type = value_binding a, %.loc4_14 +// CHECK:STDOUT: %a: %empty_tuple.type = wrapper_binding a, %.loc4_14 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -94,7 +94,7 @@ let b: () = Other.a; // CHECK:STDOUT: %.loc4_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_9.3: type = converted %.loc4_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %empty_tuple.type = value_binding b, @__global_init.%a.ref +// CHECK:STDOUT: %b: %empty_tuple.type = wrapper_binding b, @__global_init.%a.ref // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -125,7 +125,7 @@ let b: () = Other.a; // CHECK:STDOUT: %.loc4_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_9.3: type = converted %.loc4_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %empty_tuple.type = value_binding a, %.loc4_14 +// CHECK:STDOUT: %a: %empty_tuple.type = wrapper_binding a, %.loc4_14 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -164,7 +164,7 @@ let b: () = Other.a; // CHECK:STDOUT: %.loc4_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_9.3: type = converted %.loc4_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %empty_tuple.type = value_binding b, @__global_init.%a.ref +// CHECK:STDOUT: %b: %empty_tuple.type = wrapper_binding b, @__global_init.%a.ref // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/let/import_access.carbon b/toolchain/check/testdata/let/import_access.carbon index dea5f6241e7e..6fb581c35c28 100644 --- a/toolchain/check/testdata/let/import_access.carbon +++ b/toolchain/check/testdata/let/import_access.carbon @@ -78,7 +78,7 @@ let v2: () = Test.v; // CHECK:STDOUT: %.loc4_17.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_17.3: type = converted %.loc4_17.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: %empty_tuple.type = value_binding v, %.loc4_22 +// CHECK:STDOUT: %v: %empty_tuple.type = wrapper_binding v, %.loc4_22 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -114,7 +114,7 @@ let v2: () = Test.v; // CHECK:STDOUT: %.loc4_10.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_10.3: type = converted %.loc4_10.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %v2: %empty_tuple.type = value_binding v2, @__global_init.%v.ref +// CHECK:STDOUT: %v2: %empty_tuple.type = wrapper_binding v2, @__global_init.%v.ref // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -145,7 +145,7 @@ let v2: () = Test.v; // CHECK:STDOUT: %.loc10_10.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc10_10.3: type = converted %.loc10_10.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %v2: %empty_tuple.type = value_binding v2, [concrete = ] +// CHECK:STDOUT: %v2: %empty_tuple.type = wrapper_binding v2, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -183,7 +183,7 @@ let v2: () = Test.v; // CHECK:STDOUT: %.loc10_10.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc10_10.3: type = converted %.loc10_10.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %v2: %empty_tuple.type = value_binding v2, [concrete = ] +// CHECK:STDOUT: %v2: %empty_tuple.type = wrapper_binding v2, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/let/local.carbon b/toolchain/check/testdata/let/local.carbon index 529c4a3366af..cc275540e9e2 100644 --- a/toolchain/check/testdata/let/local.carbon +++ b/toolchain/check/testdata/let/local.carbon @@ -70,7 +70,7 @@ fn CallF() { // CHECK:STDOUT: } // CHECK:STDOUT: %a.ref: %i32 = name_ref a, %a // CHECK:STDOUT: %i32.loc5: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: %i32 = value_binding b, %a.ref +// CHECK:STDOUT: %b: %i32 = wrapper_binding b, %a.ref // CHECK:STDOUT: %b.ref: %i32 = name_ref b, %b // CHECK:STDOUT: %impl.elem0: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] // CHECK:STDOUT: %bound_method.loc6_10.1: = bound_method %b.ref, %impl.elem0 diff --git a/toolchain/check/testdata/let/ref.carbon b/toolchain/check/testdata/let/ref.carbon index ce0047bb1205..e752ade41590 100644 --- a/toolchain/check/testdata/let/ref.carbon +++ b/toolchain/check/testdata/let/ref.carbon @@ -70,7 +70,7 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: %b.ref.loc7: ref %i32 = name_ref b, %b // CHECK:STDOUT: %i32.loc7: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %c: ref %i32 = ref_binding c, %b.ref.loc7 +// CHECK:STDOUT: %c: ref %i32 = wrapper_binding c, %b.ref.loc7 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.6b6 = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %e.patt: %pattern_type.6b6 = ref_binding_pattern e [concrete = constants.%e.patt] @@ -80,9 +80,9 @@ fn F() { // CHECK:STDOUT: %c.ref: ref %i32 = name_ref c, %c // CHECK:STDOUT: %.loc8_53: %tuple.type.e55 = tuple_literal (%b.ref.loc8, %c.ref) // CHECK:STDOUT: %i32.loc8_22: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %d: ref %i32 = ref_binding d, %b.ref.loc8 +// CHECK:STDOUT: %d: ref %i32 = wrapper_binding d, %b.ref.loc8 // CHECK:STDOUT: %i32.loc8_41: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %e: ref %i32 = ref_binding e, %c.ref +// CHECK:STDOUT: %e: ref %i32 = wrapper_binding e, %c.ref // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/shadowed_decl.carbon b/toolchain/check/testdata/let/shadowed_decl.carbon index 1b6e359b2f0f..5b6e5faceb96 100644 --- a/toolchain/check/testdata/let/shadowed_decl.carbon +++ b/toolchain/check/testdata/let/shadowed_decl.carbon @@ -97,7 +97,7 @@ fn F(unused a: i32) -> i32 { // CHECK:STDOUT: %.loc15: Core.Form = init_form %i32.loc15_24 [concrete = constants.%.795] // CHECK:STDOUT: %a.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc15_16: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a.loc15: %i32 = value_binding a, %a.param +// CHECK:STDOUT: %a.loc15: %i32 = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -117,7 +117,7 @@ fn F(unused a: i32) -> i32 { // CHECK:STDOUT: %.loc16_16.1: %i32 = value_of_initializer %Core.IntLiteral.as.ImplicitAs.impl.Convert.call [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %.loc16_16.2: %i32 = converted %int_1, %.loc16_16.1 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %i32.loc16: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a.loc16: %i32 = value_binding a, %.loc16_16.2 +// CHECK:STDOUT: %a.loc16: %i32 = wrapper_binding a, %.loc16_16.2 // CHECK:STDOUT: %a.ref: %i32 = name_ref a, %a.loc16 // CHECK:STDOUT: %impl.elem0.loc18: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] // CHECK:STDOUT: %bound_method.loc18_10.1: = bound_method %a.ref, %impl.elem0.loc18 diff --git a/toolchain/check/testdata/main_run/no_return.carbon b/toolchain/check/testdata/main_run/no_return.carbon index 0dcfaa333429..40daebd2f6ec 100644 --- a/toolchain/check/testdata/main_run/no_return.carbon +++ b/toolchain/check/testdata/main_run/no_return.carbon @@ -93,13 +93,13 @@ fn Run(unused argc: i32, unused argv: i32*) {} // CHECK:STDOUT: } { // CHECK:STDOUT: %argc.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc5_21: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %argc: %i32 = value_binding argc, %argc.param +// CHECK:STDOUT: %argc: %i32 = wrapper_binding argc, %argc.param // CHECK:STDOUT: %argv.param: %ptr = value_param call_param1 // CHECK:STDOUT: %.loc5: type = splice_block %ptr [concrete = constants.%ptr] { // CHECK:STDOUT: %i32.loc5_39: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %ptr: type = ptr_type %i32.loc5_39 [concrete = constants.%ptr] // CHECK:STDOUT: } -// CHECK:STDOUT: %argv: %ptr = value_binding argv, %argv.param +// CHECK:STDOUT: %argv: %ptr = wrapper_binding argv, %argv.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/main_run/return_i32.carbon b/toolchain/check/testdata/main_run/return_i32.carbon index 68ea192a32ca..2d6baf66ec7e 100644 --- a/toolchain/check/testdata/main_run/return_i32.carbon +++ b/toolchain/check/testdata/main_run/return_i32.carbon @@ -167,13 +167,13 @@ fn Run(unused argc: i32, unused argv: i32*) -> i32 { return 0; } // CHECK:STDOUT: %.loc5_48: Core.Form = init_form %i32.loc5_48 [concrete = constants.%.795] // CHECK:STDOUT: %argc.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc5_21: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %argc: %i32 = value_binding argc, %argc.param +// CHECK:STDOUT: %argc: %i32 = wrapper_binding argc, %argc.param // CHECK:STDOUT: %argv.param: %ptr = value_param call_param1 // CHECK:STDOUT: %.loc5_42: type = splice_block %ptr [concrete = constants.%ptr] { // CHECK:STDOUT: %i32.loc5_39: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %ptr: type = ptr_type %i32.loc5_39 [concrete = constants.%ptr] // CHECK:STDOUT: } -// CHECK:STDOUT: %argv: %ptr = value_binding argv, %argv.param +// CHECK:STDOUT: %argv: %ptr = wrapper_binding argv, %argv.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param2 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/namespace/add_to_import.carbon b/toolchain/check/testdata/namespace/add_to_import.carbon index dc1fcbe44f24..cc4ed3fb5d68 100644 --- a/toolchain/check/testdata/namespace/add_to_import.carbon +++ b/toolchain/check/testdata/namespace/add_to_import.carbon @@ -119,7 +119,7 @@ var a: i32 = NS.A(); // CHECK:STDOUT: } // CHECK:STDOUT: %a.var: ref %i32 = var %a.var_patt [concrete] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: ref %i32 = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %i32 = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A() -> out %return.param: %i32 { diff --git a/toolchain/check/testdata/namespace/fail_params.carbon b/toolchain/check/testdata/namespace/fail_params.carbon index f67e97afb067..9a6e43bbf96a 100644 --- a/toolchain/check/testdata/namespace/fail_params.carbon +++ b/toolchain/check/testdata/namespace/fail_params.carbon @@ -85,7 +85,7 @@ fn D(unused T:! type).F() {} // CHECK:STDOUT: %F.decl.loc22: %F.type.14e = fn_decl @F.loc22 [concrete = constants.%F.19f] {} {} // CHECK:STDOUT: %n.param: = value_param call_param0 // CHECK:STDOUT: %.loc32: type = type_literal [concrete = ] -// CHECK:STDOUT: %n: = value_binding n, [concrete = ] +// CHECK:STDOUT: %n: = wrapper_binding n, [concrete = ] // CHECK:STDOUT: %B: = namespace [concrete] {} // CHECK:STDOUT: %.loc38_17.1: type = splice_block %.loc38_17.2 [concrete = type] { // CHECK:STDOUT: %.Self: %type = symbolic_binding .Self [symbolic_self = constants.%.Self] @@ -94,7 +94,7 @@ fn D(unused T:! type).F() {} // CHECK:STDOUT: %T: type = symbolic_binding T, 0 [symbolic = constants.%T.67db0b.1] // CHECK:STDOUT: %x.param: %T.67db0b.1 = value_param call_param0 // CHECK:STDOUT: %T.ref: type = name_ref T, %T [symbolic = constants.%T.67db0b.1] -// CHECK:STDOUT: %x: %T.67db0b.1 = value_binding x, %x.param +// CHECK:STDOUT: %x: %T.67db0b.1 = wrapper_binding x, %x.param // CHECK:STDOUT: %C: = namespace [concrete] {} // CHECK:STDOUT: %D: = namespace [concrete] {} // CHECK:STDOUT: %F.decl.loc48: %F.type.eb3 = fn_decl @F.loc48 [concrete = constants.%F.708] {} { diff --git a/toolchain/check/testdata/namespace/imported.carbon b/toolchain/check/testdata/namespace/imported.carbon index 57db56d2e1d7..21ed0ef66b55 100644 --- a/toolchain/check/testdata/namespace/imported.carbon +++ b/toolchain/check/testdata/namespace/imported.carbon @@ -128,7 +128,7 @@ var package_b: () = package.NS.ChildNS.B(); // CHECK:STDOUT: %.loc4_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_9.3: type = converted %.loc4_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %empty_tuple.type = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %empty_tuple.type = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type = var_pattern %b.patt [concrete = constants.%b.var_patt] @@ -138,7 +138,7 @@ var package_b: () = package.NS.ChildNS.B(); // CHECK:STDOUT: %.loc5_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_9.3: type = converted %.loc5_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: ref %empty_tuple.type = ref_binding b, %b.var [concrete = %b.var] +// CHECK:STDOUT: %b: ref %empty_tuple.type = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %package_a.patt: %pattern_type = ref_binding_pattern package_a [concrete = constants.%package_a.patt] // CHECK:STDOUT: %package_a.var_patt: %pattern_type = var_pattern %package_a.patt [concrete = constants.%package_a.var_patt] @@ -148,7 +148,7 @@ var package_b: () = package.NS.ChildNS.B(); // CHECK:STDOUT: %.loc7_17.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_17.3: type = converted %.loc7_17.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %package_a: ref %empty_tuple.type = ref_binding package_a, %package_a.var [concrete = %package_a.var] +// CHECK:STDOUT: %package_a: ref %empty_tuple.type = wrapper_binding package_a, %package_a.var [concrete = %package_a.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %package_b.patt: %pattern_type = ref_binding_pattern package_b [concrete = constants.%package_b.patt] // CHECK:STDOUT: %package_b.var_patt: %pattern_type = var_pattern %package_b.patt [concrete = constants.%package_b.var_patt] @@ -158,7 +158,7 @@ var package_b: () = package.NS.ChildNS.B(); // CHECK:STDOUT: %.loc8_17.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_17.3: type = converted %.loc8_17.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %package_b: ref %empty_tuple.type = ref_binding package_b, %package_b.var [concrete = %package_b.var] +// CHECK:STDOUT: %package_b: ref %empty_tuple.type = wrapper_binding package_b, %package_b.var [concrete = %package_b.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A [from "implicit.carbon"]; diff --git a/toolchain/check/testdata/namespace/imported_indirect.carbon b/toolchain/check/testdata/namespace/imported_indirect.carbon index 5d525ed4287b..189130dbbcdb 100644 --- a/toolchain/check/testdata/namespace/imported_indirect.carbon +++ b/toolchain/check/testdata/namespace/imported_indirect.carbon @@ -288,7 +288,7 @@ fn G() { Same.F(); } // CHECK:STDOUT: %.loc5_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_9.3: type = converted %.loc5_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %e: ref %empty_tuple.type = ref_binding e, %e.var [concrete = %e.var] +// CHECK:STDOUT: %e: ref %empty_tuple.type = wrapper_binding e, %e.var [concrete = %e.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @D [from "d.carbon"]; diff --git a/toolchain/check/testdata/namespace/merging_with_indirections.carbon b/toolchain/check/testdata/namespace/merging_with_indirections.carbon index c7ee7dff4295..25050b146188 100644 --- a/toolchain/check/testdata/namespace/merging_with_indirections.carbon +++ b/toolchain/check/testdata/namespace/merging_with_indirections.carbon @@ -260,7 +260,7 @@ fn Run() { // CHECK:STDOUT: %NS1.ref: = name_ref NS1, imports.%NS1.acfa4a.2 [concrete = imports.%NS1.acfa4a.2] // CHECK:STDOUT: %A.ref: type = name_ref A, imports.%Other.A [concrete = constants.%A] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %A = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %A = wrapper_binding a, %a.var // CHECK:STDOUT: %a.ref: ref %A = name_ref a, %a // CHECK:STDOUT: %Other.ref.loc13: = name_ref Other, imports.%Other [concrete = imports.%Other] // CHECK:STDOUT: %F.ref.loc13: %F.type = name_ref F, imports.%Other.F [concrete = constants.%F] diff --git a/toolchain/check/testdata/namespace/shadow.carbon b/toolchain/check/testdata/namespace/shadow.carbon index 3c6d907e1568..06e3eb4631b3 100644 --- a/toolchain/check/testdata/namespace/shadow.carbon +++ b/toolchain/check/testdata/namespace/shadow.carbon @@ -159,7 +159,7 @@ fn N.M.B() -> i32 { // CHECK:STDOUT: %.loc26: init %i32 = converted %int_0.loc26, %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc26 [concrete = constants.%int_0.3c0] // CHECK:STDOUT: assign %A.var, %.loc26 // CHECK:STDOUT: %i32.loc26: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %A: ref %i32 = ref_binding A, %A.var +// CHECK:STDOUT: %A: ref %i32 = wrapper_binding A, %A.var // CHECK:STDOUT: %A.ref.loc29: ref %i32 = name_ref A, %A // CHECK:STDOUT: %.loc29: %i32 = acquire_value %A.ref.loc29 // CHECK:STDOUT: %impl.elem0.loc29: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] diff --git a/toolchain/check/testdata/operators/builtin/and.carbon b/toolchain/check/testdata/operators/builtin/and.carbon index f5003b95dcd9..7347877fc110 100644 --- a/toolchain/check/testdata/operators/builtin/and.carbon +++ b/toolchain/check/testdata/operators/builtin/and.carbon @@ -138,7 +138,7 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: } { // CHECK:STDOUT: %x.param: bool = value_param call_param0 // CHECK:STDOUT: %.loc29: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %x: bool = value_binding x, %x.param +// CHECK:STDOUT: %x: bool = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -225,7 +225,7 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: br !.loc23_15 // CHECK:STDOUT: // CHECK:STDOUT: !.loc23_15: -// CHECK:STDOUT: %a: ref bool = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref bool = wrapper_binding a, %a.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.cb1 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.cb1 = var_pattern %b.patt [concrete = constants.%b.var_patt] @@ -264,7 +264,7 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: br !.loc24_15 // CHECK:STDOUT: // CHECK:STDOUT: !.loc24_15: -// CHECK:STDOUT: %b: ref %empty_tuple.type = ref_binding b, %b.var +// CHECK:STDOUT: %b: ref %empty_tuple.type = wrapper_binding b, %b.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.cb1 = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.cb1 = var_pattern %c.patt [concrete = constants.%c.var_patt] @@ -303,7 +303,7 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: br !.loc25_15 // CHECK:STDOUT: // CHECK:STDOUT: !.loc25_15: -// CHECK:STDOUT: %c: ref %empty_tuple.type = ref_binding c, %c.var +// CHECK:STDOUT: %c: ref %empty_tuple.type = wrapper_binding c, %c.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.cb1 = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.cb1 = var_pattern %d.patt [concrete = constants.%d.var_patt] @@ -342,7 +342,7 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: br !.loc26_15 // CHECK:STDOUT: // CHECK:STDOUT: !.loc26_15: -// CHECK:STDOUT: %d: ref %empty_tuple.type = ref_binding d, %d.var +// CHECK:STDOUT: %d: ref %empty_tuple.type = wrapper_binding d, %d.var // CHECK:STDOUT: %Destroy.Op.bound.loc26: = bound_method %d.var, constants.%Destroy.Op.1a2547.1 // CHECK:STDOUT: %Destroy.Op.call.loc26: init %empty_tuple.type = call %Destroy.Op.bound.loc26(%d.var) // CHECK:STDOUT: %Destroy.Op.bound.loc25: = bound_method %c.var, constants.%Destroy.Op.1a2547.1 @@ -398,7 +398,7 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: br !.loc30_15 // CHECK:STDOUT: // CHECK:STDOUT: !.loc30_15: -// CHECK:STDOUT: %a: ref %empty_tuple.type = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %empty_tuple.type = wrapper_binding a, %a.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %a.var, constants.%Destroy.Op.1a2547.1 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%a.var) // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/operators/builtin/assignment.carbon b/toolchain/check/testdata/operators/builtin/assignment.carbon index ae3fb9b4a924..833f6123c7b6 100644 --- a/toolchain/check/testdata/operators/builtin/assignment.carbon +++ b/toolchain/check/testdata/operators/builtin/assignment.carbon @@ -177,7 +177,7 @@ fn Main() { // CHECK:STDOUT: %.loc16: init %i32 = converted %int_12, %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc16 [concrete = constants.%int_12.8c7] // CHECK:STDOUT: assign %a.var, %.loc16 // CHECK:STDOUT: %i32.loc16: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: ref %i32 = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %i32 = wrapper_binding a, %a.var // CHECK:STDOUT: %a.ref.loc17: ref %i32 = name_ref a, %a // CHECK:STDOUT: %int_9: Core.IntLiteral = int_value 9 [concrete = constants.%int_9.988] // CHECK:STDOUT: %impl.elem0.loc17: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] @@ -220,7 +220,7 @@ fn Main() { // CHECK:STDOUT: %.loc19_19.2: %tuple.type.24b = tuple_literal (%i32.loc19_11, %i32.loc19_16) [concrete = constants.%tuple.b59] // CHECK:STDOUT: %.loc19_19.3: type = converted %.loc19_19.2, constants.%tuple.type.e55 [concrete = constants.%tuple.type.e55] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: ref %tuple.type.e55 = ref_binding b, %b.var +// CHECK:STDOUT: %b: ref %tuple.type.e55 = wrapper_binding b, %b.var // CHECK:STDOUT: %b.ref.loc20: ref %tuple.type.e55 = name_ref b, %b // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [concrete = constants.%int_0] // CHECK:STDOUT: %tuple.elem0.loc20: ref %i32 = tuple_access %b.ref.loc20, element0 @@ -275,7 +275,7 @@ fn Main() { // CHECK:STDOUT: %i32.loc23_24: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a.b: type = struct_type {.a: %i32, .b: %i32} [concrete = constants.%struct_type.a.b.b4c] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %struct_type.a.b.b4c = ref_binding c, %c.var +// CHECK:STDOUT: %c: ref %struct_type.a.b.b4c = wrapper_binding c, %c.var // CHECK:STDOUT: %c.ref.loc24: ref %struct_type.a.b.b4c = name_ref c, %c // CHECK:STDOUT: %.loc24_4: ref %i32 = struct_access %c.ref.loc24, element0 // CHECK:STDOUT: %int_3.loc24: Core.IntLiteral = int_value 3 [concrete = constants.%int_3.1ba] @@ -313,7 +313,7 @@ fn Main() { // CHECK:STDOUT: %i32.loc27: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %ptr: type = ptr_type %i32.loc27 [concrete = constants.%ptr.d08] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: ref %ptr.d08 = ref_binding p, %p.var +// CHECK:STDOUT: %p: ref %ptr.d08 = wrapper_binding p, %p.var // CHECK:STDOUT: %p.ref.loc28: ref %ptr.d08 = name_ref p, %p // CHECK:STDOUT: %.loc28_4: %ptr.d08 = acquire_value %p.ref.loc28 // CHECK:STDOUT: %.loc28_3: ref %i32 = deref %.loc28_4 diff --git a/toolchain/check/testdata/operators/builtin/fail_and_or_partial_constant.carbon b/toolchain/check/testdata/operators/builtin/fail_and_or_partial_constant.carbon index 4edb86763cd5..35ec39728e33 100644 --- a/toolchain/check/testdata/operators/builtin/fail_and_or_partial_constant.carbon +++ b/toolchain/check/testdata/operators/builtin/fail_and_or_partial_constant.carbon @@ -86,7 +86,7 @@ fn KnownValueButNonConstantCondition(x: bool) { // CHECK:STDOUT: } { // CHECK:STDOUT: %x.param: bool = value_param call_param0 // CHECK:STDOUT: %.loc4: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %x: bool = value_binding x, %x.param +// CHECK:STDOUT: %x: bool = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -127,7 +127,7 @@ fn KnownValueButNonConstantCondition(x: bool) { // CHECK:STDOUT: br !.loc9_15 // CHECK:STDOUT: // CHECK:STDOUT: !.loc9_15: -// CHECK:STDOUT: %a: ref = ref_binding a, [concrete = ] +// CHECK:STDOUT: %a: = wrapper_binding a, [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: = ref_binding_pattern b [concrete = ] // CHECK:STDOUT: %b.var_patt: = var_pattern %b.patt [concrete = ] @@ -164,7 +164,7 @@ fn KnownValueButNonConstantCondition(x: bool) { // CHECK:STDOUT: br !.loc14_15 // CHECK:STDOUT: // CHECK:STDOUT: !.loc14_15: -// CHECK:STDOUT: %b: ref = ref_binding b, [concrete = ] +// CHECK:STDOUT: %b: = wrapper_binding b, [concrete = ] // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: @@ -206,7 +206,7 @@ fn KnownValueButNonConstantCondition(x: bool) { // CHECK:STDOUT: } { // CHECK:STDOUT: %x.param: bool = value_param call_param0 // CHECK:STDOUT: %.loc4: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %x: bool = value_binding x, %x.param +// CHECK:STDOUT: %x: bool = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -247,7 +247,7 @@ fn KnownValueButNonConstantCondition(x: bool) { // CHECK:STDOUT: br !.loc11_15 // CHECK:STDOUT: // CHECK:STDOUT: !.loc11_15: -// CHECK:STDOUT: %c: ref = ref_binding c, [concrete = ] +// CHECK:STDOUT: %c: = wrapper_binding c, [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: = ref_binding_pattern d [concrete = ] // CHECK:STDOUT: %d.var_patt: = var_pattern %d.patt [concrete = ] @@ -284,7 +284,7 @@ fn KnownValueButNonConstantCondition(x: bool) { // CHECK:STDOUT: br !.loc16_15 // CHECK:STDOUT: // CHECK:STDOUT: !.loc16_15: -// CHECK:STDOUT: %d: ref = ref_binding d, [concrete = ] +// CHECK:STDOUT: %d: = wrapper_binding d, [concrete = ] // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/operators/builtin/fail_assignment_to_non_assignable.carbon b/toolchain/check/testdata/operators/builtin/fail_assignment_to_non_assignable.carbon index 06c50dff8ac2..48791b1a784b 100644 --- a/toolchain/check/testdata/operators/builtin/fail_assignment_to_non_assignable.carbon +++ b/toolchain/check/testdata/operators/builtin/fail_assignment_to_non_assignable.carbon @@ -256,7 +256,7 @@ fn Main() { // CHECK:STDOUT: %.loc33: init %i32 = converted %int_0, %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc33 [concrete = constants.%int_0.3c0] // CHECK:STDOUT: assign %n.var, %.loc33 // CHECK:STDOUT: %i32.loc33: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: ref %i32 = ref_binding n, %n.var +// CHECK:STDOUT: %n: ref %i32 = wrapper_binding n, %n.var // CHECK:STDOUT: %n.ref.loc38_4: ref %i32 = name_ref n, %n // CHECK:STDOUT: %n.ref.loc38_7: ref %i32 = name_ref n, %n // CHECK:STDOUT: %.loc38_8.1: %tuple.type.e55 = tuple_literal (%n.ref.loc38_4, %n.ref.loc38_7) @@ -362,7 +362,7 @@ fn Main() { // CHECK:STDOUT: %T.as.DefaultOrUnformed.impl.Op.call: init %i32 = call %T.as.DefaultOrUnformed.impl.Op.specific_fn() // CHECK:STDOUT: assign %a.var, %T.as.DefaultOrUnformed.impl.Op.call // CHECK:STDOUT: %i32.loc56: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: ref %i32 = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %i32 = wrapper_binding a, %a.var // CHECK:STDOUT: %true.loc61: bool = bool_literal true [concrete = constants.%true] // CHECK:STDOUT: if %true.loc61 br !if.expr.then.loc61 else br !if.expr.else.loc61 // CHECK:STDOUT: diff --git a/toolchain/check/testdata/operators/builtin/fail_redundant_compound_access.carbon b/toolchain/check/testdata/operators/builtin/fail_redundant_compound_access.carbon index 298c26a7f235..59b03b28bc06 100644 --- a/toolchain/check/testdata/operators/builtin/fail_redundant_compound_access.carbon +++ b/toolchain/check/testdata/operators/builtin/fail_redundant_compound_access.carbon @@ -150,7 +150,7 @@ fn Main() { // CHECK:STDOUT: %.loc18: init %i32 = converted %int_3, %Core.IntLiteral.as.ImplicitAs.impl.Convert.call [concrete = constants.%int_3.410] // CHECK:STDOUT: assign %a.var, %.loc18 // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: ref %i32 = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %i32 = wrapper_binding a, %a.var // CHECK:STDOUT: %a.ref.loc23_3: ref %i32 = name_ref a, %a // CHECK:STDOUT: %a.ref.loc23_7: ref %i32 = name_ref a, %a // CHECK:STDOUT: %a.ref.loc23_10: ref %i32 = name_ref a, %a diff --git a/toolchain/check/testdata/operators/builtin/fail_type_mismatch.carbon b/toolchain/check/testdata/operators/builtin/fail_type_mismatch.carbon index 617649f5b68e..b8bb0853b062 100644 --- a/toolchain/check/testdata/operators/builtin/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/operators/builtin/fail_type_mismatch.carbon @@ -74,7 +74,7 @@ fn Main() { // CHECK:STDOUT: %.loc23_24.2: = not [concrete = ] // CHECK:STDOUT: assign %x.var, // CHECK:STDOUT: %.loc23_17: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %x: ref bool = ref_binding x, %x.var +// CHECK:STDOUT: %x: ref bool = wrapper_binding x, %x.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %x.var, constants.%Destroy.Op // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%x.var) // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/operators/builtin/fail_type_mismatch_assignment.carbon b/toolchain/check/testdata/operators/builtin/fail_type_mismatch_assignment.carbon index c9b3ebb967d3..0f1127b9f4ac 100644 --- a/toolchain/check/testdata/operators/builtin/fail_type_mismatch_assignment.carbon +++ b/toolchain/check/testdata/operators/builtin/fail_type_mismatch_assignment.carbon @@ -101,7 +101,7 @@ fn Main() { // CHECK:STDOUT: %.loc16: init %i32 = converted %int_3, %Core.IntLiteral.as.ImplicitAs.impl.Convert.call [concrete = constants.%int_3.410] // CHECK:STDOUT: assign %a.var, %.loc16 // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: ref %i32 = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %i32 = wrapper_binding a, %a.var // CHECK:STDOUT: %a.ref: ref %i32 = name_ref a, %a // CHECK:STDOUT: %float: Core.FloatLiteral = float_literal_value 56e-1 [concrete = constants.%float] // CHECK:STDOUT: %.loc24: %i32 = converted %float, [concrete = ] diff --git a/toolchain/check/testdata/operators/builtin/or.carbon b/toolchain/check/testdata/operators/builtin/or.carbon index a6383f68f564..9d5aed44e8dc 100644 --- a/toolchain/check/testdata/operators/builtin/or.carbon +++ b/toolchain/check/testdata/operators/builtin/or.carbon @@ -138,7 +138,7 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: } { // CHECK:STDOUT: %x.param: bool = value_param call_param0 // CHECK:STDOUT: %.loc29: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %x: bool = value_binding x, %x.param +// CHECK:STDOUT: %x: bool = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -227,7 +227,7 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: br !.loc23_15 // CHECK:STDOUT: // CHECK:STDOUT: !.loc23_15: -// CHECK:STDOUT: %a: ref bool = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref bool = wrapper_binding a, %a.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.831 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.831 = var_pattern %b.patt [concrete = constants.%b.var_patt] @@ -268,7 +268,7 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: br !.loc24_15 // CHECK:STDOUT: // CHECK:STDOUT: !.loc24_15: -// CHECK:STDOUT: %b: ref bool = ref_binding b, %b.var +// CHECK:STDOUT: %b: ref bool = wrapper_binding b, %b.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.831 = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.831 = var_pattern %c.patt [concrete = constants.%c.var_patt] @@ -309,7 +309,7 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: br !.loc25_15 // CHECK:STDOUT: // CHECK:STDOUT: !.loc25_15: -// CHECK:STDOUT: %c: ref bool = ref_binding c, %c.var +// CHECK:STDOUT: %c: ref bool = wrapper_binding c, %c.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.cb1 = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.cb1 = var_pattern %d.patt [concrete = constants.%d.var_patt] @@ -349,7 +349,7 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: br !.loc26_15 // CHECK:STDOUT: // CHECK:STDOUT: !.loc26_15: -// CHECK:STDOUT: %d: ref %empty_tuple.type = ref_binding d, %d.var +// CHECK:STDOUT: %d: ref %empty_tuple.type = wrapper_binding d, %d.var // CHECK:STDOUT: %Destroy.Op.bound.loc26: = bound_method %d.var, constants.%Destroy.Op.1a2547.1 // CHECK:STDOUT: %Destroy.Op.call.loc26: init %empty_tuple.type = call %Destroy.Op.bound.loc26(%d.var) // CHECK:STDOUT: %Destroy.Op.bound.loc25: = bound_method %c.var, constants.%Destroy.Op.1a2547.2 @@ -407,7 +407,7 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: br !.loc30_15 // CHECK:STDOUT: // CHECK:STDOUT: !.loc30_15: -// CHECK:STDOUT: %a: ref bool = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref bool = wrapper_binding a, %a.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %a.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%a.var) // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/operators/builtin/unary_op.carbon b/toolchain/check/testdata/operators/builtin/unary_op.carbon index 35e2960efdd8..3ba7f900af03 100644 --- a/toolchain/check/testdata/operators/builtin/unary_op.carbon +++ b/toolchain/check/testdata/operators/builtin/unary_op.carbon @@ -97,7 +97,7 @@ fn Constant() { // CHECK:STDOUT: %.loc15_20.2: Core.Form = init_form %.loc15_20.1 [concrete = constants.%.f34] // CHECK:STDOUT: %b.param: bool = value_param call_param0 // CHECK:STDOUT: %.loc15_11: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %b: bool = value_binding b, %b.param +// CHECK:STDOUT: %b: bool = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param1 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -105,12 +105,12 @@ fn Constant() { // CHECK:STDOUT: %not_true.patt: %pattern_type.831 = value_binding_pattern not_true [concrete = constants.%not_true.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc19: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %not_true: bool = value_binding not_true, @__global_init.%.loc19 +// CHECK:STDOUT: %not_true: bool = wrapper_binding not_true, @__global_init.%.loc19 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %not_false.patt: %pattern_type.831 = value_binding_pattern not_false [concrete = constants.%not_false.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc20: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %not_false: bool = value_binding not_false, @__global_init.%.loc20 +// CHECK:STDOUT: %not_false: bool = wrapper_binding not_false, @__global_init.%.loc20 // CHECK:STDOUT: %Constant.decl: %Constant.type = fn_decl @Constant [concrete = constants.%Constant] {} {} // CHECK:STDOUT: } // CHECK:STDOUT: @@ -156,7 +156,7 @@ fn Constant() { // CHECK:STDOUT: br !.loc23_15 // CHECK:STDOUT: // CHECK:STDOUT: !.loc23_15: -// CHECK:STDOUT: %a: ref %empty_tuple.type = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %empty_tuple.type = wrapper_binding a, %a.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.831 = ref_binding_pattern b [concrete = constants.%b.patt.454] // CHECK:STDOUT: %b.var_patt: %pattern_type.831 = var_pattern %b.patt [concrete = constants.%b.var_patt] @@ -188,7 +188,7 @@ fn Constant() { // CHECK:STDOUT: br !.loc24_15 // CHECK:STDOUT: // CHECK:STDOUT: !.loc24_15: -// CHECK:STDOUT: %b: ref bool = ref_binding b, %b.var +// CHECK:STDOUT: %b: ref bool = wrapper_binding b, %b.var // CHECK:STDOUT: %Destroy.Op.bound.loc24: = bound_method %b.var, constants.%Destroy.Op.1a2547.1 // CHECK:STDOUT: %Destroy.Op.call.loc24: init %empty_tuple.type = call %Destroy.Op.bound.loc24(%b.var) // CHECK:STDOUT: %Destroy.Op.bound.loc23: = bound_method %a.var, constants.%Destroy.Op.1a2547.2 diff --git a/toolchain/check/testdata/operators/overloaded/eq.carbon b/toolchain/check/testdata/operators/overloaded/eq.carbon index 69fdba813bb4..00d608d60ffd 100644 --- a/toolchain/check/testdata/operators/overloaded/eq.carbon +++ b/toolchain/check/testdata/operators/overloaded/eq.carbon @@ -158,10 +158,10 @@ fn TestLhsBad(a: D, b: C) -> bool { // CHECK:STDOUT: %.loc11_29.2: Core.Form = init_form %.loc11_29.1 [concrete = constants.%.f34] // CHECK:STDOUT: %a.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc11_17: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %a: %C = value_binding a, %a.param +// CHECK:STDOUT: %a: %C = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %C = value_param call_param1 // CHECK:STDOUT: %C.ref.loc11_23: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %b: %C = value_binding b, %b.param +// CHECK:STDOUT: %b: %C = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -177,10 +177,10 @@ fn TestLhsBad(a: D, b: C) -> bool { // CHECK:STDOUT: %.loc15_32.2: Core.Form = init_form %.loc15_32.1 [concrete = constants.%.f34] // CHECK:STDOUT: %a.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc15_20: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %a: %C = value_binding a, %a.param +// CHECK:STDOUT: %a: %C = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %C = value_param call_param1 // CHECK:STDOUT: %C.ref.loc15_26: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %b: %C = value_binding b, %b.param +// CHECK:STDOUT: %b: %C = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -199,10 +199,10 @@ fn TestLhsBad(a: D, b: C) -> bool { // CHECK:STDOUT: %.loc7_34.2: Core.Form = init_form %.loc7_34.1 [concrete = constants.%.f34] // CHECK:STDOUT: %self.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc7_18: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %self: %C = value_binding self, %self.param +// CHECK:STDOUT: %self: %C = wrapper_binding self, %self.param // CHECK:STDOUT: %other.param: %C = value_param call_param1 // CHECK:STDOUT: %C.ref.loc7_28: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %other: %C = value_binding other, %other.param +// CHECK:STDOUT: %other: %C = wrapper_binding other, %other.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -218,10 +218,10 @@ fn TestLhsBad(a: D, b: C) -> bool { // CHECK:STDOUT: %.loc8_37.2: Core.Form = init_form %.loc8_37.1 [concrete = constants.%.f34] // CHECK:STDOUT: %self.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc8_21: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %self: %C = value_binding self, %self.param +// CHECK:STDOUT: %self: %C = wrapper_binding self, %self.param // CHECK:STDOUT: %other.param: %C = value_param call_param1 // CHECK:STDOUT: %C.ref.loc8_31: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %other: %C = value_binding other, %other.param +// CHECK:STDOUT: %other: %C = wrapper_binding other, %other.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -323,10 +323,10 @@ fn TestLhsBad(a: D, b: C) -> bool { // CHECK:STDOUT: %.loc6_29.2: Core.Form = init_form %.loc6_29.1 [concrete = constants.%.f34] // CHECK:STDOUT: %a.param: %D = value_param call_param0 // CHECK:STDOUT: %D.ref.loc6_17: type = name_ref D, file.%D.decl [concrete = constants.%D] -// CHECK:STDOUT: %a: %D = value_binding a, %a.param +// CHECK:STDOUT: %a: %D = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %D = value_param call_param1 // CHECK:STDOUT: %D.ref.loc6_23: type = name_ref D, file.%D.decl [concrete = constants.%D] -// CHECK:STDOUT: %b: %D = value_binding b, %b.param +// CHECK:STDOUT: %b: %D = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -342,10 +342,10 @@ fn TestLhsBad(a: D, b: C) -> bool { // CHECK:STDOUT: %.loc14_32.2: Core.Form = init_form %.loc14_32.1 [concrete = constants.%.f34] // CHECK:STDOUT: %a.param: %D = value_param call_param0 // CHECK:STDOUT: %D.ref.loc14_20: type = name_ref D, file.%D.decl [concrete = constants.%D] -// CHECK:STDOUT: %a: %D = value_binding a, %a.param +// CHECK:STDOUT: %a: %D = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %D = value_param call_param1 // CHECK:STDOUT: %D.ref.loc14_26: type = name_ref D, file.%D.decl [concrete = constants.%D] -// CHECK:STDOUT: %b: %D = value_binding b, %b.param +// CHECK:STDOUT: %b: %D = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -453,10 +453,10 @@ fn TestLhsBad(a: D, b: C) -> bool { // CHECK:STDOUT: %.loc12_30.2: Core.Form = init_form %.loc12_30.1 [concrete = constants.%.f34] // CHECK:STDOUT: %a.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %a: %C = value_binding a, %a.param +// CHECK:STDOUT: %a: %C = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %D = value_param call_param1 // CHECK:STDOUT: %D.ref: type = name_ref D, file.%D.decl [concrete = constants.%D] -// CHECK:STDOUT: %b: %D = value_binding b, %b.param +// CHECK:STDOUT: %b: %D = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -472,10 +472,10 @@ fn TestLhsBad(a: D, b: C) -> bool { // CHECK:STDOUT: %.loc20_30.2: Core.Form = init_form %.loc20_30.1 [concrete = constants.%.f34] // CHECK:STDOUT: %a.param: %D = value_param call_param0 // CHECK:STDOUT: %D.ref: type = name_ref D, file.%D.decl [concrete = constants.%D] -// CHECK:STDOUT: %a: %D = value_binding a, %a.param +// CHECK:STDOUT: %a: %D = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %C = value_param call_param1 // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %b: %C = value_binding b, %b.param +// CHECK:STDOUT: %b: %C = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -494,10 +494,10 @@ fn TestLhsBad(a: D, b: C) -> bool { // CHECK:STDOUT: %.loc8_34.2: Core.Form = init_form %.loc8_34.1 [concrete = constants.%.f34] // CHECK:STDOUT: %self.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc8_18: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %self: %C = value_binding self, %self.param +// CHECK:STDOUT: %self: %C = wrapper_binding self, %self.param // CHECK:STDOUT: %other.param: %C = value_param call_param1 // CHECK:STDOUT: %C.ref.loc8_28: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %other: %C = value_binding other, %other.param +// CHECK:STDOUT: %other: %C = wrapper_binding other, %other.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -513,10 +513,10 @@ fn TestLhsBad(a: D, b: C) -> bool { // CHECK:STDOUT: %.loc9_37.2: Core.Form = init_form %.loc9_37.1 [concrete = constants.%.f34] // CHECK:STDOUT: %self.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc9_21: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %self: %C = value_binding self, %self.param +// CHECK:STDOUT: %self: %C = wrapper_binding self, %self.param // CHECK:STDOUT: %other.param: %C = value_param call_param1 // CHECK:STDOUT: %C.ref.loc9_31: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %other: %C = value_binding other, %other.param +// CHECK:STDOUT: %other: %C = wrapper_binding other, %other.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/fail_assign_non_ref.carbon b/toolchain/check/testdata/operators/overloaded/fail_assign_non_ref.carbon index b06bf57336c2..8d3a4df5c59e 100644 --- a/toolchain/check/testdata/operators/overloaded/fail_assign_non_ref.carbon +++ b/toolchain/check/testdata/operators/overloaded/fail_assign_non_ref.carbon @@ -121,7 +121,7 @@ fn TestAddAssignNonRef(a: C, b: C) { // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %a: %C = value_binding a, %a.param +// CHECK:STDOUT: %a: %C = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %TestAddAssignNonRef.decl: %TestAddAssignNonRef.type = fn_decl @TestAddAssignNonRef [concrete = constants.%TestAddAssignNonRef] { // CHECK:STDOUT: %a.param_patt: %pattern_type.4a7 = value_param_pattern [concrete = constants.%a.param_patt] @@ -131,10 +131,10 @@ fn TestAddAssignNonRef(a: C, b: C) { // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc37_27: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %a: %C = value_binding a, %a.param +// CHECK:STDOUT: %a: %C = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %C = value_param call_param1 // CHECK:STDOUT: %C.ref.loc37_33: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %b: %C = value_binding b, %b.param +// CHECK:STDOUT: %b: %C = wrapper_binding b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -145,7 +145,7 @@ fn TestAddAssignNonRef(a: C, b: C) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: ref %C = ref_param call_param0 // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %self: ref %C = ref_binding self, %self.param +// CHECK:STDOUT: %self: ref %C = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %Inc.impl_witness_table = impl_witness_table (%C.as.Inc.impl.Op.decl), @C.as.Inc.impl [concrete] // CHECK:STDOUT: %Inc.impl_witness: = impl_witness %Inc.impl_witness_table [concrete = constants.%Inc.impl_witness] @@ -166,10 +166,10 @@ fn TestAddAssignNonRef(a: C, b: C) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: ref %C = ref_param call_param0 // CHECK:STDOUT: %C.ref.loc23_19: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %self: ref %C = ref_binding self, %self.param +// CHECK:STDOUT: %self: ref %C = wrapper_binding self, %self.param // CHECK:STDOUT: %other.param: %C = value_param call_param1 // CHECK:STDOUT: %C.ref.loc23_29: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %other: %C = value_binding other, %other.param +// CHECK:STDOUT: %other: %C = wrapper_binding other, %other.param // CHECK:STDOUT: } // CHECK:STDOUT: %AddAssignWith.impl_witness_table = impl_witness_table (%C.as.AddAssignWith.impl.Op.decl), @C.as.AddAssignWith.impl [concrete] // CHECK:STDOUT: %AddAssignWith.impl_witness: = impl_witness %AddAssignWith.impl_witness_table [concrete = constants.%AddAssignWith.impl_witness] diff --git a/toolchain/check/testdata/operators/overloaded/fail_error_recovery.carbon b/toolchain/check/testdata/operators/overloaded/fail_error_recovery.carbon index 76f5445ac817..79dd3cc786e9 100644 --- a/toolchain/check/testdata/operators/overloaded/fail_error_recovery.carbon +++ b/toolchain/check/testdata/operators/overloaded/fail_error_recovery.carbon @@ -76,7 +76,7 @@ fn G(n: i32) { // CHECK:STDOUT: } { // CHECK:STDOUT: %n.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: %i32 = value_binding n, %n.param +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, %n.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/operators/overloaded/fail_no_impl.carbon b/toolchain/check/testdata/operators/overloaded/fail_no_impl.carbon index a5d27f76d0df..0836409e086c 100644 --- a/toolchain/check/testdata/operators/overloaded/fail_no_impl.carbon +++ b/toolchain/check/testdata/operators/overloaded/fail_no_impl.carbon @@ -119,7 +119,7 @@ fn TestRef(b: C) { // CHECK:STDOUT: %.loc19: Core.Form = init_form %C.ref.loc19_23 [concrete = constants.%.79c] // CHECK:STDOUT: %a.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc19_17: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %a: %C = value_binding a, %a.param +// CHECK:STDOUT: %a: %C = wrapper_binding a, %a.param // CHECK:STDOUT: %return.param: ref %C = out_param call_param1 // CHECK:STDOUT: %return: ref %C = return_slot %return.param // CHECK:STDOUT: } @@ -135,10 +135,10 @@ fn TestRef(b: C) { // CHECK:STDOUT: %.loc27: Core.Form = init_form %C.ref.loc27_30 [concrete = constants.%.79c] // CHECK:STDOUT: %a.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc27_18: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %a: %C = value_binding a, %a.param +// CHECK:STDOUT: %a: %C = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %C = value_param call_param1 // CHECK:STDOUT: %C.ref.loc27_24: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %b: %C = value_binding b, %b.param +// CHECK:STDOUT: %b: %C = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref %C = out_param call_param2 // CHECK:STDOUT: %return: ref %C = return_slot %return.param // CHECK:STDOUT: } @@ -148,7 +148,7 @@ fn TestRef(b: C) { // CHECK:STDOUT: } { // CHECK:STDOUT: %b.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc35: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %b: %C = value_binding b, %b.param +// CHECK:STDOUT: %b: %C = wrapper_binding b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -185,7 +185,7 @@ fn TestRef(b: C) { // CHECK:STDOUT: %.loc36_3: init %C = converted %.loc36_15.1, %.loc36_15.2 [concrete = constants.%C.val] // CHECK:STDOUT: assign %a.var, %.loc36_3 // CHECK:STDOUT: %C.ref.loc36: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %a: ref %C = ref_binding a, %a.var +// CHECK:STDOUT: %a: ref %C = wrapper_binding a, %a.var // CHECK:STDOUT: %a.ref.loc41: ref %C = name_ref a, %a // CHECK:STDOUT: %b.ref: %C = name_ref b, %b // CHECK:STDOUT: %a.ref.loc46: ref %C = name_ref a, %a diff --git a/toolchain/check/testdata/operators/overloaded/implicit_as.carbon b/toolchain/check/testdata/operators/overloaded/implicit_as.carbon index 9508cd50857f..f0801abca61a 100644 --- a/toolchain/check/testdata/operators/overloaded/implicit_as.carbon +++ b/toolchain/check/testdata/operators/overloaded/implicit_as.carbon @@ -167,7 +167,7 @@ fn Test() { // CHECK:STDOUT: } { // CHECK:STDOUT: %n.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: %i32 = value_binding n, %n.param +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, %n.param // CHECK:STDOUT: } // CHECK:STDOUT: %Sink_X.decl: %Sink_X.type = fn_decl @Sink_X [concrete = constants.%Sink_X] { // CHECK:STDOUT: %x.param_patt: %pattern_type.6cb = value_param_pattern [concrete = constants.%x.param_patt] @@ -175,7 +175,7 @@ fn Test() { // CHECK:STDOUT: } { // CHECK:STDOUT: %x.param: %X = value_param call_param0 // CHECK:STDOUT: %X.ref: type = name_ref X, file.%X.decl [concrete = constants.%X] -// CHECK:STDOUT: %x: %X = value_binding x, %x.param +// CHECK:STDOUT: %x: %X = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %Source.decl: %Source.type = fn_decl @Source [concrete = constants.%Source] { // CHECK:STDOUT: %T.patt.loc31_12.1: %pattern_type.98f = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc31_12.2 (constants.%T.patt.d47)] @@ -206,7 +206,7 @@ fn Test() { // CHECK:STDOUT: %.loc20_28: Core.Form = init_form %X.ref [concrete = constants.%.325] // CHECK:STDOUT: %self.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %self: %i32 = value_binding self, %self.param +// CHECK:STDOUT: %self: %i32 = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref %X = out_param call_param1 // CHECK:STDOUT: %return: ref %X = return_slot %return.param // CHECK:STDOUT: } @@ -231,7 +231,7 @@ fn Test() { // CHECK:STDOUT: %.loc24_26: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %self.param: %X = value_param call_param0 // CHECK:STDOUT: %X.ref: type = name_ref X, file.%X.decl [concrete = constants.%X] -// CHECK:STDOUT: %self: %X = value_binding self, %self.param +// CHECK:STDOUT: %self: %X = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/index.carbon b/toolchain/check/testdata/operators/overloaded/index.carbon index 8975e0199fc0..fd3dc62642d6 100644 --- a/toolchain/check/testdata/operators/overloaded/index.carbon +++ b/toolchain/check/testdata/operators/overloaded/index.carbon @@ -263,10 +263,10 @@ fn F() { // CHECK:STDOUT: %Self.as_type.loc5_9.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc5_9.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc5_9.3: type = converted %Self.ref, %Self.as_type.loc5_9.2 [symbolic = %Self.as_type.loc5_9.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @IndexWith.WithSelf.At.%Self.as_type.loc5_9.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @IndexWith.WithSelf.At.%Self.as_type.loc5_9.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: %subscript.param: @IndexWith.WithSelf.At.%SubscriptType (%SubscriptType) = value_param call_param1 // CHECK:STDOUT: %SubscriptType.ref: type = name_ref SubscriptType, @IndexWith.%SubscriptType.loc4_34.2 [symbolic = %SubscriptType (constants.%SubscriptType)] -// CHECK:STDOUT: %subscript: @IndexWith.WithSelf.At.%SubscriptType (%SubscriptType) = value_binding subscript, %subscript.param +// CHECK:STDOUT: %subscript: @IndexWith.WithSelf.At.%SubscriptType (%SubscriptType) = wrapper_binding subscript, %subscript.param // CHECK:STDOUT: %return.param: ref @IndexWith.WithSelf.At.%ElementType (%ElementType) = out_param call_param2 // CHECK:STDOUT: %return: ref @IndexWith.WithSelf.At.%ElementType (%ElementType) = return_slot %return.param // CHECK:STDOUT: } @@ -472,13 +472,13 @@ fn F() { // CHECK:STDOUT: %.loc9_48.3: Core.Form = init_form %.loc9_48.2 [concrete = constants.%.262] // CHECK:STDOUT: %self.param: %C = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @C.as.IndexWith.impl.%C.ref [concrete = constants.%C] -// CHECK:STDOUT: %self: %C = value_binding self, %self.param +// CHECK:STDOUT: %self: %C = wrapper_binding self, %self.param // CHECK:STDOUT: %subscript.param: %empty_tuple.type = value_param call_param1 // CHECK:STDOUT: %.loc9_41.1: type = splice_block %.loc9_41.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc9_41.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc9_41.3: type = converted %.loc9_41.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %subscript: %empty_tuple.type = value_binding subscript, %subscript.param +// CHECK:STDOUT: %subscript: %empty_tuple.type = wrapper_binding subscript, %subscript.param // CHECK:STDOUT: %return.param: ref %empty_tuple.type = out_param call_param2 // CHECK:STDOUT: %return: ref %empty_tuple.type = return_slot %return.param // CHECK:STDOUT: } @@ -539,7 +539,7 @@ fn F() { // CHECK:STDOUT: %.loc15_15.5: ref %C = temporary %.loc15_15.2, %.loc15_15.4 [concrete = constants.%.115] // CHECK:STDOUT: %.loc15_15.6: %C = acquire_value %.loc15_15.5 [concrete = constants.%C.val] // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %c: %C = value_binding c, %.loc15_15.6 +// CHECK:STDOUT: %c: %C = wrapper_binding c, %.loc15_15.6 // CHECK:STDOUT: %c.ref: %C = name_ref c, %c // CHECK:STDOUT: %.loc23: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call constants.%Destroy.Op.bound(constants.%.115) diff --git a/toolchain/check/testdata/operators/overloaded/index_with_prelude.carbon b/toolchain/check/testdata/operators/overloaded/index_with_prelude.carbon index db3452ba6534..fc4c375d49ba 100644 --- a/toolchain/check/testdata/operators/overloaded/index_with_prelude.carbon +++ b/toolchain/check/testdata/operators/overloaded/index_with_prelude.carbon @@ -186,7 +186,7 @@ let x: i32 = c[0]; // CHECK:STDOUT: %.loc14_25.4: ref %SubscriptType.f8f = temporary %.loc14_25.1, %.loc14_25.3 [concrete = constants.%.b1d] // CHECK:STDOUT: %.loc14_25.5: %SubscriptType.f8f = acquire_value %.loc14_25.4 [concrete = constants.%SubscriptType.val] // CHECK:STDOUT: %SubscriptType.ref: type = name_ref SubscriptType, %SubscriptType.decl [concrete = constants.%SubscriptType.f8f] -// CHECK:STDOUT: %s: %SubscriptType.f8f = value_binding s, %.loc14_25.5 +// CHECK:STDOUT: %s: %SubscriptType.f8f = wrapper_binding s, %.loc14_25.5 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.98b = value_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: } @@ -196,14 +196,14 @@ let x: i32 = c[0]; // CHECK:STDOUT: %.loc15_13.4: ref %C = temporary %.loc15_13.1, %.loc15_13.3 [concrete = constants.%.115] // CHECK:STDOUT: %.loc15_13.5: %C = acquire_value %.loc15_13.4 [concrete = constants.%C.val] // CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [concrete = constants.%C] -// CHECK:STDOUT: %c: %C = value_binding c, %.loc15_13.5 +// CHECK:STDOUT: %c: %C = wrapper_binding c, %.loc15_13.5 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %x.patt: %pattern_type.67c = value_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc16_25.1: ref %ElementType = temporary @__global_init.%.loc16, @__global_init.%C.as.IndexWith.impl.At.call // CHECK:STDOUT: %.loc16_25.2: %ElementType = acquire_value %.loc16_25.1 // CHECK:STDOUT: %ElementType.ref: type = name_ref ElementType, %ElementType.decl [concrete = constants.%ElementType] -// CHECK:STDOUT: %x: %ElementType = value_binding x, %.loc16_25.2 +// CHECK:STDOUT: %x: %ElementType = wrapper_binding x, %.loc16_25.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @C.as.IndexWith.impl: %C.ref as %.loc8_41 { @@ -222,10 +222,10 @@ let x: i32 = c[0]; // CHECK:STDOUT: %.loc9_58.2: Core.Form = init_form %ElementType.ref [concrete = constants.%.4d0] // CHECK:STDOUT: %self.param: %C = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @C.as.IndexWith.impl.%C.ref [concrete = constants.%C] -// CHECK:STDOUT: %self: %C = value_binding self, %self.param +// CHECK:STDOUT: %self: %C = wrapper_binding self, %self.param // CHECK:STDOUT: %subscript.param: %SubscriptType.f8f = value_param call_param1 // CHECK:STDOUT: %SubscriptType.ref: type = name_ref SubscriptType, file.%SubscriptType.decl [concrete = constants.%SubscriptType.f8f] -// CHECK:STDOUT: %subscript: %SubscriptType.f8f = value_binding subscript, %subscript.param +// CHECK:STDOUT: %subscript: %SubscriptType.f8f = wrapper_binding subscript, %subscript.param // CHECK:STDOUT: %return.param: ref %ElementType = out_param call_param2 // CHECK:STDOUT: %return: ref %ElementType = return_slot %return.param // CHECK:STDOUT: } @@ -390,7 +390,7 @@ let x: i32 = c[0]; // CHECK:STDOUT: %.loc14_13.2: %tuple.type.24b = tuple_literal (%C.ref.loc14_9, %C.ref.loc14_12) [concrete = constants.%tuple.d95] // CHECK:STDOUT: %.loc14_13.3: type = converted %.loc14_13.2, constants.%tuple.type.748 [concrete = constants.%tuple.type.748] // CHECK:STDOUT: } -// CHECK:STDOUT: %s: %tuple.type.748 = value_binding s, %.loc14_34 +// CHECK:STDOUT: %s: %tuple.type.748 = wrapper_binding s, %.loc14_34 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %e.patt: %pattern_type.98b = value_binding_pattern e [concrete = constants.%e.patt] // CHECK:STDOUT: } @@ -401,7 +401,7 @@ let x: i32 = c[0]; // CHECK:STDOUT: %.loc15_15.4: %C = as_compatible %tuple.loc15 [concrete = constants.%empty_tuple.4db] // CHECK:STDOUT: %.loc15_15.5: %C = converted @__global_init.%tuple.type.as.IndexWith.impl.At.call, %.loc15_15.4 [concrete = constants.%empty_tuple.4db] // CHECK:STDOUT: %C.ref.loc15: type = name_ref C, %C.decl [concrete = constants.%C] -// CHECK:STDOUT: %e: %C = value_binding e, %.loc15_15.5 +// CHECK:STDOUT: %e: %C = wrapper_binding e, %.loc15_15.5 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @tuple.type.as.IndexWith.impl: %.loc8_11.2 as %.loc8_48 { @@ -417,13 +417,13 @@ let x: i32 = c[0]; // CHECK:STDOUT: %.loc9_53: Core.Form = init_form %C.ref [concrete = constants.%.a44] // CHECK:STDOUT: %self.param: %tuple.type.748 = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @tuple.type.as.IndexWith.impl.%.loc8_11.2 [concrete = constants.%tuple.type.748] -// CHECK:STDOUT: %self: %tuple.type.748 = value_binding self, %self.param +// CHECK:STDOUT: %self: %tuple.type.748 = wrapper_binding self, %self.param // CHECK:STDOUT: %subscript.param: Core.IntLiteral = value_param call_param1 // CHECK:STDOUT: %.loc9_37: type = splice_block %IntLiteral.ref [concrete = Core.IntLiteral] { // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [concrete = imports.%Core] // CHECK:STDOUT: %IntLiteral.ref: type = name_ref IntLiteral, imports.%Core.IntLiteral [concrete = Core.IntLiteral] // CHECK:STDOUT: } -// CHECK:STDOUT: %subscript: Core.IntLiteral = value_binding subscript, %subscript.param +// CHECK:STDOUT: %subscript: Core.IntLiteral = wrapper_binding subscript, %subscript.param // CHECK:STDOUT: %return.param: ref %C = out_param call_param2 // CHECK:STDOUT: %return: ref %C = return_slot %return.param // CHECK:STDOUT: } @@ -580,12 +580,12 @@ let x: i32 = c[0]; // CHECK:STDOUT: %.loc14_13.4: ref %C = temporary %.loc14_13.1, %.loc14_13.3 [concrete = constants.%.115] // CHECK:STDOUT: %.loc14_13.5: %C = acquire_value %.loc14_13.4 [concrete = constants.%C.val] // CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [concrete = constants.%C] -// CHECK:STDOUT: %c: %C = value_binding c, %.loc14_13.5 +// CHECK:STDOUT: %c: %C = wrapper_binding c, %.loc14_13.5 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %x.patt: %pattern_type.67c = value_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %ElementType.ref: type = name_ref ElementType, %ElementType.decl [concrete = constants.%ElementType] -// CHECK:STDOUT: %x: %ElementType = value_binding x, [concrete = ] +// CHECK:STDOUT: %x: %ElementType = wrapper_binding x, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @C.as.IndexWith.impl: %C.ref as %.loc8_41 { @@ -604,10 +604,10 @@ let x: i32 = c[0]; // CHECK:STDOUT: %.loc9_58.2: Core.Form = init_form %ElementType.ref [concrete = constants.%.4d0] // CHECK:STDOUT: %self.param: %C = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @C.as.IndexWith.impl.%C.ref [concrete = constants.%C] -// CHECK:STDOUT: %self: %C = value_binding self, %self.param +// CHECK:STDOUT: %self: %C = wrapper_binding self, %self.param // CHECK:STDOUT: %subscript.param: %SubscriptType.f8f = value_param call_param1 // CHECK:STDOUT: %SubscriptType.ref: type = name_ref SubscriptType, file.%SubscriptType.decl [concrete = constants.%SubscriptType.f8f] -// CHECK:STDOUT: %subscript: %SubscriptType.f8f = value_binding subscript, %subscript.param +// CHECK:STDOUT: %subscript: %SubscriptType.f8f = wrapper_binding subscript, %subscript.param // CHECK:STDOUT: %return.param: ref %ElementType = out_param call_param2 // CHECK:STDOUT: %return: ref %ElementType = return_slot %return.param // CHECK:STDOUT: } @@ -714,12 +714,12 @@ let x: i32 = c[0]; // CHECK:STDOUT: %.loc6_13.4: ref %C = temporary %.loc6_13.1, %.loc6_13.3 [concrete = constants.%.115] // CHECK:STDOUT: %.loc6_13.5: %C = acquire_value %.loc6_13.4 [concrete = constants.%C.val] // CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [concrete = constants.%C] -// CHECK:STDOUT: %c: %C = value_binding c, %.loc6_13.5 +// CHECK:STDOUT: %c: %C = wrapper_binding c, %.loc6_13.5 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %x.patt: %pattern_type.6b6 = value_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %x: %i32 = value_binding x, [concrete = ] +// CHECK:STDOUT: %x: %i32 = wrapper_binding x, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C { diff --git a/toolchain/check/testdata/operators/overloaded/ordered.carbon b/toolchain/check/testdata/operators/overloaded/ordered.carbon index dfa34c166b3e..7869f75d3381 100644 --- a/toolchain/check/testdata/operators/overloaded/ordered.carbon +++ b/toolchain/check/testdata/operators/overloaded/ordered.carbon @@ -170,10 +170,10 @@ fn TestGreaterEqual(a: D, b: D) -> bool { // CHECK:STDOUT: %.loc13_28.2: Core.Form = init_form %.loc13_28.1 [concrete = constants.%.f34] // CHECK:STDOUT: %a.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc13_16: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %a: %C = value_binding a, %a.param +// CHECK:STDOUT: %a: %C = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %C = value_param call_param1 // CHECK:STDOUT: %C.ref.loc13_22: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %b: %C = value_binding b, %b.param +// CHECK:STDOUT: %b: %C = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -189,10 +189,10 @@ fn TestGreaterEqual(a: D, b: D) -> bool { // CHECK:STDOUT: %.loc17_33.2: Core.Form = init_form %.loc17_33.1 [concrete = constants.%.f34] // CHECK:STDOUT: %a.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc17_21: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %a: %C = value_binding a, %a.param +// CHECK:STDOUT: %a: %C = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %C = value_param call_param1 // CHECK:STDOUT: %C.ref.loc17_27: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %b: %C = value_binding b, %b.param +// CHECK:STDOUT: %b: %C = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -208,10 +208,10 @@ fn TestGreaterEqual(a: D, b: D) -> bool { // CHECK:STDOUT: %.loc21_31.2: Core.Form = init_form %.loc21_31.1 [concrete = constants.%.f34] // CHECK:STDOUT: %a.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc21_19: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %a: %C = value_binding a, %a.param +// CHECK:STDOUT: %a: %C = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %C = value_param call_param1 // CHECK:STDOUT: %C.ref.loc21_25: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %b: %C = value_binding b, %b.param +// CHECK:STDOUT: %b: %C = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -227,10 +227,10 @@ fn TestGreaterEqual(a: D, b: D) -> bool { // CHECK:STDOUT: %.loc25_36.2: Core.Form = init_form %.loc25_36.1 [concrete = constants.%.f34] // CHECK:STDOUT: %a.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc25_24: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %a: %C = value_binding a, %a.param +// CHECK:STDOUT: %a: %C = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %C = value_param call_param1 // CHECK:STDOUT: %C.ref.loc25_30: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %b: %C = value_binding b, %b.param +// CHECK:STDOUT: %b: %C = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -249,10 +249,10 @@ fn TestGreaterEqual(a: D, b: D) -> bool { // CHECK:STDOUT: %.loc7_33.2: Core.Form = init_form %.loc7_33.1 [concrete = constants.%.f34] // CHECK:STDOUT: %self.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc7_17: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %self: %C = value_binding self, %self.param +// CHECK:STDOUT: %self: %C = wrapper_binding self, %self.param // CHECK:STDOUT: %other.param: %C = value_param call_param1 // CHECK:STDOUT: %C.ref.loc7_27: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %other: %C = value_binding other, %other.param +// CHECK:STDOUT: %other: %C = wrapper_binding other, %other.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -268,10 +268,10 @@ fn TestGreaterEqual(a: D, b: D) -> bool { // CHECK:STDOUT: %.loc8_45.2: Core.Form = init_form %.loc8_45.1 [concrete = constants.%.f34] // CHECK:STDOUT: %self.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc8_29: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %self: %C = value_binding self, %self.param +// CHECK:STDOUT: %self: %C = wrapper_binding self, %self.param // CHECK:STDOUT: %other.param: %C = value_param call_param1 // CHECK:STDOUT: %C.ref.loc8_39: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %other: %C = value_binding other, %other.param +// CHECK:STDOUT: %other: %C = wrapper_binding other, %other.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -287,10 +287,10 @@ fn TestGreaterEqual(a: D, b: D) -> bool { // CHECK:STDOUT: %.loc9_36.2: Core.Form = init_form %.loc9_36.1 [concrete = constants.%.f34] // CHECK:STDOUT: %self.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc9_20: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %self: %C = value_binding self, %self.param +// CHECK:STDOUT: %self: %C = wrapper_binding self, %self.param // CHECK:STDOUT: %other.param: %C = value_param call_param1 // CHECK:STDOUT: %C.ref.loc9_30: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %other: %C = value_binding other, %other.param +// CHECK:STDOUT: %other: %C = wrapper_binding other, %other.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -306,10 +306,10 @@ fn TestGreaterEqual(a: D, b: D) -> bool { // CHECK:STDOUT: %.loc10_48.2: Core.Form = init_form %.loc10_48.1 [concrete = constants.%.f34] // CHECK:STDOUT: %self.param: %C = value_param call_param0 // CHECK:STDOUT: %C.ref.loc10_32: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %self: %C = value_binding self, %self.param +// CHECK:STDOUT: %self: %C = wrapper_binding self, %self.param // CHECK:STDOUT: %other.param: %C = value_param call_param1 // CHECK:STDOUT: %C.ref.loc10_42: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %other: %C = value_binding other, %other.param +// CHECK:STDOUT: %other: %C = wrapper_binding other, %other.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -443,10 +443,10 @@ fn TestGreaterEqual(a: D, b: D) -> bool { // CHECK:STDOUT: %.loc6_28.2: Core.Form = init_form %.loc6_28.1 [concrete = constants.%.f34] // CHECK:STDOUT: %a.param: %D = value_param call_param0 // CHECK:STDOUT: %D.ref.loc6_16: type = name_ref D, file.%D.decl [concrete = constants.%D] -// CHECK:STDOUT: %a: %D = value_binding a, %a.param +// CHECK:STDOUT: %a: %D = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %D = value_param call_param1 // CHECK:STDOUT: %D.ref.loc6_22: type = name_ref D, file.%D.decl [concrete = constants.%D] -// CHECK:STDOUT: %b: %D = value_binding b, %b.param +// CHECK:STDOUT: %b: %D = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -462,10 +462,10 @@ fn TestGreaterEqual(a: D, b: D) -> bool { // CHECK:STDOUT: %.loc14_33.2: Core.Form = init_form %.loc14_33.1 [concrete = constants.%.f34] // CHECK:STDOUT: %a.param: %D = value_param call_param0 // CHECK:STDOUT: %D.ref.loc14_21: type = name_ref D, file.%D.decl [concrete = constants.%D] -// CHECK:STDOUT: %a: %D = value_binding a, %a.param +// CHECK:STDOUT: %a: %D = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %D = value_param call_param1 // CHECK:STDOUT: %D.ref.loc14_27: type = name_ref D, file.%D.decl [concrete = constants.%D] -// CHECK:STDOUT: %b: %D = value_binding b, %b.param +// CHECK:STDOUT: %b: %D = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -481,10 +481,10 @@ fn TestGreaterEqual(a: D, b: D) -> bool { // CHECK:STDOUT: %.loc22_31.2: Core.Form = init_form %.loc22_31.1 [concrete = constants.%.f34] // CHECK:STDOUT: %a.param: %D = value_param call_param0 // CHECK:STDOUT: %D.ref.loc22_19: type = name_ref D, file.%D.decl [concrete = constants.%D] -// CHECK:STDOUT: %a: %D = value_binding a, %a.param +// CHECK:STDOUT: %a: %D = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %D = value_param call_param1 // CHECK:STDOUT: %D.ref.loc22_25: type = name_ref D, file.%D.decl [concrete = constants.%D] -// CHECK:STDOUT: %b: %D = value_binding b, %b.param +// CHECK:STDOUT: %b: %D = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } @@ -500,10 +500,10 @@ fn TestGreaterEqual(a: D, b: D) -> bool { // CHECK:STDOUT: %.loc30_36.2: Core.Form = init_form %.loc30_36.1 [concrete = constants.%.f34] // CHECK:STDOUT: %a.param: %D = value_param call_param0 // CHECK:STDOUT: %D.ref.loc30_24: type = name_ref D, file.%D.decl [concrete = constants.%D] -// CHECK:STDOUT: %a: %D = value_binding a, %a.param +// CHECK:STDOUT: %a: %D = wrapper_binding a, %a.param // CHECK:STDOUT: %b.param: %D = value_param call_param1 // CHECK:STDOUT: %D.ref.loc30_30: type = name_ref D, file.%D.decl [concrete = constants.%D] -// CHECK:STDOUT: %b: %D = value_binding b, %b.param +// CHECK:STDOUT: %b: %D = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref bool = out_param call_param2 // CHECK:STDOUT: %return: ref bool = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/string_indexing.carbon b/toolchain/check/testdata/operators/overloaded/string_indexing.carbon index b9f768f4bffc..1d4857d38158 100644 --- a/toolchain/check/testdata/operators/overloaded/string_indexing.carbon +++ b/toolchain/check/testdata/operators/overloaded/string_indexing.carbon @@ -167,7 +167,7 @@ fn TestStringIndexing() { // CHECK:STDOUT: %.loc5_32.3: %char = value_of_initializer %str.as.IndexWith.impl.At.call.loc5 [concrete = constants.%int_84] // CHECK:STDOUT: %.loc5_32.4: %char = converted %str.as.IndexWith.impl.At.call.loc5, %.loc5_32.3 [concrete = constants.%int_84] // CHECK:STDOUT: %char.loc5: type = type_literal constants.%char [concrete = constants.%char] -// CHECK:STDOUT: %c: %char = value_binding c, %.loc5_32.4 +// CHECK:STDOUT: %c: %char = wrapper_binding c, %.loc5_32.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.2ff = value_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: } @@ -187,7 +187,7 @@ fn TestStringIndexing() { // CHECK:STDOUT: %.loc6_32.3: %char = value_of_initializer %str.as.IndexWith.impl.At.call.loc6 [concrete = constants.%int_116] // CHECK:STDOUT: %.loc6_32.4: %char = converted %str.as.IndexWith.impl.At.call.loc6, %.loc6_32.3 [concrete = constants.%int_116] // CHECK:STDOUT: %char.loc6: type = type_literal constants.%char [concrete = constants.%char] -// CHECK:STDOUT: %d: %char = value_binding d, %.loc6_32.4 +// CHECK:STDOUT: %d: %char = wrapper_binding d, %.loc6_32.4 // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/package_expr/syntax.carbon b/toolchain/check/testdata/package_expr/syntax.carbon index 9a3874b961b0..d2ff498da8ab 100644 --- a/toolchain/check/testdata/package_expr/syntax.carbon +++ b/toolchain/check/testdata/package_expr/syntax.carbon @@ -117,14 +117,14 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: %x.var: ref %i32 = var %x.var_patt [concrete] // CHECK:STDOUT: %i32.loc4: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %x: ref %i32 = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %i32 = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %y.patt: %pattern_type.6b6 = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type.6b6 = var_pattern %y.patt [concrete = constants.%y.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %y.var: ref %i32 = var %y.var_patt [concrete] // CHECK:STDOUT: %i32.loc5: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %y: ref %i32 = ref_binding y, %y.var [concrete = %y.var] +// CHECK:STDOUT: %y: ref %i32 = wrapper_binding y, %y.var [concrete = %y.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -236,7 +236,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: %x.var: ref %i32 = var %x.var_patt [concrete] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %x: ref %i32 = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %i32 = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: %Main.decl: %Main.type = fn_decl @Main [concrete = constants.%Main] {} {} // CHECK:STDOUT: } // CHECK:STDOUT: @@ -256,7 +256,7 @@ fn Main() { // CHECK:STDOUT: %.loc7: init %i32 = converted %int_1, %Core.IntLiteral.as.ImplicitAs.impl.Convert.call [concrete = constants.%int_1.0c6] // CHECK:STDOUT: assign %x.var, %.loc7 // CHECK:STDOUT: %i32.loc7: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %x: ref %i32 = ref_binding x, %x.var +// CHECK:STDOUT: %x: ref %i32 = wrapper_binding x, %x.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %y.patt: %pattern_type.6b6 = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type.6b6 = var_pattern %y.patt [concrete = constants.%y.var_patt] @@ -272,7 +272,7 @@ fn Main() { // CHECK:STDOUT: %Int.as.Copy.impl.Op.call: init %i32 = call %bound_method.loc9_30.2(%.loc9) // CHECK:STDOUT: assign %y.var, %Int.as.Copy.impl.Op.call // CHECK:STDOUT: %i32.loc9: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %y: ref %i32 = ref_binding y, %y.var +// CHECK:STDOUT: %y: ref %i32 = wrapper_binding y, %y.var // CHECK:STDOUT: %Destroy.Op.bound.loc9: = bound_method %y.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call.loc9: init %empty_tuple.type = call %Destroy.Op.bound.loc9(%y.var) // CHECK:STDOUT: %Destroy.Op.bound.loc7: = bound_method %x.var, constants.%Destroy.Op.1a2547.2 diff --git a/toolchain/check/testdata/packages/cross_package_export.carbon b/toolchain/check/testdata/packages/cross_package_export.carbon index e0aec24a5bb3..a9e6a9e787b7 100644 --- a/toolchain/check/testdata/packages/cross_package_export.carbon +++ b/toolchain/check/testdata/packages/cross_package_export.carbon @@ -420,7 +420,7 @@ alias C = Other.C; // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [concrete = imports.%Other] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { @@ -489,7 +489,7 @@ alias C = Other.C; // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [concrete = imports.%Other] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { @@ -558,7 +558,7 @@ alias C = Other.C; // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [concrete = imports.%Other] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { @@ -625,7 +625,7 @@ alias C = Other.C; // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [concrete = imports.%Other] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export_name.carbon"] { @@ -693,7 +693,7 @@ alias C = Other.C; // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [concrete = imports.%Other] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export_name.carbon"] { @@ -760,7 +760,7 @@ alias C = Other.C; // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [concrete = imports.%Other] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export_name_indirect.carbon"] { @@ -833,7 +833,7 @@ alias C = Other.C; // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [concrete = imports.%Other] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export_name.carbon"] { diff --git a/toolchain/check/testdata/packages/cross_package_import.carbon b/toolchain/check/testdata/packages/cross_package_import.carbon index c3ae62f3dec0..a9ed6dda50c7 100644 --- a/toolchain/check/testdata/packages/cross_package_import.carbon +++ b/toolchain/check/testdata/packages/cross_package_import.carbon @@ -271,7 +271,7 @@ fn UseF() { Other.F(); } // CHECK:STDOUT: %.loc4_17.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_17.3: type = converted %.loc4_17.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %empty_tuple.type = value_binding x, %x.param +// CHECK:STDOUT: %x: %empty_tuple.type = wrapper_binding x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/export_import.carbon b/toolchain/check/testdata/packages/export_import.carbon index aa9882e09e3a..8764abd618a2 100644 --- a/toolchain/check/testdata/packages/export_import.carbon +++ b/toolchain/check/testdata/packages/export_import.carbon @@ -323,7 +323,7 @@ export Poison; // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { @@ -386,7 +386,7 @@ export Poison; // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { @@ -446,7 +446,7 @@ export Poison; // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { @@ -506,7 +506,7 @@ export Poison; // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { @@ -566,7 +566,7 @@ export Poison; // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { @@ -626,7 +626,7 @@ export Poison; // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { @@ -686,7 +686,7 @@ export Poison; // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { @@ -746,7 +746,7 @@ export Poison; // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { @@ -818,7 +818,7 @@ export Poison; // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { @@ -880,7 +880,7 @@ export Poison; // CHECK:STDOUT: } // CHECK:STDOUT: %indirect_c.var: ref %C = var %indirect_c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %indirect_c: ref %C = ref_binding indirect_c, %indirect_c.var [concrete = %indirect_c.var] +// CHECK:STDOUT: %indirect_c: ref %C = wrapper_binding indirect_c, %indirect_c.var [concrete = %indirect_c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { diff --git a/toolchain/check/testdata/packages/export_mixed.carbon b/toolchain/check/testdata/packages/export_mixed.carbon index 5ee79b4731f4..bbc3b51d9c65 100644 --- a/toolchain/check/testdata/packages/export_mixed.carbon +++ b/toolchain/check/testdata/packages/export_mixed.carbon @@ -292,7 +292,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export_import_then_name.carbon"] { @@ -352,7 +352,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export_name.carbon"] { @@ -412,7 +412,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export_import_then_name.carbon"] { @@ -463,7 +463,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: } // CHECK:STDOUT: %d.var: ref = var %d.var_patt [concrete = ] // CHECK:STDOUT: %D.ref: = name_ref D, [concrete = ] -// CHECK:STDOUT: %d: ref = ref_binding d, [concrete = ] +// CHECK:STDOUT: %d: = wrapper_binding d, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -509,7 +509,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export_import_then_name.carbon"] { @@ -584,14 +584,14 @@ var d: D = {.y = ()}; // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.d8d = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.d8d = var_pattern %d.patt [concrete = constants.%d.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %d.var: ref %D = var %d.var_patt [concrete] // CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [concrete = constants.%D] -// CHECK:STDOUT: %d: ref %D = ref_binding d, %d.var [concrete = %d.var] +// CHECK:STDOUT: %d: ref %D = wrapper_binding d, %d.var [concrete = %d.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export_import_then_name.carbon"] { diff --git a/toolchain/check/testdata/packages/export_name.carbon b/toolchain/check/testdata/packages/export_name.carbon index c5fb74ee20e8..c247e3f31450 100644 --- a/toolchain/check/testdata/packages/export_name.carbon +++ b/toolchain/check/testdata/packages/export_name.carbon @@ -436,7 +436,7 @@ private export C; // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %nsc.patt: %pattern_type.533 = ref_binding_pattern nsc [concrete = constants.%nsc.patt] // CHECK:STDOUT: %nsc.var_patt: %pattern_type.533 = var_pattern %nsc.patt [concrete = constants.%nsc.var_patt] @@ -446,7 +446,7 @@ private export C; // CHECK:STDOUT: %NS.ref: = name_ref NS, imports.%NS [concrete = imports.%NS] // CHECK:STDOUT: %NSC.ref: type = name_ref NSC, imports.%Main.NSC [concrete = constants.%NSC] // CHECK:STDOUT: } -// CHECK:STDOUT: %nsc: ref %NSC = ref_binding nsc, %nsc.var [concrete = %nsc.var] +// CHECK:STDOUT: %nsc: ref %NSC = wrapper_binding nsc, %nsc.var [concrete = %nsc.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export.carbon"] { @@ -543,7 +543,7 @@ private export C; // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %nsc.patt: %pattern_type.533 = ref_binding_pattern nsc [concrete = constants.%nsc.patt] // CHECK:STDOUT: %nsc.var_patt: %pattern_type.533 = var_pattern %nsc.patt [concrete = constants.%nsc.var_patt] @@ -553,7 +553,7 @@ private export C; // CHECK:STDOUT: %NS.ref: = name_ref NS, imports.%NS [concrete = imports.%NS] // CHECK:STDOUT: %NSC.ref: type = name_ref NSC, imports.%Main.NSC [concrete = constants.%NSC] // CHECK:STDOUT: } -// CHECK:STDOUT: %nsc: ref %NSC = ref_binding nsc, %nsc.var [concrete = %nsc.var] +// CHECK:STDOUT: %nsc: ref %NSC = wrapper_binding nsc, %nsc.var [concrete = %nsc.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export_export.carbon"] { @@ -649,7 +649,7 @@ private export C; // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %nsc.patt: %pattern_type.533 = ref_binding_pattern nsc [concrete = constants.%nsc.patt] // CHECK:STDOUT: %nsc.var_patt: %pattern_type.533 = var_pattern %nsc.patt [concrete = constants.%nsc.var_patt] @@ -659,7 +659,7 @@ private export C; // CHECK:STDOUT: %NS.ref: = name_ref NS, imports.%NS [concrete = imports.%NS] // CHECK:STDOUT: %NSC.ref: type = name_ref NSC, imports.%Main.NSC [concrete = constants.%NSC] // CHECK:STDOUT: } -// CHECK:STDOUT: %nsc: ref %NSC = ref_binding nsc, %nsc.var [concrete = %nsc.var] +// CHECK:STDOUT: %nsc: ref %NSC = wrapper_binding nsc, %nsc.var [concrete = %nsc.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export_export.carbon"] { @@ -834,7 +834,7 @@ private export C; // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %nsc.patt: %pattern_type.533 = ref_binding_pattern nsc [concrete = constants.%nsc.patt] // CHECK:STDOUT: %nsc.var_patt: %pattern_type.533 = var_pattern %nsc.patt [concrete = constants.%nsc.var_patt] @@ -844,7 +844,7 @@ private export C; // CHECK:STDOUT: %NS.ref: = name_ref NS, imports.%NS [concrete = imports.%NS] // CHECK:STDOUT: %NSC.ref: type = name_ref NSC, imports.%Main.NSC [concrete = constants.%NSC] // CHECK:STDOUT: } -// CHECK:STDOUT: %nsc: ref %NSC = ref_binding nsc, %nsc.var [concrete = %nsc.var] +// CHECK:STDOUT: %nsc: ref %NSC = wrapper_binding nsc, %nsc.var [concrete = %nsc.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { @@ -940,7 +940,7 @@ private export C; // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %nsc.patt: %pattern_type.533 = ref_binding_pattern nsc [concrete = constants.%nsc.patt] // CHECK:STDOUT: %nsc.var_patt: %pattern_type.533 = var_pattern %nsc.patt [concrete = constants.%nsc.var_patt] @@ -950,7 +950,7 @@ private export C; // CHECK:STDOUT: %NS.ref: = name_ref NS, imports.%NS [concrete = imports.%NS] // CHECK:STDOUT: %NSC.ref: type = name_ref NSC, imports.%Main.NSC [concrete = constants.%NSC] // CHECK:STDOUT: } -// CHECK:STDOUT: %nsc: ref %NSC = ref_binding nsc, %nsc.var [concrete = %nsc.var] +// CHECK:STDOUT: %nsc: ref %NSC = wrapper_binding nsc, %nsc.var [concrete = %nsc.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export.carbon"] { @@ -1082,7 +1082,7 @@ private export C; // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "repeat_export.carbon"] { diff --git a/toolchain/check/testdata/packages/fail_conflict_no_namespaces.carbon b/toolchain/check/testdata/packages/fail_conflict_no_namespaces.carbon index 88f0d6ff23d1..23e97996131c 100644 --- a/toolchain/check/testdata/packages/fail_conflict_no_namespaces.carbon +++ b/toolchain/check/testdata/packages/fail_conflict_no_namespaces.carbon @@ -111,7 +111,7 @@ import library "var"; // CHECK:STDOUT: } // CHECK:STDOUT: %Foo.var: ref %i32 = var %Foo.var_patt [concrete] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %Foo: ref %i32 = ref_binding Foo, %Foo.var [concrete = %Foo.var] +// CHECK:STDOUT: %Foo: ref %i32 = wrapper_binding Foo, %Foo.var [concrete = %Foo.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/packages/fail_import_type_error.carbon b/toolchain/check/testdata/packages/fail_import_type_error.carbon index 978f9aa555da..9a94e0798664 100644 --- a/toolchain/check/testdata/packages/fail_import_type_error.carbon +++ b/toolchain/check/testdata/packages/fail_import_type_error.carbon @@ -73,7 +73,7 @@ var d: i32 = d_ref; // CHECK:STDOUT: } // CHECK:STDOUT: %a_ref.var: ref = var %a_ref.var_patt [concrete = ] // CHECK:STDOUT: %x.ref.loc8: = name_ref x, [concrete = ] -// CHECK:STDOUT: %a_ref: ref = ref_binding a_ref, [concrete = ] +// CHECK:STDOUT: %a_ref: = wrapper_binding a_ref, [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b_ref.patt: = ref_binding_pattern b_ref [concrete = ] // CHECK:STDOUT: %b_ref.var_patt: = var_pattern %b_ref.patt [concrete = ] @@ -83,7 +83,7 @@ var d: i32 = d_ref; // CHECK:STDOUT: %x.ref.loc13: = name_ref x, [concrete = ] // CHECK:STDOUT: %.loc13: = struct_literal (%x.ref.loc13) [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %b_ref: ref = ref_binding b_ref, [concrete = ] +// CHECK:STDOUT: %b_ref: = wrapper_binding b_ref, [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c_ref.patt: = ref_binding_pattern c_ref [concrete = ] // CHECK:STDOUT: %c_ref.var_patt: = var_pattern %c_ref.patt [concrete = ] @@ -93,7 +93,7 @@ var d: i32 = d_ref; // CHECK:STDOUT: %x.ref.loc18: = name_ref x, [concrete = ] // CHECK:STDOUT: %.loc18: = tuple_literal (%x.ref.loc18) [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %c_ref: ref = ref_binding c_ref, [concrete = ] +// CHECK:STDOUT: %c_ref: = wrapper_binding c_ref, [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d_ref.patt: = ref_binding_pattern d_ref [concrete = ] // CHECK:STDOUT: %d_ref.var_patt: = var_pattern %d_ref.patt [concrete = ] @@ -103,7 +103,7 @@ var d: i32 = d_ref; // CHECK:STDOUT: %x.ref.loc23: = name_ref x, [concrete = ] // CHECK:STDOUT: %ptr: type = ptr_type [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %d_ref: ref = ref_binding d_ref, [concrete = ] +// CHECK:STDOUT: %d_ref: = wrapper_binding d_ref, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -134,10 +134,10 @@ var d: i32 = d_ref; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %Implicit.a_ref: ref = import_ref Implicit//default, a_ref, loaded [concrete = ] -// CHECK:STDOUT: %Implicit.b_ref: ref = import_ref Implicit//default, b_ref, loaded [concrete = ] -// CHECK:STDOUT: %Implicit.c_ref: ref = import_ref Implicit//default, c_ref, loaded [concrete = ] -// CHECK:STDOUT: %Implicit.d_ref: ref = import_ref Implicit//default, d_ref, loaded [concrete = ] +// CHECK:STDOUT: %Implicit.a_ref: = import_ref Implicit//default, a_ref, loaded [concrete = ] +// CHECK:STDOUT: %Implicit.b_ref: = import_ref Implicit//default, b_ref, loaded [concrete = ] +// CHECK:STDOUT: %Implicit.c_ref: = import_ref Implicit//default, c_ref, loaded [concrete = ] +// CHECK:STDOUT: %Implicit.d_ref: = import_ref Implicit//default, d_ref, loaded [concrete = ] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [concrete] { // CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude @@ -167,39 +167,39 @@ var d: i32 = d_ref; // CHECK:STDOUT: } // CHECK:STDOUT: %a.var: ref %i32 = var %a.var_patt [concrete] // CHECK:STDOUT: %i32.loc6: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: ref %i32 = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %i32 = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] // CHECK:STDOUT: %i32.loc7: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: ref %i32 = ref_binding b, %b.var [concrete = %b.var] +// CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.6b6 = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.6b6 = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %i32 = var %c.var_patt [concrete] // CHECK:STDOUT: %i32.loc8: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %c: ref %i32 = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %i32 = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.6b6 = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.6b6 = var_pattern %d.patt [concrete = constants.%d.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %d.var: ref %i32 = var %d.var_patt [concrete] // CHECK:STDOUT: %i32.loc9: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %d: ref %i32 = ref_binding d, %d.var [concrete = %d.var] +// CHECK:STDOUT: %d: ref %i32 = wrapper_binding d, %d.var [concrete = %d.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %a_ref.ref: ref = name_ref a_ref, imports.%Implicit.a_ref [concrete = ] +// CHECK:STDOUT: %a_ref.ref: = name_ref a_ref, imports.%Implicit.a_ref [concrete = ] // CHECK:STDOUT: assign file.%a.var, -// CHECK:STDOUT: %b_ref.ref: ref = name_ref b_ref, imports.%Implicit.b_ref [concrete = ] +// CHECK:STDOUT: %b_ref.ref: = name_ref b_ref, imports.%Implicit.b_ref [concrete = ] // CHECK:STDOUT: assign file.%b.var, -// CHECK:STDOUT: %c_ref.ref: ref = name_ref c_ref, imports.%Implicit.c_ref [concrete = ] +// CHECK:STDOUT: %c_ref.ref: = name_ref c_ref, imports.%Implicit.c_ref [concrete = ] // CHECK:STDOUT: assign file.%c.var, -// CHECK:STDOUT: %d_ref.ref: ref = name_ref d_ref, imports.%Implicit.d_ref [concrete = ] +// CHECK:STDOUT: %d_ref.ref: = name_ref d_ref, imports.%Implicit.d_ref [concrete = ] // CHECK:STDOUT: assign file.%d.var, // CHECK:STDOUT: return // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/packages/fail_name_with_import_failure.carbon b/toolchain/check/testdata/packages/fail_name_with_import_failure.carbon index 787689ec8c1e..bf3c3f9e7629 100644 --- a/toolchain/check/testdata/packages/fail_name_with_import_failure.carbon +++ b/toolchain/check/testdata/packages/fail_name_with_import_failure.carbon @@ -48,7 +48,7 @@ var a: () = A(); // CHECK:STDOUT: %.loc8_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_9.3: type = converted %.loc8_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %empty_tuple.type = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %empty_tuple.type = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/packages/implicit_imports_entities.carbon b/toolchain/check/testdata/packages/implicit_imports_entities.carbon index 3960ef033c2c..cd5aa465812a 100644 --- a/toolchain/check/testdata/packages/implicit_imports_entities.carbon +++ b/toolchain/check/testdata/packages/implicit_imports_entities.carbon @@ -365,14 +365,14 @@ import Other library "o1"; // CHECK:STDOUT: } // CHECK:STDOUT: %c1.var: ref %C1 = var %c1.var_patt [concrete] // CHECK:STDOUT: %C1.ref: type = name_ref C1, imports.%Main.C1 [concrete = constants.%C1] -// CHECK:STDOUT: %c1: ref %C1 = ref_binding c1, %c1.var [concrete = %c1.var] +// CHECK:STDOUT: %c1: ref %C1 = wrapper_binding c1, %c1.var [concrete = %c1.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c2.patt: %pattern_type.5ca = ref_binding_pattern c2 [concrete = constants.%c2.patt] // CHECK:STDOUT: %c2.var_patt: %pattern_type.5ca = var_pattern %c2.patt [concrete = constants.%c2.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %c2.var: ref %C2 = var %c2.var_patt [concrete] // CHECK:STDOUT: %C2.ref: type = name_ref C2, imports.%Main.C2 [concrete = constants.%C2] -// CHECK:STDOUT: %c2: ref %C2 = ref_binding c2, %c2.var [concrete = %c2.var] +// CHECK:STDOUT: %c2: ref %C2 = wrapper_binding c2, %c2.var [concrete = %c2.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C1 [from "c1.carbon"] { @@ -447,7 +447,7 @@ import Other library "o1"; // CHECK:STDOUT: } // CHECK:STDOUT: %c1.var: ref %C1 = var %c1.var_patt [concrete] // CHECK:STDOUT: %C1.ref: type = name_ref C1, imports.%Main.C1 [concrete = constants.%C1] -// CHECK:STDOUT: %c1: ref %C1 = ref_binding c1, %c1.var [concrete = %c1.var] +// CHECK:STDOUT: %c1: ref %C1 = wrapper_binding c1, %c1.var [concrete = %c1.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C1 [from "c1.carbon"] { @@ -522,7 +522,7 @@ import Other library "o1"; // CHECK:STDOUT: %NS.ref: = name_ref NS, imports.%NS.7ae [concrete = imports.%NS.7ae] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %C = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "ns.carbon"] { @@ -607,7 +607,7 @@ import Other library "o1"; // CHECK:STDOUT: %Other.ref.loc6: = name_ref Other, imports.%Other [concrete = imports.%Other] // CHECK:STDOUT: %O1.ref: type = name_ref O1, imports.%Other.O1 [concrete = constants.%O1] // CHECK:STDOUT: } -// CHECK:STDOUT: %o1: ref %O1 = ref_binding o1, %o1.var [concrete = %o1.var] +// CHECK:STDOUT: %o1: ref %O1 = wrapper_binding o1, %o1.var [concrete = %o1.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %o2.patt: %pattern_type.327 = ref_binding_pattern o2 [concrete = constants.%o2.patt] // CHECK:STDOUT: %o2.var_patt: %pattern_type.327 = var_pattern %o2.patt [concrete = constants.%o2.var_patt] @@ -617,7 +617,7 @@ import Other library "o1"; // CHECK:STDOUT: %Other.ref.loc7: = name_ref Other, imports.%Other [concrete = imports.%Other] // CHECK:STDOUT: %O2.ref: type = name_ref O2, imports.%Other.O2 [concrete = constants.%O2] // CHECK:STDOUT: } -// CHECK:STDOUT: %o2: ref %O2 = ref_binding o2, %o2.var [concrete = %o2.var] +// CHECK:STDOUT: %o2: ref %O2 = wrapper_binding o2, %o2.var [concrete = %o2.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @O1 [from "o1.carbon"] { @@ -702,7 +702,7 @@ import Other library "o1"; // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [concrete = imports.%Other] // CHECK:STDOUT: %O1.ref: type = name_ref O1, imports.%Other.O1 [concrete = constants.%O1] // CHECK:STDOUT: } -// CHECK:STDOUT: %o1: ref %O1 = ref_binding o1, %o1.var [concrete = %o1.var] +// CHECK:STDOUT: %o1: ref %O1 = wrapper_binding o1, %o1.var [concrete = %o1.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @O1 [from "o1.carbon"] { diff --git a/toolchain/check/testdata/packages/implicit_imports_prelude.carbon b/toolchain/check/testdata/packages/implicit_imports_prelude.carbon index 8fdb979054ce..3cb698f209d5 100644 --- a/toolchain/check/testdata/packages/implicit_imports_prelude.carbon +++ b/toolchain/check/testdata/packages/implicit_imports_prelude.carbon @@ -80,7 +80,7 @@ var b: i32 = a; // CHECK:STDOUT: } // CHECK:STDOUT: %a.var: ref %i32 = var %a.var_patt [concrete] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a: ref %i32 = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %i32 = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -151,7 +151,7 @@ var b: i32 = a; // CHECK:STDOUT: } // CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: ref %i32 = ref_binding b, %b.var [concrete = %b.var] +// CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/packages/loaded_global.carbon b/toolchain/check/testdata/packages/loaded_global.carbon index 124fcf379614..f2e6fd92c956 100644 --- a/toolchain/check/testdata/packages/loaded_global.carbon +++ b/toolchain/check/testdata/packages/loaded_global.carbon @@ -93,7 +93,7 @@ var package_b: () = package.B(); // CHECK:STDOUT: %.loc4_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_9.3: type = converted %.loc4_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %empty_tuple.type = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %empty_tuple.type = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %package_a.patt: %pattern_type = ref_binding_pattern package_a [concrete = constants.%package_a.patt] // CHECK:STDOUT: %package_a.var_patt: %pattern_type = var_pattern %package_a.patt [concrete = constants.%package_a.var_patt] @@ -103,7 +103,7 @@ var package_b: () = package.B(); // CHECK:STDOUT: %.loc6_17.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_17.3: type = converted %.loc6_17.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %package_a: ref %empty_tuple.type = ref_binding package_a, %package_a.var [concrete = %package_a.var] +// CHECK:STDOUT: %package_a: ref %empty_tuple.type = wrapper_binding package_a, %package_a.var [concrete = %package_a.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A [from "implicit.carbon"]; @@ -170,7 +170,7 @@ var package_b: () = package.B(); // CHECK:STDOUT: %.loc6_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_9.3: type = converted %.loc6_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: ref %empty_tuple.type = ref_binding b, %b.var [concrete = %b.var] +// CHECK:STDOUT: %b: ref %empty_tuple.type = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %package_b.patt: %pattern_type = ref_binding_pattern package_b [concrete = constants.%package_b.patt] // CHECK:STDOUT: %package_b.var_patt: %pattern_type = var_pattern %package_b.patt [concrete = constants.%package_b.var_patt] @@ -180,7 +180,7 @@ var package_b: () = package.B(); // CHECK:STDOUT: %.loc8_17.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_17.3: type = converted %.loc8_17.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %package_b: ref %empty_tuple.type = ref_binding package_b, %package_b.var [concrete = %package_b.var] +// CHECK:STDOUT: %package_b: ref %empty_tuple.type = wrapper_binding package_b, %package_b.var [concrete = %package_b.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @B [from "same_package.carbon"]; diff --git a/toolchain/check/testdata/packages/missing_prelude.carbon b/toolchain/check/testdata/packages/missing_prelude.carbon index 47605d904c7b..0f7895768128 100644 --- a/toolchain/check/testdata/packages/missing_prelude.carbon +++ b/toolchain/check/testdata/packages/missing_prelude.carbon @@ -137,7 +137,7 @@ let n: type = i32; // CHECK:STDOUT: } // CHECK:STDOUT: %n.var: ref = var %n.var_patt [concrete = ] // CHECK:STDOUT: %.loc8: type = type_literal [concrete = ] -// CHECK:STDOUT: %n: ref = ref_binding n, [concrete = ] +// CHECK:STDOUT: %n: = wrapper_binding n, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -173,7 +173,7 @@ let n: type = i32; // CHECK:STDOUT: } // CHECK:STDOUT: %n.var: ref = var %n.var_patt [concrete = ] // CHECK:STDOUT: %.loc10: type = type_literal [concrete = ] -// CHECK:STDOUT: %n: ref = ref_binding n, [concrete = ] +// CHECK:STDOUT: %n: = wrapper_binding n, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -288,7 +288,7 @@ let n: type = i32; // CHECK:STDOUT: %Self.as_type.loc9_14.2: type = facet_access_type %Self.ref [symbolic = %Self.as_type.loc9_14.1 (constants.%Self.as_type)] // CHECK:STDOUT: %.loc9_14.3: type = converted %Self.ref, %Self.as_type.loc9_14.2 [symbolic = %Self.as_type.loc9_14.1 (constants.%Self.as_type)] // CHECK:STDOUT: } -// CHECK:STDOUT: %self: @ImplicitAs.WithSelf.Convert.%Self.as_type.loc9_14.1 (%Self.as_type) = value_binding self, %self.param +// CHECK:STDOUT: %self: @ImplicitAs.WithSelf.Convert.%Self.as_type.loc9_14.1 (%Self.as_type) = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref @ImplicitAs.WithSelf.Convert.%T (%T) = out_param call_param1 // CHECK:STDOUT: %return: ref @ImplicitAs.WithSelf.Convert.%T (%T) = return_slot %return.param // CHECK:STDOUT: } @@ -463,7 +463,7 @@ let n: type = i32; // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [concrete = imports.%Core] // CHECK:STDOUT: %X.ref: type = name_ref X, imports.%Core.X [concrete = constants.%X] // CHECK:STDOUT: } -// CHECK:STDOUT: %n: %X = value_binding n, [concrete = ] +// CHECK:STDOUT: %n: %X = wrapper_binding n, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic interface @ImplicitAs(imports.%Core.import_ref.b3bc94.4: type) [from "prelude_fake_int.carbon"] { @@ -664,7 +664,7 @@ let n: type = i32; // CHECK:STDOUT: %.loc8_15.4: ref %Int.382 = temporary %.loc8_15.1, %.loc8_15.3 [concrete = constants.%.d67] // CHECK:STDOUT: %.loc8_15.5: %Int.382 = acquire_value %.loc8_15.4 [concrete = constants.%Int.val] // CHECK:STDOUT: %.loc8_8: type = type_literal constants.%Int.382 [concrete = constants.%Int.382] -// CHECK:STDOUT: %n: %Int.382 = value_binding n, %.loc8_15.5 +// CHECK:STDOUT: %n: %Int.382 = wrapper_binding n, %.loc8_15.5 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic class @Int(%T.loc6_12.2: type, %N.loc6_29.2: @Int.%T.loc6_12.1 (%T)) { diff --git a/toolchain/check/testdata/packages/raw_core.carbon b/toolchain/check/testdata/packages/raw_core.carbon index 3bf53c61651f..c343c8704b05 100644 --- a/toolchain/check/testdata/packages/raw_core.carbon +++ b/toolchain/check/testdata/packages/raw_core.carbon @@ -271,7 +271,7 @@ var c: r#Core = {.n = 0 as Core.Int(32)}; // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %Core = var %c.var_patt [concrete] // CHECK:STDOUT: %Core.ref: type = name_ref r#Core, %Core.decl [concrete = constants.%Core] -// CHECK:STDOUT: %c: ref %Core = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %Core = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Core { diff --git a/toolchain/check/testdata/patterns/tuple.carbon b/toolchain/check/testdata/patterns/tuple.carbon index a4b1a37e548d..92d12d938fd6 100644 --- a/toolchain/check/testdata/patterns/tuple.carbon +++ b/toolchain/check/testdata/patterns/tuple.carbon @@ -84,14 +84,14 @@ let (((b: ()),)) = ((),); // CHECK:STDOUT: %.loc5_10.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_10.3: type = converted %.loc5_10.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %empty_tuple.type = value_binding a, %.loc5_24 +// CHECK:STDOUT: %a: %empty_tuple.type = wrapper_binding a, %.loc5_24 // CHECK:STDOUT: %empty_tuple.loc5_28: %empty_tuple.type = tuple_value () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_28: %empty_tuple.type = converted @__global_init.%.loc5_28, %empty_tuple.loc5_28 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_17.1: type = splice_block %.loc5_17.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc5_17.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_17.3: type = converted %.loc5_17.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %empty_tuple.type = value_binding b, %.loc5_28 +// CHECK:STDOUT: %b: %empty_tuple.type = wrapper_binding b, %.loc5_28 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -132,14 +132,14 @@ let (((b: ()),)) = ((),); // CHECK:STDOUT: %.loc7_10.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_10.3: type = converted %.loc7_10.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %empty_tuple.type = value_binding a, %.loc7_24.2 +// CHECK:STDOUT: %a: %empty_tuple.type = wrapper_binding a, %.loc7_24.2 // CHECK:STDOUT: %tuple.loc7_24.2: %empty_tuple.type = tuple_value () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_24.3: %empty_tuple.type = converted %tuple.elem1, %tuple.loc7_24.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_17.1: type = splice_block %.loc7_17.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc7_17.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_17.3: type = converted %.loc7_17.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %empty_tuple.type = value_binding b, %.loc7_24.3 +// CHECK:STDOUT: %b: %empty_tuple.type = wrapper_binding b, %.loc7_24.3 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -179,14 +179,14 @@ let (((b: ()),)) = ((),); // CHECK:STDOUT: %.loc6_10.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_10.3: type = converted %.loc6_10.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %empty_tuple.type = value_binding a, %.loc6_22.1 +// CHECK:STDOUT: %a: %empty_tuple.type = wrapper_binding a, %.loc6_22.1 // CHECK:STDOUT: %tuple.loc6_22.2: %empty_tuple.type = tuple_value () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_22.2: %empty_tuple.type = converted %tuple.elem1, %tuple.loc6_22.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_17.1: type = splice_block %.loc6_17.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc6_17.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_17.3: type = converted %.loc6_17.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %empty_tuple.type = value_binding b, %.loc6_22.2 +// CHECK:STDOUT: %b: %empty_tuple.type = wrapper_binding b, %.loc6_22.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -216,7 +216,7 @@ let (((b: ()),)) = ((),); // CHECK:STDOUT: %.loc5_10.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_10.3: type = converted %.loc5_10.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %empty_tuple.type = value_binding a, %.loc5_16 +// CHECK:STDOUT: %a: %empty_tuple.type = wrapper_binding a, %.loc5_16 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: } @@ -226,7 +226,7 @@ let (((b: ()),)) = ((),); // CHECK:STDOUT: %.loc6_12.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_12.3: type = converted %.loc6_12.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %empty_tuple.type = value_binding b, %.loc6_20 +// CHECK:STDOUT: %b: %empty_tuple.type = wrapper_binding b, %.loc6_20 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -262,7 +262,7 @@ let (((b: ()),)) = ((),); // CHECK:STDOUT: %.loc5_10.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_10.3: type = converted %.loc5_10.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: %empty_tuple.type = value_binding a, %.loc5_18 +// CHECK:STDOUT: %a: %empty_tuple.type = wrapper_binding a, %.loc5_18 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.cb1 = value_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %.loc6_15: %pattern_type.559 = tuple_pattern (%b.patt) [concrete = constants.%.00b] @@ -273,7 +273,7 @@ let (((b: ()),)) = ((),); // CHECK:STDOUT: %.loc6_12.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_12.3: type = converted %.loc6_12.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: %empty_tuple.type = value_binding b, %.loc6_22 +// CHECK:STDOUT: %b: %empty_tuple.type = wrapper_binding b, %.loc6_22 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/patterns/underscore.carbon b/toolchain/check/testdata/patterns/underscore.carbon index b17aa772dfce..c294f57e1315 100644 --- a/toolchain/check/testdata/patterns/underscore.carbon +++ b/toolchain/check/testdata/patterns/underscore.carbon @@ -149,7 +149,7 @@ fn F() -> {} { // CHECK:STDOUT: %.loc4_9.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc4_9.3: type = converted %.loc4_9.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %_.loc4: %empty_struct_type = value_binding _, %.loc4_14 +// CHECK:STDOUT: %_.loc4: %empty_struct_type = wrapper_binding _, %.loc4_14 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %_.patt.loc5: %pattern_type.a96 = ref_binding_pattern _ [concrete = constants.%_.patt.7e8] // CHECK:STDOUT: %_.var_patt: %pattern_type.a96 = var_pattern %_.patt.loc5 [concrete = constants.%_.var_patt.d5b] @@ -159,7 +159,7 @@ fn F() -> {} { // CHECK:STDOUT: %.loc5_9.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc5_9.3: type = converted %.loc5_9.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %_.loc5: ref %empty_struct_type = ref_binding _, %_.var +// CHECK:STDOUT: %_.loc5: ref %empty_struct_type = wrapper_binding _, %_.var // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [concrete = constants.%F] {} {} // CHECK:STDOUT: } // CHECK:STDOUT: @@ -175,7 +175,7 @@ fn F() -> {} { // CHECK:STDOUT: %.loc8_11.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc8_11.3: type = converted %.loc8_11.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %_.loc8: %empty_struct_type = value_binding _, %.loc8_16.2 +// CHECK:STDOUT: %_.loc8: %empty_struct_type = wrapper_binding _, %.loc8_16.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %_.patt.loc9: %pattern_type.a96 = ref_binding_pattern _ [concrete = constants.%_.patt.3b4] // CHECK:STDOUT: %_.var_patt: %pattern_type.a96 = var_pattern %_.patt.loc9 [concrete = constants.%_.var_patt.f52] @@ -189,7 +189,7 @@ fn F() -> {} { // CHECK:STDOUT: %.loc9_11.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc9_11.3: type = converted %.loc9_11.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %_.loc9: ref %empty_struct_type = ref_binding _, %_.var +// CHECK:STDOUT: %_.loc9: ref %empty_struct_type = wrapper_binding _, %_.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %_.var, constants.%Destroy.Op // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%_.var) // CHECK:STDOUT: return @@ -248,7 +248,7 @@ fn F() -> {} { // CHECK:STDOUT: %.loc4_10.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc4_10.3: type = converted %.loc4_10.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %_: %empty_struct_type = value_binding _, %_.param +// CHECK:STDOUT: %_: %empty_struct_type = wrapper_binding _, %_.param // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [concrete = constants.%G] { // CHECK:STDOUT: %_.param_patt: %pattern_type = value_param_pattern [concrete = constants.%_.param_patt] @@ -259,7 +259,7 @@ fn F() -> {} { // CHECK:STDOUT: %.loc6_10.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc6_10.3: type = converted %.loc6_10.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %_: %empty_struct_type = value_binding _, %_.param +// CHECK:STDOUT: %_: %empty_struct_type = wrapper_binding _, %_.param // CHECK:STDOUT: } // CHECK:STDOUT: %H.decl: %H.type = fn_decl @H [concrete = constants.%H] {} {} // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/pointer/address_of_deref.carbon b/toolchain/check/testdata/pointer/address_of_deref.carbon index ee772417df9a..04b84e6df7cc 100644 --- a/toolchain/check/testdata/pointer/address_of_deref.carbon +++ b/toolchain/check/testdata/pointer/address_of_deref.carbon @@ -120,7 +120,7 @@ fn F() -> i32 { // CHECK:STDOUT: %.loc16: init %i32 = converted %int_0, %Core.IntLiteral.as.ImplicitAs.impl.Convert.call [concrete = constants.%int_0.3c0] // CHECK:STDOUT: assign %n.var, %.loc16 // CHECK:STDOUT: %i32.loc16: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: ref %i32 = ref_binding n, %n.var +// CHECK:STDOUT: %n: ref %i32 = wrapper_binding n, %n.var // 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 diff --git a/toolchain/check/testdata/pointer/address_of_lvalue.carbon b/toolchain/check/testdata/pointer/address_of_lvalue.carbon index fa5fd24d40b9..3d69d759cc6c 100644 --- a/toolchain/check/testdata/pointer/address_of_lvalue.carbon +++ b/toolchain/check/testdata/pointer/address_of_lvalue.carbon @@ -178,7 +178,7 @@ fn F() { // CHECK:STDOUT: %i32.loc16_24: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a.b.loc16: type = struct_type {.a: %i32, .b: %i32} [concrete = constants.%struct_type.a.b.b4c] // CHECK:STDOUT: } -// CHECK:STDOUT: %s: ref %struct_type.a.b.b4c = ref_binding s, %s.var +// 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] @@ -198,7 +198,7 @@ fn F() { // CHECK:STDOUT: %struct_type.a.b.loc18: type = struct_type {.a: %i32, .b: %i32} [concrete = constants.%struct_type.a.b.b4c] // CHECK:STDOUT: %ptr.loc18: type = ptr_type %struct_type.a.b.loc18 [concrete = constants.%ptr.939] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: ref %ptr.939 = ref_binding p, %p.var +// 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] @@ -217,7 +217,7 @@ fn F() { // CHECK:STDOUT: %i32.loc19: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %ptr.loc19: type = ptr_type %i32.loc19 [concrete = constants.%ptr.d08] // CHECK:STDOUT: } -// CHECK:STDOUT: %q: ref %ptr.d08 = ref_binding q, %q.var +// 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] @@ -236,7 +236,7 @@ fn F() { // CHECK:STDOUT: %i32.loc20: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %ptr.loc20: type = ptr_type %i32.loc20 [concrete = constants.%ptr.d08] // CHECK:STDOUT: } -// CHECK:STDOUT: %r: ref %ptr.d08 = ref_binding r, %r.var +// 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] @@ -270,7 +270,7 @@ fn F() { // CHECK:STDOUT: %.loc22_19.2: %tuple.type.24b = tuple_literal (%i32.loc22_11, %i32.loc22_16) [concrete = constants.%tuple.b59] // CHECK:STDOUT: %.loc22_19.3: type = converted %.loc22_19.2, constants.%tuple.type.e55 [concrete = constants.%tuple.type.e55] // CHECK:STDOUT: } -// CHECK:STDOUT: %t: ref %tuple.type.e55 = ref_binding t, %t.var +// 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] @@ -290,7 +290,7 @@ fn F() { // CHECK:STDOUT: %i32.loc23: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %ptr.loc23: type = ptr_type %i32.loc23 [concrete = constants.%ptr.d08] // CHECK:STDOUT: } -// CHECK:STDOUT: %t0: ref %ptr.d08 = ref_binding t0, %t0.var +// 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] @@ -310,7 +310,7 @@ fn F() { // CHECK:STDOUT: %i32.loc24: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %ptr.loc24: type = ptr_type %i32.loc24 [concrete = constants.%ptr.d08] // CHECK:STDOUT: } -// CHECK:STDOUT: %t1: ref %ptr.d08 = ref_binding t1, %t1.var +// CHECK:STDOUT: %t1: ref %ptr.d08 = wrapper_binding t1, %t1.var // CHECK:STDOUT: %Destroy.Op.bound.loc24: = 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 %t0.var, constants.%Destroy.Op.1a2547.1 diff --git a/toolchain/check/testdata/pointer/arrow.carbon b/toolchain/check/testdata/pointer/arrow.carbon index 70a3f36beec9..348a62ac4620 100644 --- a/toolchain/check/testdata/pointer/arrow.carbon +++ b/toolchain/check/testdata/pointer/arrow.carbon @@ -72,7 +72,7 @@ fn Foo(ptr: C*) { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %ptr.loc20_14: type = ptr_type %C.ref [concrete = constants.%ptr.6b6] // CHECK:STDOUT: } -// CHECK:STDOUT: %ptr.loc20_11: %ptr.6b6 = value_binding ptr, %ptr.param +// CHECK:STDOUT: %ptr.loc20_11: %ptr.6b6 = wrapper_binding ptr, %ptr.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -83,7 +83,7 @@ fn Foo(ptr: C*) { // CHECK:STDOUT: } { // CHECK:STDOUT: %self.param: %C = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%C [concrete = constants.%C] -// CHECK:STDOUT: %self: %C = value_binding self, %self.param +// CHECK:STDOUT: %self: %C = wrapper_binding self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %.loc17: %C.elem = field_decl field, element0 [concrete] // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%struct_type.field [concrete = constants.%complete_type] diff --git a/toolchain/check/testdata/pointer/basic.carbon b/toolchain/check/testdata/pointer/basic.carbon index c3226f406744..59c04879cb17 100644 --- a/toolchain/check/testdata/pointer/basic.carbon +++ b/toolchain/check/testdata/pointer/basic.carbon @@ -139,7 +139,7 @@ fn F() -> i32 { // CHECK:STDOUT: %.loc16: init %i32 = converted %int_0, %Core.IntLiteral.as.ImplicitAs.impl.Convert.call [concrete = constants.%int_0.3c0] // CHECK:STDOUT: assign %n.var, %.loc16 // CHECK:STDOUT: %i32.loc16: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: ref %i32 = ref_binding n, %n.var +// 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] @@ -157,7 +157,7 @@ fn F() -> i32 { // CHECK:STDOUT: %i32.loc17: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %ptr: type = ptr_type %i32.loc17 [concrete = constants.%ptr.d08] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: ref %ptr.d08 = ref_binding p, %p.var +// CHECK:STDOUT: %p: ref %ptr.d08 = wrapper_binding p, %p.var // 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 diff --git a/toolchain/check/testdata/pointer/fail_deref_error.carbon b/toolchain/check/testdata/pointer/fail_deref_error.carbon index b5322a490eb6..a805a889527a 100644 --- a/toolchain/check/testdata/pointer/fail_deref_error.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_error.carbon @@ -56,12 +56,12 @@ let n2: i32 = undeclared->foo; // 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 = value_binding n, [concrete = ] +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %n2.patt: %pattern_type.6b6 = value_binding_pattern n2 [concrete = constants.%n2.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %i32.loc24: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n2: %i32 = value_binding n2, [concrete = ] +// CHECK:STDOUT: %n2: %i32 = wrapper_binding n2, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon b/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon index b7fa4620c957..5b1ac77631e5 100644 --- a/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon @@ -84,7 +84,7 @@ fn Deref(n: i32) { // CHECK:STDOUT: } { // CHECK:STDOUT: %n.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: %i32 = value_binding n, %n.param +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, %n.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/fail_deref_type.carbon b/toolchain/check/testdata/pointer/fail_deref_type.carbon index 0326952cc388..16bca74d1259 100644 --- a/toolchain/check/testdata/pointer/fail_deref_type.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_type.carbon @@ -60,7 +60,7 @@ var p2: i32->foo; // CHECK:STDOUT: %i32.loc22: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %.loc22: ref = deref %i32.loc22 [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: ref = ref_binding p, [concrete = ] +// CHECK:STDOUT: %p: = wrapper_binding p, [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %p2.patt: = ref_binding_pattern p2 [concrete = ] // CHECK:STDOUT: %p2.var_patt: = var_pattern %p2.patt [concrete = ] @@ -71,7 +71,7 @@ var p2: i32->foo; // CHECK:STDOUT: %.loc27: ref = deref %i32.loc27 [concrete = ] // CHECK:STDOUT: %foo.ref: = name_ref foo, [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %p2: ref = ref_binding p2, [concrete = ] +// CHECK:STDOUT: %p2: = wrapper_binding p2, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/pointer/fail_type_mismatch.carbon b/toolchain/check/testdata/pointer/fail_type_mismatch.carbon index 2d7e6d008419..e021a6b035f7 100644 --- a/toolchain/check/testdata/pointer/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/pointer/fail_type_mismatch.carbon @@ -78,7 +78,7 @@ fn ConstMismatch(p: const {}*) -> const ({}*) { // CHECK:STDOUT: %const.loc15_21: type = const_type %.loc15_21 [concrete = constants.%const.c48] // CHECK:STDOUT: %ptr.loc15_29: type = ptr_type %const.loc15_21 [concrete = constants.%ptr.bf9] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.bf9 = value_binding p, %p.param +// CHECK:STDOUT: %p: %ptr.bf9 = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref %const.987 = out_param call_param1 // CHECK:STDOUT: %return: ref %const.987 = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/pointer/import.carbon b/toolchain/check/testdata/pointer/import.carbon index c11b2cbf704c..8dc629dcf6e1 100644 --- a/toolchain/check/testdata/pointer/import.carbon +++ b/toolchain/check/testdata/pointer/import.carbon @@ -102,7 +102,7 @@ var a: i32* = a_ref; // CHECK:STDOUT: } // CHECK:STDOUT: %a_orig.var: ref %i32 = var %a_orig.var_patt [concrete] // CHECK:STDOUT: %i32.loc4: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %a_orig: ref %i32 = ref_binding a_orig, %a_orig.var [concrete = %a_orig.var] +// 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] @@ -112,7 +112,7 @@ var a: i32* = a_ref; // CHECK:STDOUT: %i32.loc5: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %ptr: type = ptr_type %i32.loc5 [concrete = constants.%ptr.d08] // CHECK:STDOUT: } -// CHECK:STDOUT: %a_ref: ref %ptr.d08 = ref_binding a_ref, %a_ref.var [concrete = %a_ref.var] +// CHECK:STDOUT: %a_ref: ref %ptr.d08 = wrapper_binding a_ref, %a_ref.var [concrete = %a_ref.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -197,7 +197,7 @@ var a: i32* = a_ref; // 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 = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %ptr.d08 = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/pointer/nested_const.carbon b/toolchain/check/testdata/pointer/nested_const.carbon index 7c0842eb92c4..87726631a9e4 100644 --- a/toolchain/check/testdata/pointer/nested_const.carbon +++ b/toolchain/check/testdata/pointer/nested_const.carbon @@ -96,7 +96,7 @@ fn F(p: const (const (const i32*)*)) -> const i32 { // CHECK:STDOUT: %ptr.loc16_34: type = ptr_type %const.loc16_16 [concrete = constants.%ptr.f93] // CHECK:STDOUT: %const.loc16_9: type = const_type %ptr.loc16_34 [concrete = constants.%const.99e] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %const.99e = value_binding p, %p.param +// CHECK:STDOUT: %p: %const.99e = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref %const.6a8 = out_param call_param1 // CHECK:STDOUT: %return: ref %const.6a8 = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/pointer/types.carbon b/toolchain/check/testdata/pointer/types.carbon index c522106d5d5e..552876a82e1c 100644 --- a/toolchain/check/testdata/pointer/types.carbon +++ b/toolchain/check/testdata/pointer/types.carbon @@ -100,7 +100,7 @@ fn ConstPtr(p: const i32*) -> (const i32)* { // CHECK:STDOUT: %i32.loc15_11: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %ptr.loc15_14: type = ptr_type %i32.loc15_11 [concrete = constants.%ptr.d08] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.d08 = value_binding p, %p.param +// CHECK:STDOUT: %p: %ptr.d08 = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref %ptr.d08 = out_param call_param1 // CHECK:STDOUT: %return: ref %ptr.d08 = return_slot %return.param // CHECK:STDOUT: } @@ -120,7 +120,7 @@ fn ConstPtr(p: const i32*) -> (const i32)* { // CHECK:STDOUT: %const.loc19_16: type = const_type %i32.loc19_22 [concrete = constants.%const.6a8] // CHECK:STDOUT: %ptr.loc19_25: type = ptr_type %const.loc19_16 [concrete = constants.%ptr.774] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: %ptr.774 = value_binding p, %p.param +// CHECK:STDOUT: %p: %ptr.774 = wrapper_binding p, %p.param // CHECK:STDOUT: %return.param: ref %ptr.774 = out_param call_param1 // CHECK:STDOUT: %return: ref %ptr.774 = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/primitives/string_literals.carbon b/toolchain/check/testdata/primitives/string_literals.carbon index 2f64ae5bd691..44ded3e8652c 100644 --- a/toolchain/check/testdata/primitives/string_literals.carbon +++ b/toolchain/check/testdata/primitives/string_literals.carbon @@ -132,7 +132,7 @@ This string contains 256 characters. Among them are: // CHECK:STDOUT: %x.patt: %pattern_type.adf = value_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %str: type = type_literal constants.%str.3d4 [concrete = constants.%str.3d4] -// CHECK:STDOUT: %x: %str.3d4 = value_binding x, @__global_init.%String.val +// CHECK:STDOUT: %x: %str.3d4 = wrapper_binding x, @__global_init.%String.val // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -160,7 +160,7 @@ This string contains 256 characters. Among them are: // CHECK:STDOUT: %x.patt: %pattern_type.adf = value_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %str: type = type_literal constants.%str.3d4 [concrete = constants.%str.3d4] -// CHECK:STDOUT: %x: %str.3d4 = value_binding x, [concrete = ] +// CHECK:STDOUT: %x: %str.3d4 = wrapper_binding x, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/primitives/type_literals.carbon b/toolchain/check/testdata/primitives/type_literals.carbon index b2398265f466..586ed3986b7e 100644 --- a/toolchain/check/testdata/primitives/type_literals.carbon +++ b/toolchain/check/testdata/primitives/type_literals.carbon @@ -338,28 +338,28 @@ var test_str: str = (); // CHECK:STDOUT: } // CHECK:STDOUT: %test_i8.var: ref %i8 = var %test_i8.var_patt [concrete] // CHECK:STDOUT: %i8: type = type_literal constants.%i8 [concrete = constants.%i8] -// CHECK:STDOUT: %test_i8: ref %i8 = ref_binding test_i8, %test_i8.var [concrete = %test_i8.var] +// CHECK:STDOUT: %test_i8: ref %i8 = wrapper_binding test_i8, %test_i8.var [concrete = %test_i8.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %test_i16.patt: %pattern_type.203 = ref_binding_pattern test_i16 [concrete = constants.%test_i16.patt] // CHECK:STDOUT: %test_i16.var_patt: %pattern_type.203 = var_pattern %test_i16.patt [concrete = constants.%test_i16.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %test_i16.var: ref %i16 = var %test_i16.var_patt [concrete] // CHECK:STDOUT: %i16: type = type_literal constants.%i16 [concrete = constants.%i16] -// CHECK:STDOUT: %test_i16: ref %i16 = ref_binding test_i16, %test_i16.var [concrete = %test_i16.var] +// CHECK:STDOUT: %test_i16: ref %i16 = wrapper_binding test_i16, %test_i16.var [concrete = %test_i16.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %test_i32.patt: %pattern_type.6b6 = ref_binding_pattern test_i32 [concrete = constants.%test_i32.patt] // CHECK:STDOUT: %test_i32.var_patt: %pattern_type.6b6 = var_pattern %test_i32.patt [concrete = constants.%test_i32.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %test_i32.var: ref %i32 = var %test_i32.var_patt [concrete] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %test_i32: ref %i32 = ref_binding test_i32, %test_i32.var [concrete = %test_i32.var] +// CHECK:STDOUT: %test_i32: ref %i32 = wrapper_binding test_i32, %test_i32.var [concrete = %test_i32.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %test_i64.patt: %pattern_type.f57 = ref_binding_pattern test_i64 [concrete = constants.%test_i64.patt] // CHECK:STDOUT: %test_i64.var_patt: %pattern_type.f57 = var_pattern %test_i64.patt [concrete = constants.%test_i64.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %test_i64.var: ref %i64 = var %test_i64.var_patt [concrete] // CHECK:STDOUT: %i64: type = type_literal constants.%i64 [concrete = constants.%i64] -// CHECK:STDOUT: %test_i64: ref %i64 = ref_binding test_i64, %test_i64.var [concrete = %test_i64.var] +// CHECK:STDOUT: %test_i64: ref %i64 = wrapper_binding test_i64, %test_i64.var [concrete = %test_i64.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -444,28 +444,28 @@ var test_str: str = (); // CHECK:STDOUT: } // CHECK:STDOUT: %test_u8.var: ref %u8 = var %test_u8.var_patt [concrete] // CHECK:STDOUT: %u8: type = type_literal constants.%u8 [concrete = constants.%u8] -// CHECK:STDOUT: %test_u8: ref %u8 = ref_binding test_u8, %test_u8.var [concrete = %test_u8.var] +// CHECK:STDOUT: %test_u8: ref %u8 = wrapper_binding test_u8, %test_u8.var [concrete = %test_u8.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %test_u16.patt: %pattern_type.17c = ref_binding_pattern test_u16 [concrete = constants.%test_u16.patt] // CHECK:STDOUT: %test_u16.var_patt: %pattern_type.17c = var_pattern %test_u16.patt [concrete = constants.%test_u16.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %test_u16.var: ref %u16 = var %test_u16.var_patt [concrete] // CHECK:STDOUT: %u16: type = type_literal constants.%u16 [concrete = constants.%u16] -// CHECK:STDOUT: %test_u16: ref %u16 = ref_binding test_u16, %test_u16.var [concrete = %test_u16.var] +// CHECK:STDOUT: %test_u16: ref %u16 = wrapper_binding test_u16, %test_u16.var [concrete = %test_u16.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %test_u32.patt: %pattern_type.668 = ref_binding_pattern test_u32 [concrete = constants.%test_u32.patt] // CHECK:STDOUT: %test_u32.var_patt: %pattern_type.668 = var_pattern %test_u32.patt [concrete = constants.%test_u32.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %test_u32.var: ref %u32 = var %test_u32.var_patt [concrete] // CHECK:STDOUT: %u32: type = type_literal constants.%u32 [concrete = constants.%u32] -// CHECK:STDOUT: %test_u32: ref %u32 = ref_binding test_u32, %test_u32.var [concrete = %test_u32.var] +// CHECK:STDOUT: %test_u32: ref %u32 = wrapper_binding test_u32, %test_u32.var [concrete = %test_u32.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %test_u64.patt: %pattern_type.b35 = ref_binding_pattern test_u64 [concrete = constants.%test_u64.patt] // CHECK:STDOUT: %test_u64.var_patt: %pattern_type.b35 = var_pattern %test_u64.patt [concrete = constants.%test_u64.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %test_u64.var: ref %u64 = var %test_u64.var_patt [concrete] // CHECK:STDOUT: %u64: type = type_literal constants.%u64 [concrete = constants.%u64] -// CHECK:STDOUT: %test_u64: ref %u64 = ref_binding test_u64, %test_u64.var [concrete = %test_u64.var] +// CHECK:STDOUT: %test_u64: ref %u64 = wrapper_binding test_u64, %test_u64.var [concrete = %test_u64.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -550,28 +550,28 @@ var test_str: str = (); // CHECK:STDOUT: } // CHECK:STDOUT: %test_f16.var: ref %f16.907 = var %test_f16.var_patt [concrete] // CHECK:STDOUT: %f16: type = type_literal constants.%f16.907 [concrete = constants.%f16.907] -// CHECK:STDOUT: %test_f16: ref %f16.907 = ref_binding test_f16, %test_f16.var [concrete = %test_f16.var] +// CHECK:STDOUT: %test_f16: ref %f16.907 = wrapper_binding test_f16, %test_f16.var [concrete = %test_f16.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %test_f32.patt: %pattern_type.240 = ref_binding_pattern test_f32 [concrete = constants.%test_f32.patt] // CHECK:STDOUT: %test_f32.var_patt: %pattern_type.240 = var_pattern %test_f32.patt [concrete = constants.%test_f32.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %test_f32.var: ref %f32.c73 = var %test_f32.var_patt [concrete] // CHECK:STDOUT: %f32: type = type_literal constants.%f32.c73 [concrete = constants.%f32.c73] -// CHECK:STDOUT: %test_f32: ref %f32.c73 = ref_binding test_f32, %test_f32.var [concrete = %test_f32.var] +// CHECK:STDOUT: %test_f32: ref %f32.c73 = wrapper_binding test_f32, %test_f32.var [concrete = %test_f32.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %test_f64.patt: %pattern_type.fb7 = ref_binding_pattern test_f64 [concrete = constants.%test_f64.patt] // CHECK:STDOUT: %test_f64.var_patt: %pattern_type.fb7 = var_pattern %test_f64.patt [concrete = constants.%test_f64.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %test_f64.var: ref %f64.dc1 = var %test_f64.var_patt [concrete] // CHECK:STDOUT: %f64: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %test_f64: ref %f64.dc1 = ref_binding test_f64, %test_f64.var [concrete = %test_f64.var] +// CHECK:STDOUT: %test_f64: ref %f64.dc1 = wrapper_binding test_f64, %test_f64.var [concrete = %test_f64.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %test_f128.patt: %pattern_type.847 = ref_binding_pattern test_f128 [concrete = constants.%test_f128.patt] // CHECK:STDOUT: %test_f128.var_patt: %pattern_type.847 = var_pattern %test_f128.patt [concrete = constants.%test_f128.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %test_f128.var: ref %f128.e39 = var %test_f128.var_patt [concrete] // CHECK:STDOUT: %f128: type = type_literal constants.%f128.e39 [concrete = constants.%f128.e39] -// CHECK:STDOUT: %test_f128: ref %f128.e39 = ref_binding test_f128, %test_f128.var [concrete = %test_f128.var] +// CHECK:STDOUT: %test_f128: ref %f128.e39 = wrapper_binding test_f128, %test_f128.var [concrete = %test_f128.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -640,7 +640,7 @@ var test_str: str = (); // CHECK:STDOUT: %.loc5_23.1: %char = value_of_initializer %Core.CharLiteral.as.ImplicitAs.impl.Convert.call [concrete = constants.%int_99] // CHECK:STDOUT: %.loc5_23.2: %char = converted @__global_init.%.loc5, %.loc5_23.1 [concrete = constants.%int_99] // CHECK:STDOUT: %char: type = type_literal constants.%char [concrete = constants.%char] -// CHECK:STDOUT: %test_char: %char = value_binding test_char, %.loc5_23.2 +// CHECK:STDOUT: %test_char: %char = wrapper_binding test_char, %.loc5_23.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -670,7 +670,7 @@ var test_str: str = (); // CHECK:STDOUT: %test_str.patt: %pattern_type.adf = value_binding_pattern test_str [concrete = constants.%test_str.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %str: type = type_literal constants.%str.3d4 [concrete = constants.%str.3d4] -// CHECK:STDOUT: %test_str: %str.3d4 = value_binding test_str, @__global_init.%String.val +// CHECK:STDOUT: %test_str: %str.3d4 = wrapper_binding test_str, @__global_init.%String.val // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -711,7 +711,7 @@ var test_str: str = (); // CHECK:STDOUT: } // CHECK:STDOUT: %test_type.var: ref type = var %test_type.var_patt [concrete] // CHECK:STDOUT: %.loc5: type = type_literal type [concrete = type] -// CHECK:STDOUT: %test_type: ref type = ref_binding test_type, %test_type.var [concrete = %test_type.var] +// CHECK:STDOUT: %test_type: ref type = wrapper_binding test_type, %test_type.var [concrete = %test_type.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/return/code_after_return_value.carbon b/toolchain/check/testdata/return/code_after_return_value.carbon index 562067cbb43d..5934f9827e53 100644 --- a/toolchain/check/testdata/return/code_after_return_value.carbon +++ b/toolchain/check/testdata/return/code_after_return_value.carbon @@ -93,7 +93,7 @@ fn F(unused b: bool) -> i32 { // CHECK:STDOUT: %.loc15_25: Core.Form = init_form %i32 [concrete = constants.%.795] // CHECK:STDOUT: %b.param: bool = value_param call_param0 // CHECK:STDOUT: %.loc15_16: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %b: bool = value_binding b, %b.param +// CHECK:STDOUT: %b: bool = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/return/fail_let_in_type.carbon b/toolchain/check/testdata/return/fail_let_in_type.carbon index f5ac24d741a6..f9421aee6db6 100644 --- a/toolchain/check/testdata/return/fail_let_in_type.carbon +++ b/toolchain/check/testdata/return/fail_let_in_type.carbon @@ -89,7 +89,7 @@ fn FirstPerfectNumber() -> z { return 6; } // CHECK:STDOUT: %x.patt: %pattern_type.98f = value_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc15: type = type_literal type [concrete = type] -// CHECK:STDOUT: %x: type = value_binding x, @__global_init.%i32.loc15 +// CHECK:STDOUT: %x: type = wrapper_binding x, @__global_init.%i32.loc15 // CHECK:STDOUT: %Six.decl: %Six.type = fn_decl @Six [concrete = constants.%Six] { // CHECK:STDOUT: %return.patt: = return_slot_pattern , [concrete = ] // CHECK:STDOUT: } { @@ -103,7 +103,7 @@ fn FirstPerfectNumber() -> z { return 6; } // CHECK:STDOUT: %.Self.loc27: %type = symbolic_binding .Self [symbolic_self = constants.%.Self] // CHECK:STDOUT: %.loc27_9.2: type = type_literal type [concrete = type] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: type = value_binding y, @__global_init.%i32.loc27 +// CHECK:STDOUT: %y: type = wrapper_binding y, @__global_init.%i32.loc27 // CHECK:STDOUT: %HalfDozen.decl: %HalfDozen.type = fn_decl @HalfDozen [concrete = constants.%HalfDozen] { // CHECK:STDOUT: %return.patt: = return_slot_pattern , [concrete = ] // CHECK:STDOUT: } { @@ -117,7 +117,7 @@ fn FirstPerfectNumber() -> z { return 6; } // CHECK:STDOUT: %.Self.loc39: %type = symbolic_binding .Self [symbolic_self = constants.%.Self] // CHECK:STDOUT: %.loc39_18.2: type = type_literal type [concrete = type] // CHECK:STDOUT: } -// CHECK:STDOUT: %z: type = value_binding z, @__global_init.%i32.loc39 +// CHECK:STDOUT: %z: type = wrapper_binding z, @__global_init.%i32.loc39 // CHECK:STDOUT: %FirstPerfectNumber.decl: %FirstPerfectNumber.type = fn_decl @FirstPerfectNumber [concrete = constants.%FirstPerfectNumber] { // CHECK:STDOUT: %return.patt: = return_slot_pattern , [concrete = ] // CHECK:STDOUT: } { diff --git a/toolchain/check/testdata/return/fail_return_with_returned_var.carbon b/toolchain/check/testdata/return/fail_return_with_returned_var.carbon index 678401429fde..6fbaef05cf48 100644 --- a/toolchain/check/testdata/return/fail_return_with_returned_var.carbon +++ b/toolchain/check/testdata/return/fail_return_with_returned_var.carbon @@ -171,7 +171,7 @@ fn G() -> C { // CHECK:STDOUT: %.loc16: init %i32 = converted %int_0, %Core.IntLiteral.as.ImplicitAs.impl.Convert.call [concrete = constants.%int_0.3c0] // CHECK:STDOUT: assign %v.var, %.loc16 // CHECK:STDOUT: %i32.loc16: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %v: ref %i32 = ref_binding v, %v.var +// CHECK:STDOUT: %v: ref %i32 = wrapper_binding v, %v.var // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %v.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%v.var) @@ -214,7 +214,7 @@ fn G() -> C { // CHECK:STDOUT: %.loc29_12: init %C = converted %.loc29_38.1, %.loc29_38.8 [concrete = constants.%C.val] // CHECK:STDOUT: assign %return.param, %.loc29_12 // CHECK:STDOUT: %C.ref.loc29: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %c: ref %C = ref_binding c, %return.param +// CHECK:STDOUT: %c: ref %C = wrapper_binding c, %return.param // CHECK:STDOUT: %c.ref: ref %C = name_ref c, %c // CHECK:STDOUT: return // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/return/fail_returned_var_no_return_type.carbon b/toolchain/check/testdata/return/fail_returned_var_no_return_type.carbon index e6ed43ef4b01..3626a6564e45 100644 --- a/toolchain/check/testdata/return/fail_returned_var_no_return_type.carbon +++ b/toolchain/check/testdata/return/fail_returned_var_no_return_type.carbon @@ -96,7 +96,7 @@ fn ForgotReturnType() { // CHECK:STDOUT: %.loc12_27.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc12_27.3: type = converted %.loc12_27.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: ref %empty_tuple.type = ref_binding v, %v.var +// CHECK:STDOUT: %v: ref %empty_tuple.type = wrapper_binding v, %v.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %v.var, constants.%Destroy.Op // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%v.var) // CHECK:STDOUT: return @@ -152,7 +152,7 @@ fn ForgotReturnType() { // CHECK:STDOUT: %.loc12_27.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc12_27.3: type = converted %.loc12_27.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: ref %empty_tuple.type = ref_binding v, %v.var +// CHECK:STDOUT: %v: ref %empty_tuple.type = wrapper_binding v, %v.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %v.var, constants.%Destroy.Op // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%v.var) // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/return/fail_returned_var_shadow.carbon b/toolchain/check/testdata/return/fail_returned_var_shadow.carbon index a0d150e15114..ff4b2d8551ab 100644 --- a/toolchain/check/testdata/return/fail_returned_var_shadow.carbon +++ b/toolchain/check/testdata/return/fail_returned_var_shadow.carbon @@ -156,7 +156,7 @@ fn DifferentScopes() -> i32 { // CHECK:STDOUT: %.loc17: init %i32 = converted %int_0.loc17, %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc17 [concrete = constants.%int_0.3c0] // CHECK:STDOUT: assign %v.var, %.loc17 // CHECK:STDOUT: %i32.loc17: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %v: ref %i32 = ref_binding v, %v.var +// CHECK:STDOUT: %v: ref %i32 = wrapper_binding v, %v.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %w.patt: %pattern_type.6b6 = ref_binding_pattern w [concrete = constants.%w.patt.859340.1] // CHECK:STDOUT: %w.var_patt: %pattern_type.6b6 = var_pattern %w.patt [concrete = constants.%w.var_patt.82cc74.1] @@ -171,7 +171,7 @@ fn DifferentScopes() -> i32 { // CHECK:STDOUT: %.loc25: init %i32 = converted %int_1, %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc25 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: assign %w.var, %.loc25 // CHECK:STDOUT: %i32.loc25: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %w: ref %i32 = ref_binding w, %w.var +// CHECK:STDOUT: %w: ref %i32 = wrapper_binding w, %w.var // CHECK:STDOUT: br !if.else // CHECK:STDOUT: // CHECK:STDOUT: !if.else: @@ -216,7 +216,7 @@ fn DifferentScopes() -> i32 { // CHECK:STDOUT: %.loc32: init %i32 = converted %int_0.loc32, %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc32 [concrete = constants.%int_0.3c0] // CHECK:STDOUT: assign %v.var, %.loc32 // CHECK:STDOUT: %i32.loc32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %v: ref %i32 = ref_binding v, %v.var +// CHECK:STDOUT: %v: ref %i32 = wrapper_binding v, %v.var // CHECK:STDOUT: %true.loc33: bool = bool_literal true [concrete = constants.%true] // CHECK:STDOUT: if %true.loc33 br !if.then.loc33 else br !if.else.loc33 // CHECK:STDOUT: @@ -235,7 +235,7 @@ fn DifferentScopes() -> i32 { // CHECK:STDOUT: %.loc41: init %i32 = converted %int_1, %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc41 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: assign %w.var, %.loc41 // CHECK:STDOUT: %i32.loc41: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %w: ref %i32 = ref_binding w, %w.var +// CHECK:STDOUT: %w: ref %i32 = wrapper_binding w, %w.var // CHECK:STDOUT: br !if.else.loc33 // CHECK:STDOUT: // CHECK:STDOUT: !if.else.loc33: diff --git a/toolchain/check/testdata/return/fail_returned_var_type.carbon b/toolchain/check/testdata/return/fail_returned_var_type.carbon index 57e82060c56a..7a844f19a516 100644 --- a/toolchain/check/testdata/return/fail_returned_var_type.carbon +++ b/toolchain/check/testdata/return/fail_returned_var_type.carbon @@ -118,7 +118,7 @@ fn Mismatch() -> i32 { // CHECK:STDOUT: %.loc23_12: init %f64.dc1 = converted %float, %Core.FloatLiteral.as.ImplicitAs.impl.Convert.call [concrete = constants.%float.895] // CHECK:STDOUT: assign %v.var, %.loc23_12 // CHECK:STDOUT: %f64: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] -// CHECK:STDOUT: %v: ref %f64.dc1 = ref_binding v, %v.var +// CHECK:STDOUT: %v: ref %f64.dc1 = wrapper_binding v, %v.var // CHECK:STDOUT: %.loc23_17: %f64.dc1 = acquire_value %v // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %v.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%v.var) diff --git a/toolchain/check/testdata/return/fail_var_in_type.carbon b/toolchain/check/testdata/return/fail_var_in_type.carbon index cc93dbd60db0..0be96d358efe 100644 --- a/toolchain/check/testdata/return/fail_var_in_type.carbon +++ b/toolchain/check/testdata/return/fail_var_in_type.carbon @@ -68,7 +68,7 @@ fn Six() -> x { return 6; } // CHECK:STDOUT: } // CHECK:STDOUT: %x.var: ref type = var %x.var_patt [concrete] // CHECK:STDOUT: %.loc15: type = type_literal type [concrete = type] -// CHECK:STDOUT: %x: ref type = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref type = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: %Six.decl: %Six.type = fn_decl @Six [concrete = constants.%Six] { // CHECK:STDOUT: %return.patt: = return_slot_pattern , [concrete = ] // CHECK:STDOUT: } { diff --git a/toolchain/check/testdata/return/import_convert_function.carbon b/toolchain/check/testdata/return/import_convert_function.carbon index 254122c46713..c650c78a3695 100644 --- a/toolchain/check/testdata/return/import_convert_function.carbon +++ b/toolchain/check/testdata/return/import_convert_function.carbon @@ -363,7 +363,7 @@ fn F0(unused n: i32) -> P.D { // CHECK:STDOUT: %.loc8_62.2: Core.Form = init_form %D.ref [concrete = constants.%.128] // CHECK:STDOUT: %self.param: %C.771 = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @C.as.ImplicitAs.impl.0e1.%C [concrete = constants.%C.771] -// CHECK:STDOUT: %self: %C.771 = value_binding self, %self.param +// CHECK:STDOUT: %self: %C.771 = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref %D = out_param call_param1 // CHECK:STDOUT: %return: ref %D = return_slot %return.param // CHECK:STDOUT: } @@ -389,7 +389,7 @@ fn F0(unused n: i32) -> P.D { // CHECK:STDOUT: %.loc9_62.2: Core.Form = init_form %D.ref [concrete = constants.%.128] // CHECK:STDOUT: %self.param: %C.83b = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @C.as.ImplicitAs.impl.f6a.%C [concrete = constants.%C.83b] -// CHECK:STDOUT: %self: %C.83b = value_binding self, %self.param +// CHECK:STDOUT: %self: %C.83b = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref %D = out_param call_param1 // CHECK:STDOUT: %return: ref %D = return_slot %return.param // CHECK:STDOUT: } @@ -415,7 +415,7 @@ fn F0(unused n: i32) -> P.D { // CHECK:STDOUT: %.loc10_62.2: Core.Form = init_form %D.ref [concrete = constants.%.128] // CHECK:STDOUT: %self.param: %C.5ce = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @C.as.ImplicitAs.impl.aab.%C [concrete = constants.%C.5ce] -// CHECK:STDOUT: %self: %C.5ce = value_binding self, %self.param +// CHECK:STDOUT: %self: %C.5ce = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref %D = out_param call_param1 // CHECK:STDOUT: %return: ref %D = return_slot %return.param // CHECK:STDOUT: } @@ -441,7 +441,7 @@ fn F0(unused n: i32) -> P.D { // CHECK:STDOUT: %.loc11_62.2: Core.Form = init_form %D.ref [concrete = constants.%.128] // CHECK:STDOUT: %self.param: %C.b3e = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @C.as.ImplicitAs.impl.203.%C [concrete = constants.%C.b3e] -// CHECK:STDOUT: %self: %C.b3e = value_binding self, %self.param +// CHECK:STDOUT: %self: %C.b3e = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref %D = out_param call_param1 // CHECK:STDOUT: %return: ref %D = return_slot %return.param // CHECK:STDOUT: } @@ -467,7 +467,7 @@ fn F0(unused n: i32) -> P.D { // CHECK:STDOUT: %.loc12_62.2: Core.Form = init_form %D.ref [concrete = constants.%.128] // CHECK:STDOUT: %self.param: %C.8ee = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @C.as.ImplicitAs.impl.371.%C [concrete = constants.%C.8ee] -// CHECK:STDOUT: %self: %C.8ee = value_binding self, %self.param +// CHECK:STDOUT: %self: %C.8ee = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref %D = out_param call_param1 // CHECK:STDOUT: %return: ref %D = return_slot %return.param // CHECK:STDOUT: } @@ -493,7 +493,7 @@ fn F0(unused n: i32) -> P.D { // CHECK:STDOUT: %.loc13_62.2: Core.Form = init_form %D.ref [concrete = constants.%.128] // CHECK:STDOUT: %self.param: %C.5c1 = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @C.as.ImplicitAs.impl.c73.%C [concrete = constants.%C.5c1] -// CHECK:STDOUT: %self: %C.5c1 = value_binding self, %self.param +// CHECK:STDOUT: %self: %C.5c1 = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref %D = out_param call_param1 // CHECK:STDOUT: %return: ref %D = return_slot %return.param // CHECK:STDOUT: } @@ -519,7 +519,7 @@ fn F0(unused n: i32) -> P.D { // CHECK:STDOUT: %.loc14_62.2: Core.Form = init_form %D.ref [concrete = constants.%.128] // CHECK:STDOUT: %self.param: %C.57b = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @C.as.ImplicitAs.impl.2f3.%C [concrete = constants.%C.57b] -// CHECK:STDOUT: %self: %C.57b = value_binding self, %self.param +// CHECK:STDOUT: %self: %C.57b = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref %D = out_param call_param1 // CHECK:STDOUT: %return: ref %D = return_slot %return.param // CHECK:STDOUT: } @@ -545,7 +545,7 @@ fn F0(unused n: i32) -> P.D { // CHECK:STDOUT: %.loc15_62.2: Core.Form = init_form %D.ref [concrete = constants.%.128] // CHECK:STDOUT: %self.param: %C.b0a = value_param call_param0 // CHECK:STDOUT: %Self.ref: type = name_ref Self, @C.as.ImplicitAs.impl.28a.%C [concrete = constants.%C.b0a] -// CHECK:STDOUT: %self: %C.b0a = value_binding self, %self.param +// CHECK:STDOUT: %self: %C.b0a = wrapper_binding self, %self.param // CHECK:STDOUT: %return.param: ref %D = out_param call_param1 // CHECK:STDOUT: %return: ref %D = return_slot %return.param // CHECK:STDOUT: } @@ -1011,7 +1011,7 @@ fn F0(unused n: i32) -> P.D { // CHECK:STDOUT: %.loc6_26.10: Core.Form = init_form %D.ref [concrete = constants.%.128] // CHECK:STDOUT: %n.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: %i32 = value_binding n, %n.param +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, %n.param // CHECK:STDOUT: %return.param: ref %D = out_param call_param1 // CHECK:STDOUT: %return: ref %D = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/return/returned_var.carbon b/toolchain/check/testdata/return/returned_var.carbon index 09e95435f59e..6629e6dcd6d2 100644 --- a/toolchain/check/testdata/return/returned_var.carbon +++ b/toolchain/check/testdata/return/returned_var.carbon @@ -174,7 +174,7 @@ fn G() -> i32 { // CHECK:STDOUT: %.loc21_12: init %C = converted %.loc21_43.1, %.loc21_43.8 [concrete = constants.%C.val] // CHECK:STDOUT: assign %return.param, %.loc21_12 // CHECK:STDOUT: %C.ref.loc21: type = name_ref C, file.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: %result: ref %C = ref_binding result, %return.param +// CHECK:STDOUT: %result: ref %C = wrapper_binding result, %return.param // CHECK:STDOUT: %.loc21_22: %C = acquire_value %result // CHECK:STDOUT: return %.loc21_22 to %return.param // CHECK:STDOUT: } @@ -195,7 +195,7 @@ fn G() -> i32 { // CHECK:STDOUT: %.loc26_12: init %i32 = converted %int_0, %Core.IntLiteral.as.ImplicitAs.impl.Convert.call [concrete = constants.%int_0.3c0] // CHECK:STDOUT: assign %result.var, %.loc26_12 // CHECK:STDOUT: %i32.loc26: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %result: ref %i32 = ref_binding result, %result.var +// CHECK:STDOUT: %result: ref %i32 = wrapper_binding result, %result.var // CHECK:STDOUT: %.loc26_22: %i32 = acquire_value %result // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %result.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%result.var) diff --git a/toolchain/check/testdata/return/returned_var_scope.carbon b/toolchain/check/testdata/return/returned_var_scope.carbon index e764a39f14a4..c4045f7e6bd1 100644 --- a/toolchain/check/testdata/return/returned_var_scope.carbon +++ b/toolchain/check/testdata/return/returned_var_scope.carbon @@ -125,7 +125,7 @@ fn EnclosingButAfter(b: bool) -> i32 { // CHECK:STDOUT: %.loc25_34: Core.Form = init_form %i32.loc25 [concrete = constants.%.795] // CHECK:STDOUT: %b.param: bool = value_param call_param0 // CHECK:STDOUT: %.loc25_25: type = type_literal bool [concrete = bool] -// CHECK:STDOUT: %b: bool = value_binding b, %b.param +// CHECK:STDOUT: %b: bool = wrapper_binding b, %b.param // CHECK:STDOUT: %return.param: ref %i32 = out_param call_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param // CHECK:STDOUT: } @@ -151,7 +151,7 @@ fn EnclosingButAfter(b: bool) -> i32 { // CHECK:STDOUT: %.loc17: init %i32 = converted %int_0.loc17, %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc17 [concrete = constants.%int_0.3c0] // CHECK:STDOUT: assign %v.var, %.loc17 // CHECK:STDOUT: %i32.loc17: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %v: ref %i32 = ref_binding v, %v.var +// CHECK:STDOUT: %v: ref %i32 = wrapper_binding v, %v.var // CHECK:STDOUT: br !if.else.loc16 // CHECK:STDOUT: // CHECK:STDOUT: !if.else.loc16: @@ -173,7 +173,7 @@ fn EnclosingButAfter(b: bool) -> i32 { // CHECK:STDOUT: %.loc20: init %i32 = converted %int_1, %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc20 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: assign %w.var, %.loc20 // CHECK:STDOUT: %i32.loc20: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %w: ref %i32 = ref_binding w, %w.var +// CHECK:STDOUT: %w: ref %i32 = wrapper_binding w, %w.var // CHECK:STDOUT: br !if.else.loc19 // CHECK:STDOUT: // CHECK:STDOUT: !if.else.loc19: @@ -218,7 +218,7 @@ fn EnclosingButAfter(b: bool) -> i32 { // CHECK:STDOUT: %.loc27_14: init %i32 = converted %int_0, %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc27 [concrete = constants.%int_0.3c0] // CHECK:STDOUT: assign %v.var, %.loc27_14 // CHECK:STDOUT: %i32.loc27: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %v: ref %i32 = ref_binding v, %v.var +// CHECK:STDOUT: %v: ref %i32 = wrapper_binding v, %v.var // CHECK:STDOUT: %.loc27_19: %i32 = acquire_value %v // CHECK:STDOUT: %Destroy.Op.bound.loc27_14.1: = bound_method %v.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call.loc27_14.1: init %empty_tuple.type = call %Destroy.Op.bound.loc27_14.1(%v.var) @@ -239,7 +239,7 @@ fn EnclosingButAfter(b: bool) -> i32 { // CHECK:STDOUT: %.loc30_12: init %i32 = converted %int_1, %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc30 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: assign %w.var, %.loc30_12 // CHECK:STDOUT: %i32.loc30: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %w: ref %i32 = ref_binding w, %w.var +// CHECK:STDOUT: %w: ref %i32 = wrapper_binding w, %w.var // CHECK:STDOUT: %.loc30_17: %i32 = acquire_value %w // CHECK:STDOUT: %Destroy.Op.bound.loc30: = bound_method %w.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call.loc30: init %empty_tuple.type = call %Destroy.Op.bound.loc30(%w.var) diff --git a/toolchain/check/testdata/struct/empty.carbon b/toolchain/check/testdata/struct/empty.carbon index 026ce352b399..512bd80cadda 100644 --- a/toolchain/check/testdata/struct/empty.carbon +++ b/toolchain/check/testdata/struct/empty.carbon @@ -41,7 +41,7 @@ var y: {} = x; // CHECK:STDOUT: %.loc15_9.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc15_9.3: type = converted %.loc15_9.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %empty_struct_type = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %empty_struct_type = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %y.patt: %pattern_type = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type = var_pattern %y.patt [concrete = constants.%y.var_patt] @@ -51,7 +51,7 @@ var y: {} = x; // CHECK:STDOUT: %.loc16_9.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc16_9.3: type = converted %.loc16_9.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: ref %empty_struct_type = ref_binding y, %y.var [concrete = %y.var] +// CHECK:STDOUT: %y: ref %empty_struct_type = wrapper_binding y, %y.var [concrete = %y.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/struct/fail_assign_empty.carbon b/toolchain/check/testdata/struct/fail_assign_empty.carbon index 6b0549e75dc0..cf0e16b779ee 100644 --- a/toolchain/check/testdata/struct/fail_assign_empty.carbon +++ b/toolchain/check/testdata/struct/fail_assign_empty.carbon @@ -57,7 +57,7 @@ var x: {.a: i32} = {}; // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a: type = struct_type {.a: %i32} [concrete = constants.%struct_type.a] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %struct_type.a = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %struct_type.a = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/struct/fail_assign_nested.carbon b/toolchain/check/testdata/struct/fail_assign_nested.carbon index 67fb49fb7e11..3cd4442287ff 100644 --- a/toolchain/check/testdata/struct/fail_assign_nested.carbon +++ b/toolchain/check/testdata/struct/fail_assign_nested.carbon @@ -45,7 +45,7 @@ var x: {.a: {}} = {.b = {}}; // CHECK:STDOUT: %.loc19_14.2: type = converted %.loc19_14.1, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: %struct_type.a: type = struct_type {.a: %empty_struct_type} [concrete = constants.%struct_type.a.225] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %struct_type.a.225 = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %struct_type.a.225 = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/struct/fail_assign_to_empty.carbon b/toolchain/check/testdata/struct/fail_assign_to_empty.carbon index d8a05e5b7529..767982e10fb3 100644 --- a/toolchain/check/testdata/struct/fail_assign_to_empty.carbon +++ b/toolchain/check/testdata/struct/fail_assign_to_empty.carbon @@ -53,7 +53,7 @@ var x: {} = {.a = 1}; // CHECK:STDOUT: %.loc19_9.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc19_9.3: type = converted %.loc19_9.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %empty_struct_type = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %empty_struct_type = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/struct/fail_duplicate_name.carbon b/toolchain/check/testdata/struct/fail_duplicate_name.carbon index 04d2a15fb950..cea5118a4125 100644 --- a/toolchain/check/testdata/struct/fail_duplicate_name.carbon +++ b/toolchain/check/testdata/struct/fail_duplicate_name.carbon @@ -120,12 +120,12 @@ var y: {.b: i32, .c: i32} = {.b = 3, .b = 4}; // CHECK:STDOUT: %i32.loc31_13: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %i32.loc31_22: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: = value_binding v, [concrete = ] +// CHECK:STDOUT: %v: = wrapper_binding v, [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %w.patt: %pattern_type.6b6 = value_binding_pattern w [concrete = constants.%w.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %i32.loc40: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %w: %i32 = value_binding w, [concrete = ] +// CHECK:STDOUT: %w: %i32 = wrapper_binding w, [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %x.patt: %pattern_type.506 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.506 = var_pattern %x.patt [concrete = constants.%x.var_patt] @@ -135,7 +135,7 @@ var y: {.b: i32, .c: i32} = {.b = 3, .b = 4}; // CHECK:STDOUT: %i32.loc49: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a: type = struct_type {.a: %i32} [concrete = constants.%struct_type.a.a92] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %struct_type.a.a92 = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %struct_type.a.a92 = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %y.patt: %pattern_type.f19 = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type.f19 = var_pattern %y.patt [concrete = constants.%y.var_patt] @@ -146,7 +146,7 @@ var y: {.b: i32, .c: i32} = {.b = 3, .b = 4}; // CHECK:STDOUT: %i32.loc58_22: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.b.c: type = struct_type {.b: %i32, .c: %i32} [concrete = constants.%struct_type.b.c] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: ref %struct_type.b.c = ref_binding y, %y.var [concrete = %y.var] +// CHECK:STDOUT: %y: ref %struct_type.b.c = wrapper_binding y, %y.var [concrete = %y.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> ; diff --git a/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon b/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon index 6bbe8de5bc02..30a6456c43c1 100644 --- a/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon +++ b/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon @@ -124,7 +124,7 @@ var y: {.b: i32} = x; // CHECK:STDOUT: %i32.loc15: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a.loc15: type = struct_type {.a: %i32} [concrete = constants.%struct_type.a.a92] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %struct_type.a.a92 = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %struct_type.a.a92 = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.20e3 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.20e3 = var_pattern %b.patt [concrete = constants.%b.var_patt] @@ -135,7 +135,7 @@ var y: {.b: i32} = x; // CHECK:STDOUT: %i32.loc20_22: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a.b: type = struct_type {.a: %i32, .b: %i32} [concrete = constants.%struct_type.a.b] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: ref %struct_type.a.b = ref_binding b, %b.var [concrete = %b.var] +// CHECK:STDOUT: %b: ref %struct_type.a.b = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %x.patt: %pattern_type.506 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.506 = var_pattern %x.patt [concrete = constants.%x.var_patt] @@ -145,7 +145,7 @@ var y: {.b: i32} = x; // CHECK:STDOUT: %i32.loc26: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a.loc26: type = struct_type {.a: %i32} [concrete = constants.%struct_type.a.a92] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %struct_type.a.a92 = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %struct_type.a.a92 = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %y.patt: %pattern_type.b29 = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type.b29 = var_pattern %y.patt [concrete = constants.%y.var_patt] @@ -155,7 +155,7 @@ var y: {.b: i32} = x; // CHECK:STDOUT: %i32.loc32: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.b: type = struct_type {.b: %i32} [concrete = constants.%struct_type.b.0bf] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: ref %struct_type.b.0bf = ref_binding y, %y.var [concrete = %y.var] +// CHECK:STDOUT: %y: ref %struct_type.b.0bf = wrapper_binding y, %y.var [concrete = %y.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon b/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon index 2ae3c6c1f97d..b0ba69a18caa 100644 --- a/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon +++ b/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon @@ -58,7 +58,7 @@ var x: {.a: i32} = {.b = 1.0}; // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a: type = struct_type {.a: %i32} [concrete = constants.%struct_type.a] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %struct_type.a = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %struct_type.a = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/struct/fail_member_access_type.carbon b/toolchain/check/testdata/struct/fail_member_access_type.carbon index 363d9cf54185..7b4748869c25 100644 --- a/toolchain/check/testdata/struct/fail_member_access_type.carbon +++ b/toolchain/check/testdata/struct/fail_member_access_type.carbon @@ -90,14 +90,14 @@ var y: i32 = x.b; // CHECK:STDOUT: %f64: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] // CHECK:STDOUT: %struct_type.a: type = struct_type {.a: %f64.dc1} [concrete = constants.%struct_type.a.752] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %struct_type.a.752 = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %struct_type.a.752 = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %y.patt: %pattern_type.6b6 = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type.6b6 = var_pattern %y.patt [concrete = constants.%y.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %y.var: ref %i32 = var %y.var_patt [concrete] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %y: ref %i32 = ref_binding y, %y.var [concrete = %y.var] +// CHECK:STDOUT: %y: ref %i32 = wrapper_binding y, %y.var [concrete = %y.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/struct/fail_nested_incomplete.carbon b/toolchain/check/testdata/struct/fail_nested_incomplete.carbon index 7b3a5da683b8..00c0fec0ff48 100644 --- a/toolchain/check/testdata/struct/fail_nested_incomplete.carbon +++ b/toolchain/check/testdata/struct/fail_nested_incomplete.carbon @@ -52,7 +52,7 @@ var p: Incomplete* = &s.a; // CHECK:STDOUT: %Incomplete.ref.loc24: type = name_ref Incomplete, %Incomplete.decl [concrete = constants.%Incomplete] // CHECK:STDOUT: %struct_type.a: type = struct_type {.a: %Incomplete} [concrete = constants.%struct_type.a] // CHECK:STDOUT: } -// CHECK:STDOUT: %s: ref = ref_binding s, [concrete = ] +// CHECK:STDOUT: %s: = wrapper_binding s, [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %p.patt: %pattern_type = ref_binding_pattern p [concrete = constants.%p.patt] // CHECK:STDOUT: %p.var_patt: %pattern_type = var_pattern %p.patt [concrete = constants.%p.var_patt] @@ -62,7 +62,7 @@ var p: Incomplete* = &s.a; // CHECK:STDOUT: %Incomplete.ref.loc26: type = name_ref Incomplete, %Incomplete.decl [concrete = constants.%Incomplete] // CHECK:STDOUT: %ptr: type = ptr_type %Incomplete.ref.loc26 [concrete = constants.%ptr] // CHECK:STDOUT: } -// CHECK:STDOUT: %p: ref %ptr = ref_binding p, %p.var [concrete = %p.var] +// CHECK:STDOUT: %p: ref %ptr = wrapper_binding p, %p.var [concrete = %p.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Incomplete; @@ -70,7 +70,7 @@ var p: Incomplete* = &s.a; // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: // CHECK:STDOUT: assign file.%s.var, -// CHECK:STDOUT: %s.ref: ref = name_ref s, file.%s [concrete = ] +// CHECK:STDOUT: %s.ref: = name_ref s, file.%s [concrete = ] // CHECK:STDOUT: %a.ref: = name_ref a, [concrete = ] // CHECK:STDOUT: %addr: = addr_of %a.ref [concrete = ] // CHECK:STDOUT: assign file.%p.var, diff --git a/toolchain/check/testdata/struct/fail_non_member_access.carbon b/toolchain/check/testdata/struct/fail_non_member_access.carbon index 1c3f2f528f5c..2271db25cfe9 100644 --- a/toolchain/check/testdata/struct/fail_non_member_access.carbon +++ b/toolchain/check/testdata/struct/fail_non_member_access.carbon @@ -84,14 +84,14 @@ var y: i32 = x.b; // CHECK:STDOUT: %i32.loc15: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a: type = struct_type {.a: %i32} [concrete = constants.%struct_type.a.a92] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %struct_type.a.a92 = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %struct_type.a.a92 = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %y.patt: %pattern_type.6b6 = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type.6b6 = var_pattern %y.patt [concrete = constants.%y.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %y.var: ref %i32 = var %y.var_patt [concrete] // CHECK:STDOUT: %i32.loc20: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %y: ref %i32 = ref_binding y, %y.var [concrete = %y.var] +// CHECK:STDOUT: %y: ref %i32 = wrapper_binding y, %y.var [concrete = %y.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/struct/fail_too_few_values.carbon b/toolchain/check/testdata/struct/fail_too_few_values.carbon index 53d58a050fd9..08c82212fb45 100644 --- a/toolchain/check/testdata/struct/fail_too_few_values.carbon +++ b/toolchain/check/testdata/struct/fail_too_few_values.carbon @@ -80,7 +80,7 @@ var x: {.a: i32, .b: i32} = {.a = 1}; // CHECK:STDOUT: %i32.loc19_22: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a.b: type = struct_type {.a: %i32, .b: %i32} [concrete = constants.%struct_type.a.b] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %struct_type.a.b = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %struct_type.a.b = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/struct/fail_type_assign.carbon b/toolchain/check/testdata/struct/fail_type_assign.carbon index 208d8e065567..c0c3553a5b57 100644 --- a/toolchain/check/testdata/struct/fail_type_assign.carbon +++ b/toolchain/check/testdata/struct/fail_type_assign.carbon @@ -62,7 +62,7 @@ var x: {.a: i32} = {.a: i32}; // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a: type = struct_type {.a: %i32} [concrete = constants.%struct_type.a] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %struct_type.a = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %struct_type.a = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/struct/fail_value_as_type.carbon b/toolchain/check/testdata/struct/fail_value_as_type.carbon index e8b10d073e55..c0f04bd2f6d3 100644 --- a/toolchain/check/testdata/struct/fail_value_as_type.carbon +++ b/toolchain/check/testdata/struct/fail_value_as_type.carbon @@ -56,7 +56,7 @@ var x: {.a = 1}; // CHECK:STDOUT: %.loc22_15.1: %struct_type.a = struct_literal (%int_1) [concrete = constants.%struct] // CHECK:STDOUT: %.loc22_15.2: type = converted %.loc22_15.1, [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref = ref_binding x, [concrete = ] +// CHECK:STDOUT: %x: = wrapper_binding x, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/struct/import.carbon b/toolchain/check/testdata/struct/import.carbon index 2c1ad1b7d01b..19d0fd80d0af 100644 --- a/toolchain/check/testdata/struct/import.carbon +++ b/toolchain/check/testdata/struct/import.carbon @@ -177,7 +177,7 @@ fn F() -> {.x: i32} { // CHECK:STDOUT: %i32.loc5: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a: type = struct_type {.a: %i32} [concrete = constants.%struct_type.a] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %struct_type.a = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %struct_type.a = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.1fb = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.1fb = var_pattern %b.patt [concrete = constants.%b.var_patt] @@ -192,7 +192,7 @@ fn F() -> {.x: i32} { // CHECK:STDOUT: %i32.loc6_40: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a.d: type = struct_type {.a: %struct_type.b.c, .d: %i32} [concrete = constants.%struct_type.a.d.01c] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: ref %struct_type.a.d.01c = ref_binding b, %b.var [concrete = %b.var] +// CHECK:STDOUT: %b: ref %struct_type.a.d.01c = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.20c = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.20c = var_pattern %c.patt [concrete = constants.%c.var_patt] @@ -221,7 +221,7 @@ fn F() -> {.x: i32} { // CHECK:STDOUT: %.loc7_26.2: %struct_type.a.b.b4c = converted %.loc7_25.1, %struct [concrete = constants.%struct.631] // CHECK:STDOUT: %C: type = class_type @C, @C(constants.%struct.631) [concrete = constants.%C.8d3] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %C.8d3 = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C.8d3 = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/struct/member_access.carbon b/toolchain/check/testdata/struct/member_access.carbon index 45b8a699c5a6..0ca48cbc4f69 100644 --- a/toolchain/check/testdata/struct/member_access.carbon +++ b/toolchain/check/testdata/struct/member_access.carbon @@ -124,21 +124,21 @@ var z: i32 = y; // CHECK:STDOUT: %i32.loc15: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a.b: type = struct_type {.a: %f64.dc1, .b: %i32} [concrete = constants.%struct_type.a.b.09c] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %struct_type.a.b.09c = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %struct_type.a.b.09c = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %y.patt: %pattern_type.6b6 = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type.6b6 = var_pattern %y.patt [concrete = constants.%y.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %y.var: ref %i32 = var %y.var_patt [concrete] // CHECK:STDOUT: %i32.loc16: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %y: ref %i32 = ref_binding y, %y.var [concrete = %y.var] +// CHECK:STDOUT: %y: ref %i32 = wrapper_binding y, %y.var [concrete = %y.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %z.patt: %pattern_type.6b6 = ref_binding_pattern z [concrete = constants.%z.patt] // CHECK:STDOUT: %z.var_patt: %pattern_type.6b6 = var_pattern %z.patt [concrete = constants.%z.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %z.var: ref %i32 = var %z.var_patt [concrete] // CHECK:STDOUT: %i32.loc17: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %z: ref %i32 = ref_binding z, %z.var [concrete = %z.var] +// CHECK:STDOUT: %z: ref %i32 = wrapper_binding z, %z.var [concrete = %z.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/struct/nested_struct_in_place.carbon b/toolchain/check/testdata/struct/nested_struct_in_place.carbon index 2b1632e6f549..c82a4364e2ba 100644 --- a/toolchain/check/testdata/struct/nested_struct_in_place.carbon +++ b/toolchain/check/testdata/struct/nested_struct_in_place.carbon @@ -113,7 +113,7 @@ fn G() { // CHECK:STDOUT: %.loc18_57.2: type = converted %.loc18_57.1, constants.%tuple.type.555 [concrete = constants.%tuple.type.555] // CHECK:STDOUT: %struct_type.a.b: type = struct_type {.a: %tuple.type.555, .b: %tuple.type.555} [concrete = constants.%struct_type.a.b.2a0] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: ref %struct_type.a.b.2a0 = ref_binding v, %v.var +// CHECK:STDOUT: %v: ref %struct_type.a.b.2a0 = wrapper_binding v, %v.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %v.var, constants.%Destroy.Op.1a2547.4 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%v.var) // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/struct/one_entry.carbon b/toolchain/check/testdata/struct/one_entry.carbon index 165dc525a74a..b9dcd5059b3f 100644 --- a/toolchain/check/testdata/struct/one_entry.carbon +++ b/toolchain/check/testdata/struct/one_entry.carbon @@ -95,7 +95,7 @@ var y: {.a: i32} = x; // CHECK:STDOUT: %i32.loc15: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a.loc15: type = struct_type {.a: %i32} [concrete = constants.%struct_type.a.a92] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %struct_type.a.a92 = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %struct_type.a.a92 = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %y.patt: %pattern_type.506 = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type.506 = var_pattern %y.patt [concrete = constants.%y.var_patt] @@ -105,7 +105,7 @@ var y: {.a: i32} = x; // CHECK:STDOUT: %i32.loc16: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a.loc16: type = struct_type {.a: %i32} [concrete = constants.%struct_type.a.a92] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: ref %struct_type.a.a92 = ref_binding y, %y.var [concrete = %y.var] +// CHECK:STDOUT: %y: ref %struct_type.a.a92 = wrapper_binding y, %y.var [concrete = %y.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/struct/partially_const.carbon b/toolchain/check/testdata/struct/partially_const.carbon index c6bd1fe8e371..e84fb8aa0058 100644 --- a/toolchain/check/testdata/struct/partially_const.carbon +++ b/toolchain/check/testdata/struct/partially_const.carbon @@ -100,7 +100,7 @@ fn Make(n: i32) -> {.a: i32, .b: i32, .c: i32} { // CHECK:STDOUT: %.loc15: Core.Form = init_form %struct_type.a.b.c [concrete = constants.%.5b5] // CHECK:STDOUT: %n.param: %i32 = value_param call_param0 // CHECK:STDOUT: %i32.loc15_12: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: %i32 = value_binding n, %n.param +// CHECK:STDOUT: %n: %i32 = wrapper_binding n, %n.param // CHECK:STDOUT: %return.param: ref %struct_type.a.b.c.fde = out_param call_param1 // CHECK:STDOUT: %return: ref %struct_type.a.b.c.fde = return_slot %return.param // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/struct/reorder_fields.carbon b/toolchain/check/testdata/struct/reorder_fields.carbon index 6b87f26fb9f2..f5f3ef6ded81 100644 --- a/toolchain/check/testdata/struct/reorder_fields.carbon +++ b/toolchain/check/testdata/struct/reorder_fields.carbon @@ -158,7 +158,7 @@ fn F() -> {.a: i32, .b: f64} { // CHECK:STDOUT: %f64.loc19: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] // CHECK:STDOUT: %struct_type.a.b.loc19: type = struct_type {.a: %i32, .b: %f64.dc1} [concrete = constants.%struct_type.a.b] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %struct_type.a.b = value_binding x, %.loc19_62.6 +// CHECK:STDOUT: %x: %struct_type.a.b = wrapper_binding x, %.loc19_62.6 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %y.patt: %pattern_type.cc6 = value_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: } @@ -172,7 +172,7 @@ fn F() -> {.a: i32, .b: f64} { // CHECK:STDOUT: %i32.loc20: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.b.a: type = struct_type {.b: %f64.dc1, .a: %i32} [concrete = constants.%struct_type.b.a] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: %struct_type.b.a = value_binding y, %.loc20_31.3 +// CHECK:STDOUT: %y: %struct_type.b.a = wrapper_binding y, %.loc20_31.3 // CHECK:STDOUT: %y.ref: %struct_type.b.a = name_ref y, %y // CHECK:STDOUT: %.loc21_10.1: %i32 = struct_access %y.ref, element1 // CHECK:STDOUT: %impl.elem0.loc21_10.1: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] diff --git a/toolchain/check/testdata/struct/tuple_as_element.carbon b/toolchain/check/testdata/struct/tuple_as_element.carbon index 83a95de8ac7c..9f0b4032312b 100644 --- a/toolchain/check/testdata/struct/tuple_as_element.carbon +++ b/toolchain/check/testdata/struct/tuple_as_element.carbon @@ -112,7 +112,7 @@ var y: {.a: i32, .b: (i32,)} = x; // CHECK:STDOUT: %.loc15_27.2: type = converted %.loc15_27.1, constants.%tuple.type.a8a [concrete = constants.%tuple.type.a8a] // CHECK:STDOUT: %struct_type.a.b.loc15: type = struct_type {.a: %i32, .b: %tuple.type.a8a} [concrete = constants.%struct_type.a.b.388] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %struct_type.a.b.388 = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %struct_type.a.b.388 = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %y.patt: %pattern_type.227 = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type.227 = var_pattern %y.patt [concrete = constants.%y.var_patt] @@ -125,7 +125,7 @@ var y: {.a: i32, .b: (i32,)} = x; // CHECK:STDOUT: %.loc16_27.2: type = converted %.loc16_27.1, constants.%tuple.type.a8a [concrete = constants.%tuple.type.a8a] // CHECK:STDOUT: %struct_type.a.b.loc16: type = struct_type {.a: %i32, .b: %tuple.type.a8a} [concrete = constants.%struct_type.a.b.388] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: ref %struct_type.a.b.388 = ref_binding y, %y.var [concrete = %y.var] +// CHECK:STDOUT: %y: ref %struct_type.a.b.388 = wrapper_binding y, %y.var [concrete = %y.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/struct/two_entries.carbon b/toolchain/check/testdata/struct/two_entries.carbon index 23888d2f974f..29789e1ae2ea 100644 --- a/toolchain/check/testdata/struct/two_entries.carbon +++ b/toolchain/check/testdata/struct/two_entries.carbon @@ -124,7 +124,7 @@ var y: {.a: i32, .b: i32} = x; // CHECK:STDOUT: %i32.loc15_22: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a.b.loc15: type = struct_type {.a: %i32, .b: %i32} [concrete = constants.%struct_type.a.b.b4c] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: %struct_type.a.b.b4c = value_binding v, %.loc15_44.5 +// CHECK:STDOUT: %v: %struct_type.a.b.b4c = wrapper_binding v, %.loc15_44.5 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %w.patt: %pattern_type.20e3 = value_binding_pattern w [concrete = constants.%w.patt] // CHECK:STDOUT: } @@ -133,7 +133,7 @@ var y: {.a: i32, .b: i32} = x; // CHECK:STDOUT: %i32.loc16_22: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a.b.loc16: type = struct_type {.a: %i32, .b: %i32} [concrete = constants.%struct_type.a.b.b4c] // CHECK:STDOUT: } -// CHECK:STDOUT: %w: %struct_type.a.b.b4c = value_binding w, @__global_init.%v.ref +// CHECK:STDOUT: %w: %struct_type.a.b.b4c = wrapper_binding w, @__global_init.%v.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %x.patt: %pattern_type.20e3 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.20e3 = var_pattern %x.patt [concrete = constants.%x.var_patt] @@ -144,7 +144,7 @@ var y: {.a: i32, .b: i32} = x; // CHECK:STDOUT: %i32.loc18_22: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a.b.loc18: type = struct_type {.a: %i32, .b: %i32} [concrete = constants.%struct_type.a.b.b4c] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %struct_type.a.b.b4c = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %struct_type.a.b.b4c = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %y.patt: %pattern_type.20e3 = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type.20e3 = var_pattern %y.patt [concrete = constants.%y.var_patt] @@ -155,7 +155,7 @@ var y: {.a: i32, .b: i32} = x; // CHECK:STDOUT: %i32.loc19_22: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a.b.loc19: type = struct_type {.a: %i32, .b: %i32} [concrete = constants.%struct_type.a.b.b4c] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: ref %struct_type.a.b.b4c = ref_binding y, %y.var [concrete = %y.var] +// CHECK:STDOUT: %y: ref %struct_type.a.b.b4c = wrapper_binding y, %y.var [concrete = %y.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/tuple/basics.carbon b/toolchain/check/testdata/tuple/basics.carbon index 1cf6afab6cf7..026bec4f4ca9 100644 --- a/toolchain/check/testdata/tuple/basics.carbon +++ b/toolchain/check/testdata/tuple/basics.carbon @@ -70,7 +70,7 @@ var y: ((), ()) = x; // CHECK:STDOUT: %.loc4_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_9.3: type = converted %.loc4_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %empty_tuple.type = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %empty_tuple.type = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %y.patt: %pattern_type = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type = var_pattern %y.patt [concrete = constants.%y.var_patt] @@ -80,7 +80,7 @@ var y: ((), ()) = x; // CHECK:STDOUT: %.loc5_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_9.3: type = converted %.loc5_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: ref %empty_tuple.type = ref_binding y, %y.var [concrete = %y.var] +// CHECK:STDOUT: %y: ref %empty_tuple.type = wrapper_binding y, %y.var [concrete = %y.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -132,7 +132,7 @@ var y: ((), ()) = x; // CHECK:STDOUT: %.loc4_21.6: type = converted constants.%empty_tuple, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: %.loc4_21.7: type = converted %.loc4_21.2, constants.%tuple.type.6e8 [concrete = constants.%tuple.type.6e8] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %tuple.type.6e8 = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %tuple.type.6e8 = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -191,7 +191,7 @@ var y: ((), ()) = x; // CHECK:STDOUT: %.loc4_12.3: type = converted constants.%empty_tuple, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: %.loc4_12.4: type = converted %.loc4_12.2, constants.%tuple.type [concrete = constants.%tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %tuple.type = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %tuple.type = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %y.patt: %pattern_type = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type = var_pattern %y.patt [concrete = constants.%y.var_patt] @@ -203,7 +203,7 @@ var y: ((), ()) = x; // CHECK:STDOUT: %.loc5_12.3: type = converted constants.%empty_tuple, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: %.loc5_12.4: type = converted %.loc5_12.2, constants.%tuple.type [concrete = constants.%tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: ref %tuple.type = ref_binding y, %y.var [concrete = %y.var] +// CHECK:STDOUT: %y: ref %tuple.type = wrapper_binding y, %y.var [concrete = %y.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -265,7 +265,7 @@ var y: ((), ()) = x; // CHECK:STDOUT: %.loc4_15.4: type = converted constants.%empty_tuple, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: %.loc4_15.5: type = converted %.loc4_15.2, constants.%tuple.type [concrete = constants.%tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: %tuple.type = value_binding v, %.loc4_26.3 +// CHECK:STDOUT: %v: %tuple.type = wrapper_binding v, %.loc4_26.3 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %w.patt: %pattern_type = value_binding_pattern w [concrete = constants.%w.patt] // CHECK:STDOUT: } @@ -277,7 +277,7 @@ var y: ((), ()) = x; // CHECK:STDOUT: %.loc5_15.4: type = converted constants.%empty_tuple, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: %.loc5_15.5: type = converted %.loc5_15.2, constants.%tuple.type [concrete = constants.%tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %w: %tuple.type = value_binding w, @__global_init.%v.ref +// CHECK:STDOUT: %w: %tuple.type = wrapper_binding w, @__global_init.%v.ref // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %x.patt: %pattern_type = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type = var_pattern %x.patt [concrete = constants.%x.var_patt] @@ -291,7 +291,7 @@ var y: ((), ()) = x; // CHECK:STDOUT: %.loc7_15.4: type = converted constants.%empty_tuple, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: %.loc7_15.5: type = converted %.loc7_15.2, constants.%tuple.type [concrete = constants.%tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %tuple.type = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %tuple.type = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %y.patt: %pattern_type = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type = var_pattern %y.patt [concrete = constants.%y.var_patt] @@ -305,7 +305,7 @@ var y: ((), ()) = x; // CHECK:STDOUT: %.loc8_15.4: type = converted constants.%empty_tuple, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: %.loc8_15.5: type = converted %.loc8_15.2, constants.%tuple.type [concrete = constants.%tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: ref %tuple.type = ref_binding y, %y.var [concrete = %y.var] +// CHECK:STDOUT: %y: ref %tuple.type = wrapper_binding y, %y.var [concrete = %y.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/tuple/element_access.carbon b/toolchain/check/testdata/tuple/element_access.carbon index f723d44857ea..b2d3ca80da99 100644 --- a/toolchain/check/testdata/tuple/element_access.carbon +++ b/toolchain/check/testdata/tuple/element_access.carbon @@ -237,7 +237,7 @@ var b: i32 = a.({.index = 2}.index); // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %i32 = var %c.var_patt [concrete] // CHECK:STDOUT: %i32.loc6: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %c: ref %i32 = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %i32 = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -341,7 +341,7 @@ var b: i32 = a.({.index = 2}.index); // CHECK:STDOUT: } // CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] // CHECK:STDOUT: %i32.loc5: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %b: ref %i32 = ref_binding b, %b.var [concrete = %b.var] +// CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.cb1 = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.cb1 = var_pattern %c.patt [concrete = constants.%c.var_patt] @@ -351,14 +351,14 @@ var b: i32 = a.({.index = 2}.index); // CHECK:STDOUT: %.loc6_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_9.3: type = converted %.loc6_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %empty_tuple.type = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %empty_tuple.type = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.6b6 = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.6b6 = var_pattern %d.patt [concrete = constants.%d.var_patt] // CHECK:STDOUT: } // CHECK:STDOUT: %d.var: ref %i32 = var %d.var_patt [concrete] // CHECK:STDOUT: %i32.loc7: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %d: ref %i32 = ref_binding d, %d.var [concrete = %d.var] +// CHECK:STDOUT: %d: ref %i32 = wrapper_binding d, %d.var [concrete = %d.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/tuple/import.carbon b/toolchain/check/testdata/tuple/import.carbon index 0e2df41ae188..ec026a11a09b 100644 --- a/toolchain/check/testdata/tuple/import.carbon +++ b/toolchain/check/testdata/tuple/import.carbon @@ -189,7 +189,7 @@ fn F() -> (i32,) { // CHECK:STDOUT: %.loc5_13.2: %tuple.type.85c = tuple_literal (%i32.loc5) [concrete = constants.%tuple.19c] // CHECK:STDOUT: %.loc5_13.3: type = converted %.loc5_13.2, constants.%tuple.type.a8a [concrete = constants.%tuple.type.a8a] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %tuple.type.a8a = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %tuple.type.a8a = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.05e = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.05e = var_pattern %b.patt [concrete = constants.%b.var_patt] @@ -209,7 +209,7 @@ fn F() -> (i32,) { // CHECK:STDOUT: %.loc6_34.5: type = converted constants.%tuple.b59, constants.%tuple.type.e55 [concrete = constants.%tuple.type.e55] // CHECK:STDOUT: %.loc6_34.6: type = converted %.loc6_34.2, constants.%tuple.type.e23 [concrete = constants.%tuple.type.e23] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: ref %tuple.type.e23 = ref_binding b, %b.var [concrete = %b.var] +// CHECK:STDOUT: %b: ref %tuple.type.e23 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.717 = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.717 = var_pattern %c.patt [concrete = constants.%c.var_patt] @@ -238,7 +238,7 @@ fn F() -> (i32,) { // CHECK:STDOUT: %.loc7_16.2: %tuple.type.e55 = converted %.loc7_15.1, %tuple [concrete = constants.%tuple.102] // CHECK:STDOUT: %C: type = class_type @C, @C(constants.%tuple.102) [concrete = constants.%C.372] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %C.372 = ref_binding c, %c.var [concrete = %c.var] +// CHECK:STDOUT: %c: ref %C.372 = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/tuple/in_place_tuple_init.carbon b/toolchain/check/testdata/tuple/in_place_tuple_init.carbon index 3d1e7cdd5921..9eddc10c02ed 100644 --- a/toolchain/check/testdata/tuple/in_place_tuple_init.carbon +++ b/toolchain/check/testdata/tuple/in_place_tuple_init.carbon @@ -101,7 +101,7 @@ fn H() { // CHECK:STDOUT: %.loc7_19.2: %tuple.type.24b = tuple_literal (%i32.loc7_11, %i32.loc7_16) [concrete = constants.%tuple.b59] // CHECK:STDOUT: %.loc7_19.3: type = converted %.loc7_19.2, constants.%tuple.type.e55 [concrete = constants.%tuple.type.e55] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: ref %tuple.type.e55 = ref_binding v, %v.var +// CHECK:STDOUT: %v: ref %tuple.type.e55 = wrapper_binding v, %v.var // CHECK:STDOUT: %v.ref: ref %tuple.type.e55 = name_ref v, %v // CHECK:STDOUT: %F.ref.loc8: %F.type = name_ref F, file.%F.decl [concrete = constants.%F] // CHECK:STDOUT: %.loc8: ref %tuple.type.e55 = splice_block %v.ref {} @@ -232,7 +232,7 @@ fn H() { // CHECK:STDOUT: %.loc7_50.4: type = converted constants.%tuple.04d, constants.%tuple.type.555 [concrete = constants.%tuple.type.555] // CHECK:STDOUT: %.loc7_50.5: type = converted %.loc7_50.2, constants.%tuple.type.015 [concrete = constants.%tuple.type.015] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: ref %tuple.type.015 = ref_binding v, %v.var +// CHECK:STDOUT: %v: ref %tuple.type.015 = wrapper_binding v, %v.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %v.var, constants.%Destroy.Op.1a2547.4 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%v.var) // CHECK:STDOUT: @@ -298,7 +298,7 @@ fn H() { // CHECK:STDOUT: %.loc13_43.3: type = converted constants.%tuple.04d, constants.%tuple.type.555 [concrete = constants.%tuple.type.555] // CHECK:STDOUT: %.loc13_43.4: type = converted %.loc13_43.2, constants.%tuple.type.b7e [concrete = constants.%tuple.type.b7e] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: ref %tuple.type.b7e = ref_binding v, %v.var +// CHECK:STDOUT: %v: ref %tuple.type.b7e = wrapper_binding v, %v.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %v.var, constants.%Destroy.Op.1a2547.5 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%v.var) // CHECK:STDOUT: diff --git a/toolchain/check/testdata/tuple/tuple_pattern.carbon b/toolchain/check/testdata/tuple/tuple_pattern.carbon index 6f09b28b652c..3533a4540d68 100644 --- a/toolchain/check/testdata/tuple/tuple_pattern.carbon +++ b/toolchain/check/testdata/tuple/tuple_pattern.carbon @@ -136,14 +136,14 @@ let (a: {}, b: {}) = ({}, {}, {}); // CHECK:STDOUT: %.loc6_19.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc6_19.3: type = converted %.loc6_19.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %empty_struct_type = value_binding x, %.loc6_40.2 +// CHECK:STDOUT: %x: %empty_struct_type = wrapper_binding x, %.loc6_40.2 // CHECK:STDOUT: %empty_struct.loc6_44: %empty_struct_type = struct_value () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc6_44.2: %empty_struct_type = converted %.loc6_44.1, %empty_struct.loc6_44 [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc6_33.1: type = splice_block %.loc6_33.3 [concrete = constants.%empty_struct_type] { // CHECK:STDOUT: %.loc6_33.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc6_33.3: type = converted %.loc6_33.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: %empty_struct_type = value_binding y, %.loc6_44.2 +// CHECK:STDOUT: %y: %empty_struct_type = wrapper_binding y, %.loc6_44.2 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %a.patt: %pattern_type.a96 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %b.patt: %pattern_type.a96 = ref_binding_pattern b [concrete = constants.%b.patt] @@ -171,12 +171,12 @@ let (a: {}, b: {}) = ({}, {}, {}); // CHECK:STDOUT: %.loc7_19.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc7_19.3: type = converted %.loc7_19.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %empty_struct_type = ref_binding a, %tuple.elem0.loc7_3 +// CHECK:STDOUT: %a: ref %empty_struct_type = wrapper_binding a, %tuple.elem0.loc7_3 // CHECK:STDOUT: %.loc7_33.1: type = splice_block %.loc7_33.3 [concrete = constants.%empty_struct_type] { // CHECK:STDOUT: %.loc7_33.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc7_33.3: type = converted %.loc7_33.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %b: ref %empty_struct_type = ref_binding b, %tuple.elem1.loc7_3 +// CHECK:STDOUT: %b: ref %empty_struct_type = wrapper_binding b, %tuple.elem1.loc7_3 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.a96 = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %d.patt: %pattern_type.a96 = ref_binding_pattern d [concrete = constants.%d.patt] @@ -204,12 +204,12 @@ let (a: {}, b: {}) = ({}, {}, {}); // CHECK:STDOUT: %.loc8_19.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc8_19.3: type = converted %.loc8_19.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %c: ref %empty_struct_type = ref_binding c, %tuple.elem0.loc8_3 +// CHECK:STDOUT: %c: ref %empty_struct_type = wrapper_binding c, %tuple.elem0.loc8_3 // CHECK:STDOUT: %.loc8_33.1: type = splice_block %.loc8_33.3 [concrete = constants.%empty_struct_type] { // CHECK:STDOUT: %.loc8_33.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc8_33.3: type = converted %.loc8_33.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %d: ref %empty_struct_type = ref_binding d, %tuple.elem1.loc8_3 +// CHECK:STDOUT: %d: ref %empty_struct_type = wrapper_binding d, %tuple.elem1.loc8_3 // CHECK:STDOUT: %Destroy.Op.bound.loc8: = bound_method %.var.loc8, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call.loc8: init %empty_tuple.type = call %Destroy.Op.bound.loc8(%.var.loc8) // CHECK:STDOUT: %Destroy.Op.bound.loc7: = bound_method %.var.loc7, constants.%Destroy.Op.1a2547.2 @@ -284,7 +284,7 @@ let (a: {}, b: {}) = ({}, {}, {}); // CHECK:STDOUT: %.loc6_21.4: type = converted constants.%empty_struct, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: %.loc6_21.5: type = converted %.loc6_21.2, constants.%tuple.type.b6b [concrete = constants.%tuple.type.b6b] // CHECK:STDOUT: } -// CHECK:STDOUT: %tuple: ref %tuple.type.b6b = ref_binding tuple, %tuple.var +// CHECK:STDOUT: %tuple: ref %tuple.type.b6b = wrapper_binding tuple, %tuple.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %x.patt: %pattern_type.a96 = ref_binding_pattern x [concrete = constants.%x.patt.691773.1] // CHECK:STDOUT: %y.patt: %pattern_type.a96 = ref_binding_pattern y [concrete = constants.%y.patt.a7119c.1] @@ -312,12 +312,12 @@ let (a: {}, b: {}) = ({}, {}, {}); // CHECK:STDOUT: %.loc7_19.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc7_19.3: type = converted %.loc7_19.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %empty_struct_type = ref_binding x, %tuple.elem0.loc7_3 +// CHECK:STDOUT: %x: ref %empty_struct_type = wrapper_binding x, %tuple.elem0.loc7_3 // CHECK:STDOUT: %.loc7_33.1: type = splice_block %.loc7_33.3 [concrete = constants.%empty_struct_type] { // CHECK:STDOUT: %.loc7_33.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc7_33.3: type = converted %.loc7_33.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: ref %empty_struct_type = ref_binding y, %tuple.elem1.loc7_3 +// CHECK:STDOUT: %y: ref %empty_struct_type = wrapper_binding y, %tuple.elem1.loc7_3 // CHECK:STDOUT: %Destroy.Op.bound.loc7: = bound_method %.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call.loc7: init %empty_tuple.type = call %Destroy.Op.bound.loc7(%.var) // CHECK:STDOUT: %Destroy.Op.bound.loc6: = bound_method %tuple.var, constants.%Destroy.Op.1a2547.2 @@ -354,7 +354,7 @@ let (a: {}, b: {}) = ({}, {}, {}); // CHECK:STDOUT: %.loc13_21.4: type = converted constants.%empty_struct, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: %.loc13_21.5: type = converted %.loc13_21.2, constants.%tuple.type.b6b [concrete = constants.%tuple.type.b6b] // CHECK:STDOUT: } -// CHECK:STDOUT: %tuple.loc13_12: %tuple.type.b6b = value_binding tuple, %.loc13_32.4 +// CHECK:STDOUT: %tuple.loc13_12: %tuple.type.b6b = wrapper_binding tuple, %.loc13_32.4 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %x.patt: %pattern_type.a96 = ref_binding_pattern x [concrete = constants.%x.patt.691773.2] // CHECK:STDOUT: %y.patt: %pattern_type.a96 = ref_binding_pattern y [concrete = constants.%y.patt.a7119c.2] @@ -382,12 +382,12 @@ let (a: {}, b: {}) = ({}, {}, {}); // CHECK:STDOUT: %.loc14_19.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc14_19.3: type = converted %.loc14_19.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %empty_struct_type = ref_binding x, %tuple.elem0.loc14_3 +// CHECK:STDOUT: %x: ref %empty_struct_type = wrapper_binding x, %tuple.elem0.loc14_3 // CHECK:STDOUT: %.loc14_33.1: type = splice_block %.loc14_33.3 [concrete = constants.%empty_struct_type] { // CHECK:STDOUT: %.loc14_33.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc14_33.3: type = converted %.loc14_33.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: ref %empty_struct_type = ref_binding y, %tuple.elem1.loc14_3 +// CHECK:STDOUT: %y: ref %empty_struct_type = wrapper_binding y, %tuple.elem1.loc14_3 // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%.var) // CHECK:STDOUT: @@ -412,12 +412,12 @@ let (a: {}, b: {}) = ({}, {}, {}); // CHECK:STDOUT: %.loc22_19.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc22_19.3: type = converted %.loc22_19.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %empty_struct_type = ref_binding x, %tuple.elem0 +// CHECK:STDOUT: %x: ref %empty_struct_type = wrapper_binding x, %tuple.elem0 // CHECK:STDOUT: %.loc22_33.1: type = splice_block %.loc22_33.3 [concrete = constants.%empty_struct_type] { // CHECK:STDOUT: %.loc22_33.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc22_33.3: type = converted %.loc22_33.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: ref %empty_struct_type = ref_binding y, %tuple.elem1 +// CHECK:STDOUT: %y: ref %empty_struct_type = wrapper_binding y, %tuple.elem1 // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%.var) // CHECK:STDOUT: @@ -462,21 +462,21 @@ let (a: {}, b: {}) = ({}, {}, {}); // CHECK:STDOUT: %.loc6_19.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc6_19.3: type = converted %.loc6_19.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %empty_struct_type = value_binding x, %.loc6_56.2 +// CHECK:STDOUT: %x: %empty_struct_type = wrapper_binding x, %.loc6_56.2 // CHECK:STDOUT: %empty_struct.loc6_61: %empty_struct_type = struct_value () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc6_61.2: %empty_struct_type = converted %.loc6_61.1, %empty_struct.loc6_61 [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc6_34.1: type = splice_block %.loc6_34.3 [concrete = constants.%empty_struct_type] { // CHECK:STDOUT: %.loc6_34.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc6_34.3: type = converted %.loc6_34.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: %empty_struct_type = value_binding y, %.loc6_61.2 +// CHECK:STDOUT: %y: %empty_struct_type = wrapper_binding y, %.loc6_61.2 // CHECK:STDOUT: %empty_struct.loc6_65: %empty_struct_type = struct_value () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc6_65.2: %empty_struct_type = converted %.loc6_65.1, %empty_struct.loc6_65 [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc6_48.1: type = splice_block %.loc6_48.3 [concrete = constants.%empty_struct_type] { // CHECK:STDOUT: %.loc6_48.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc6_48.3: type = converted %.loc6_48.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %z: %empty_struct_type = value_binding z, %.loc6_65.2 +// CHECK:STDOUT: %z: %empty_struct_type = wrapper_binding z, %.loc6_65.2 // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: @@ -506,14 +506,14 @@ let (a: {}, b: {}) = ({}, {}, {}); // CHECK:STDOUT: %.loc5_10.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc5_10.3: type = converted %.loc5_10.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %empty_struct_type = value_binding x, %.loc5_24 +// CHECK:STDOUT: %x: %empty_struct_type = wrapper_binding x, %.loc5_24 // CHECK:STDOUT: %empty_struct.loc5_28: %empty_struct_type = struct_value () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc5_28: %empty_struct_type = converted @__global_init.%.loc5_28, %empty_struct.loc5_28 [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc5_17.1: type = splice_block %.loc5_17.3 [concrete = constants.%empty_struct_type] { // CHECK:STDOUT: %.loc5_17.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc5_17.3: type = converted %.loc5_17.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: %empty_struct_type = value_binding y, %.loc5_28 +// CHECK:STDOUT: %y: %empty_struct_type = wrapper_binding y, %.loc5_28 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/var/export_name.carbon b/toolchain/check/testdata/var/export_name.carbon index cf618b3d798f..db9ab5a9f5c8 100644 --- a/toolchain/check/testdata/var/export_name.carbon +++ b/toolchain/check/testdata/var/export_name.carbon @@ -87,7 +87,7 @@ var w: () = v; // CHECK:STDOUT: %.loc4_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_9.3: type = converted %.loc4_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: ref %empty_tuple.type = ref_binding v, %v.var [concrete = %v.var] +// CHECK:STDOUT: %v: ref %empty_tuple.type = wrapper_binding v, %v.var [concrete = %v.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -168,7 +168,7 @@ var w: () = v; // CHECK:STDOUT: %.loc6_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_9.3: type = converted %.loc6_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %w: ref %empty_tuple.type = ref_binding w, %w.var [concrete = %w.var] +// CHECK:STDOUT: %w: ref %empty_tuple.type = wrapper_binding w, %w.var [concrete = %w.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/var/fail_duplicate_decl.carbon b/toolchain/check/testdata/var/fail_duplicate_decl.carbon index 14bd9c21ba8b..1ac170cd4ee9 100644 --- a/toolchain/check/testdata/var/fail_duplicate_decl.carbon +++ b/toolchain/check/testdata/var/fail_duplicate_decl.carbon @@ -76,7 +76,7 @@ fn Main() { // CHECK:STDOUT: %.loc3_18.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc3_18.3: type = converted %.loc3_18.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.loc3: ref %empty_tuple.type = ref_binding x, %x.var.loc3 +// CHECK:STDOUT: %x.loc3: ref %empty_tuple.type = wrapper_binding x, %x.var.loc3 // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %x.patt.loc11: %pattern_type.cb1 = ref_binding_pattern x [concrete = constants.%x.patt.06838d.2] // CHECK:STDOUT: %x.var_patt.loc11: %pattern_type.cb1 = var_pattern %x.patt.loc11 [concrete = constants.%x.var_patt.28d573.2] @@ -90,7 +90,7 @@ fn Main() { // CHECK:STDOUT: %.loc11_18.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc11_18.3: type = converted %.loc11_18.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.loc11: ref %empty_tuple.type = ref_binding x, %x.var.loc11 +// CHECK:STDOUT: %x.loc11: ref %empty_tuple.type = wrapper_binding x, %x.var.loc11 // CHECK:STDOUT: %Destroy.Op.bound.loc11: = bound_method %x.var.loc11, constants.%Destroy.Op // CHECK:STDOUT: %Destroy.Op.call.loc11: init %empty_tuple.type = call %Destroy.Op.bound.loc11(%x.var.loc11) // CHECK:STDOUT: %Destroy.Op.bound.loc3: = bound_method %x.var.loc3, constants.%Destroy.Op diff --git a/toolchain/check/testdata/var/fail_init_type_mismatch.carbon b/toolchain/check/testdata/var/fail_init_type_mismatch.carbon index 1ec374fed46b..b8b326b72322 100644 --- a/toolchain/check/testdata/var/fail_init_type_mismatch.carbon +++ b/toolchain/check/testdata/var/fail_init_type_mismatch.carbon @@ -59,7 +59,7 @@ var x: {} = (); // CHECK:STDOUT: %.loc22_9.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc22_9.3: type = converted %.loc22_9.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %empty_struct_type = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %empty_struct_type = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/var/fail_init_with_self.carbon b/toolchain/check/testdata/var/fail_init_with_self.carbon index 3add5179cd1d..fde45619a907 100644 --- a/toolchain/check/testdata/var/fail_init_with_self.carbon +++ b/toolchain/check/testdata/var/fail_init_with_self.carbon @@ -75,7 +75,7 @@ fn Main() { // CHECK:STDOUT: %.loc14_18.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc14_18.3: type = converted %.loc14_18.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %empty_tuple.type = ref_binding x, %x.var +// CHECK:STDOUT: %x: ref %empty_tuple.type = wrapper_binding x, %x.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %x.var, constants.%Destroy.Op // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%x.var) // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/var/fail_storage_is_literal.carbon b/toolchain/check/testdata/var/fail_storage_is_literal.carbon index 79a5c35cfb14..6364eb6f9133 100644 --- a/toolchain/check/testdata/var/fail_storage_is_literal.carbon +++ b/toolchain/check/testdata/var/fail_storage_is_literal.carbon @@ -67,7 +67,7 @@ fn Main() { // CHECK:STDOUT: %int_1.loc23_17: Core.IntLiteral = int_value 1 [concrete = constants.%int_1] // CHECK:STDOUT: %.loc23: type = converted %int_1.loc23_17, [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref = ref_binding x, [concrete = ] +// CHECK:STDOUT: %x: = wrapper_binding x, [concrete = ] // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/global_decl.carbon b/toolchain/check/testdata/var/global_decl.carbon index a0eaae1f8f8e..946668a63985 100644 --- a/toolchain/check/testdata/var/global_decl.carbon +++ b/toolchain/check/testdata/var/global_decl.carbon @@ -38,7 +38,7 @@ var x: {.v: ()} = {.v = ()}; // CHECK:STDOUT: %.loc14_14.2: type = converted %.loc14_14.1, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: %struct_type.v: type = struct_type {.v: %empty_tuple.type} [concrete = constants.%struct_type.v] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %struct_type.v = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %struct_type.v = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/var/global_decl_with_init.carbon b/toolchain/check/testdata/var/global_decl_with_init.carbon index 4d41ee40b6ef..421b5a1796d4 100644 --- a/toolchain/check/testdata/var/global_decl_with_init.carbon +++ b/toolchain/check/testdata/var/global_decl_with_init.carbon @@ -57,7 +57,7 @@ var (x: (), y: ()) = ((), ()); // CHECK:STDOUT: %.loc4_14.2: type = converted %.loc4_14.1, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: %struct_type.v: type = struct_type {.v: %empty_tuple.type} [concrete = constants.%struct_type.v] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %struct_type.v = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %struct_type.v = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -106,12 +106,12 @@ var (x: (), y: ()) = ((), ()); // CHECK:STDOUT: %.loc4_10.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_10.3: type = converted %.loc4_10.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %empty_tuple.type = value_binding x, %.loc4_28 +// CHECK:STDOUT: %x: %empty_tuple.type = wrapper_binding x, %.loc4_28 // CHECK:STDOUT: %.loc4_21.1: type = splice_block %.loc4_21.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc4_21.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_21.3: type = converted %.loc4_21.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: ref %empty_tuple.type = ref_binding y, %y.var [concrete = %y.var] +// CHECK:STDOUT: %y: ref %empty_tuple.type = wrapper_binding y, %y.var [concrete = %y.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -160,12 +160,12 @@ var (x: (), y: ()) = ((), ()); // CHECK:STDOUT: %.loc4_10.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_10.3: type = converted %.loc4_10.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %empty_tuple.type = ref_binding x, %tuple.elem0 [concrete = constants.%tuple.elem0] +// CHECK:STDOUT: %x: ref %empty_tuple.type = wrapper_binding x, %tuple.elem0 [concrete = constants.%tuple.elem0] // CHECK:STDOUT: %.loc4_17.1: type = splice_block %.loc4_17.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc4_17.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_17.3: type = converted %.loc4_17.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: ref %empty_tuple.type = ref_binding y, %tuple.elem1 [concrete = constants.%tuple.elem1] +// CHECK:STDOUT: %y: ref %empty_tuple.type = wrapper_binding y, %tuple.elem1 [concrete = constants.%tuple.elem1] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/var/global_lookup.carbon b/toolchain/check/testdata/var/global_lookup.carbon index 4ee365171e8c..e912c6a61fde 100644 --- a/toolchain/check/testdata/var/global_lookup.carbon +++ b/toolchain/check/testdata/var/global_lookup.carbon @@ -46,7 +46,7 @@ var y: {.v: ()} = x; // CHECK:STDOUT: %.loc15_14.2: type = converted %.loc15_14.1, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: %struct_type.v.loc15: type = struct_type {.v: %empty_tuple.type} [concrete = constants.%struct_type.v] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %struct_type.v = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %struct_type.v = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %y.patt: %pattern_type = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type = var_pattern %y.patt [concrete = constants.%y.var_patt] @@ -57,7 +57,7 @@ var y: {.v: ()} = x; // CHECK:STDOUT: %.loc16_14.2: type = converted %.loc16_14.1, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: %struct_type.v.loc16: type = struct_type {.v: %empty_tuple.type} [concrete = constants.%struct_type.v] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: ref %struct_type.v = ref_binding y, %y.var [concrete = %y.var] +// CHECK:STDOUT: %y: ref %struct_type.v = wrapper_binding y, %y.var [concrete = %y.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/var/global_lookup_in_scope.carbon b/toolchain/check/testdata/var/global_lookup_in_scope.carbon index ec4eb7e725ec..fb489233b7cb 100644 --- a/toolchain/check/testdata/var/global_lookup_in_scope.carbon +++ b/toolchain/check/testdata/var/global_lookup_in_scope.carbon @@ -66,7 +66,7 @@ fn Main() { // CHECK:STDOUT: %.loc2_14.2: type = converted %.loc2_14.1, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: %struct_type.v: type = struct_type {.v: %empty_tuple.type} [concrete = constants.%struct_type.v] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %struct_type.v = ref_binding x, %x.var [concrete = %x.var] +// CHECK:STDOUT: %x: ref %struct_type.v = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: %Main.decl: %Main.type = fn_decl @Main [concrete = constants.%Main] {} {} // CHECK:STDOUT: } // CHECK:STDOUT: @@ -90,7 +90,7 @@ fn Main() { // CHECK:STDOUT: %.loc5_23.2: type = converted %.loc5_23.1, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: %struct_type.v: type = struct_type {.v: %empty_tuple.type} [concrete = constants.%struct_type.v] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: ref %struct_type.v = ref_binding y, %y.var +// CHECK:STDOUT: %y: ref %struct_type.v = wrapper_binding y, %y.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %y.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%y.var) // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/var/import.carbon b/toolchain/check/testdata/var/import.carbon index 09d8a67bf349..8e4bcc02a38f 100644 --- a/toolchain/check/testdata/var/import.carbon +++ b/toolchain/check/testdata/var/import.carbon @@ -47,7 +47,7 @@ var a: () = a_ref; // CHECK:STDOUT: %.loc4_13.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_13.3: type = converted %.loc4_13.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a_ref: ref %empty_tuple.type = ref_binding a_ref, %a_ref.var [concrete = %a_ref.var] +// CHECK:STDOUT: %a_ref: ref %empty_tuple.type = wrapper_binding a_ref, %a_ref.var [concrete = %a_ref.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -92,7 +92,7 @@ var a: () = a_ref; // CHECK:STDOUT: %.loc4_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_9.3: type = converted %.loc4_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %a: ref %empty_tuple.type = ref_binding a, %a.var [concrete = %a.var] +// CHECK:STDOUT: %a: ref %empty_tuple.type = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/var/import_access.carbon b/toolchain/check/testdata/var/import_access.carbon index 2ae6b4d5a018..a6879f1df8d0 100644 --- a/toolchain/check/testdata/var/import_access.carbon +++ b/toolchain/check/testdata/var/import_access.carbon @@ -79,7 +79,7 @@ var v2: () = Test.v; // CHECK:STDOUT: %.loc4_17.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_17.3: type = converted %.loc4_17.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: ref %empty_tuple.type = ref_binding v, %v.var [concrete = %v.var] +// CHECK:STDOUT: %v: ref %empty_tuple.type = wrapper_binding v, %v.var [concrete = %v.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -124,7 +124,7 @@ var v2: () = Test.v; // CHECK:STDOUT: %.loc4_10.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_10.3: type = converted %.loc4_10.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %v2: ref %empty_tuple.type = ref_binding v2, %v2.var [concrete = %v2.var] +// CHECK:STDOUT: %v2: ref %empty_tuple.type = wrapper_binding v2, %v2.var [concrete = %v2.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -161,7 +161,7 @@ var v2: () = Test.v; // CHECK:STDOUT: %.loc10_10.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc10_10.3: type = converted %.loc10_10.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %v2: ref %empty_tuple.type = ref_binding v2, %v2.var [concrete = %v2.var] +// CHECK:STDOUT: %v2: ref %empty_tuple.type = wrapper_binding v2, %v2.var [concrete = %v2.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -203,7 +203,7 @@ var v2: () = Test.v; // CHECK:STDOUT: %.loc10_10.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc10_10.3: type = converted %.loc10_10.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %v2: ref %empty_tuple.type = ref_binding v2, %v2.var [concrete = %v2.var] +// CHECK:STDOUT: %v2: ref %empty_tuple.type = wrapper_binding v2, %v2.var [concrete = %v2.var] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/var/initialization.carbon b/toolchain/check/testdata/var/initialization.carbon index 863a7cc954ff..e0cf803ff170 100644 --- a/toolchain/check/testdata/var/initialization.carbon +++ b/toolchain/check/testdata/var/initialization.carbon @@ -93,7 +93,7 @@ fn Main() { // CHECK:STDOUT: %.loc8_18.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_18.3: type = converted %.loc8_18.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %empty_tuple.type = ref_binding x, %x.var +// CHECK:STDOUT: %x: ref %empty_tuple.type = wrapper_binding x, %x.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %x.var, constants.%Destroy.Op // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%x.var) // CHECK:STDOUT: @@ -140,7 +140,7 @@ fn Main() { // CHECK:STDOUT: %.loc8_18.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_18.3: type = converted %.loc8_18.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %empty_tuple.type = ref_binding x, %x.var +// CHECK:STDOUT: %x: ref %empty_tuple.type = wrapper_binding x, %x.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %x.var, constants.%Destroy.Op // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%x.var) // CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/lookup.carbon b/toolchain/check/testdata/var/lookup.carbon index 047eceee84d8..770406abecfc 100644 --- a/toolchain/check/testdata/var/lookup.carbon +++ b/toolchain/check/testdata/var/lookup.carbon @@ -65,7 +65,7 @@ fn Main() { // CHECK:STDOUT: %.loc16_11.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc16_11.3: type = converted %.loc16_11.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %empty_tuple.type = ref_binding x, %x.var +// CHECK:STDOUT: %x: ref %empty_tuple.type = wrapper_binding x, %x.var // CHECK:STDOUT: %x.ref: ref %empty_tuple.type = name_ref x, %x // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %x.var, constants.%Destroy.Op // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%x.var) diff --git a/toolchain/check/testdata/var/shadowing.carbon b/toolchain/check/testdata/var/shadowing.carbon index 26c289ffe5a5..2651b59f7472 100644 --- a/toolchain/check/testdata/var/shadowing.carbon +++ b/toolchain/check/testdata/var/shadowing.carbon @@ -84,7 +84,7 @@ fn Main() { // CHECK:STDOUT: %.loc5_12.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_12.3: type = converted %.loc5_12.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %NS: ref %empty_tuple.type = ref_binding NS, %NS.var +// CHECK:STDOUT: %NS: ref %empty_tuple.type = wrapper_binding NS, %NS.var // CHECK:STDOUT: %NS.ref: ref %empty_tuple.type = name_ref NS, %NS // CHECK:STDOUT: %.loc6_9.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_9.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] @@ -103,7 +103,7 @@ fn Main() { // CHECK:STDOUT: %.loc8_18.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_18.3: type = converted %.loc8_18.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.loc8: ref %empty_tuple.type = ref_binding x, %x.var.loc8 +// CHECK:STDOUT: %x.loc8: ref %empty_tuple.type = wrapper_binding x, %x.var.loc8 // CHECK:STDOUT: %true: bool = bool_literal true [concrete = constants.%true] // CHECK:STDOUT: if %true br !if.then else br !if.else // CHECK:STDOUT: @@ -121,7 +121,7 @@ fn Main() { // CHECK:STDOUT: %.loc10_13.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc10_13.3: type = converted %.loc10_13.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.loc10: ref %empty_tuple.type = ref_binding x, %x.var.loc10 +// CHECK:STDOUT: %x.loc10: ref %empty_tuple.type = wrapper_binding x, %x.var.loc10 // CHECK:STDOUT: %x.ref: ref %empty_tuple.type = name_ref x, %x.loc10 // CHECK:STDOUT: %.loc13_10.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc13_10.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] diff --git a/toolchain/check/testdata/var/var_pattern.carbon b/toolchain/check/testdata/var/var_pattern.carbon index 1c3d3d0a497b..c2a66fd6d594 100644 --- a/toolchain/check/testdata/var/var_pattern.carbon +++ b/toolchain/check/testdata/var/var_pattern.carbon @@ -229,7 +229,7 @@ fn Call() { // CHECK:STDOUT: %.loc5_22.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_22.3: type = converted %.loc5_22.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %empty_tuple.type = ref_binding x, %x.var +// CHECK:STDOUT: %x: ref %empty_tuple.type = wrapper_binding x, %x.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %x.var, constants.%Destroy.Op // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%x.var) // CHECK:STDOUT: return @@ -293,7 +293,7 @@ fn Call() { // CHECK:STDOUT: %.loc5_19.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_19.3: type = converted %.loc5_19.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %empty_tuple.type = value_binding x, %.loc5_44.2 +// CHECK:STDOUT: %x: %empty_tuple.type = wrapper_binding x, %.loc5_44.2 // CHECK:STDOUT: %.loc5_48.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_22: init %empty_tuple.type = converted %.loc5_48.1, %.loc5_48.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: assign %y.var, %.loc5_22 @@ -301,7 +301,7 @@ fn Call() { // CHECK:STDOUT: %.loc5_37.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_37.3: type = converted %.loc5_37.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: ref %empty_tuple.type = ref_binding y, %y.var +// CHECK:STDOUT: %y: ref %empty_tuple.type = wrapper_binding y, %y.var // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %y.var, constants.%Destroy.Op // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%y.var) // CHECK:STDOUT: return @@ -376,12 +376,12 @@ fn Call() { // CHECK:STDOUT: %.loc5_19.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_19.3: type = converted %.loc5_19.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %empty_tuple.type = ref_binding x, %tuple.elem0.loc5_3 +// CHECK:STDOUT: %x: ref %empty_tuple.type = wrapper_binding x, %tuple.elem0.loc5_3 // CHECK:STDOUT: %.loc5_33.1: type = splice_block %.loc5_33.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc5_33.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_33.3: type = converted %.loc5_33.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: ref %empty_tuple.type = ref_binding y, %tuple.elem1.loc5_3 +// CHECK:STDOUT: %y: ref %empty_tuple.type = wrapper_binding y, %tuple.elem1.loc5_3 // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%.var) // CHECK:STDOUT: return @@ -461,12 +461,12 @@ fn Call() { // CHECK:STDOUT: %.loc5_23.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_23.3: type = converted %.loc5_23.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: ref %empty_tuple.type = ref_binding x, %tuple.elem0.loc5_7 +// CHECK:STDOUT: %x: ref %empty_tuple.type = wrapper_binding x, %tuple.elem0.loc5_7 // CHECK:STDOUT: %.loc5_37.1: type = splice_block %.loc5_37.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc5_37.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_37.3: type = converted %.loc5_37.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: ref %empty_tuple.type = ref_binding y, %tuple.elem1.loc5_7 +// CHECK:STDOUT: %y: ref %empty_tuple.type = wrapper_binding y, %tuple.elem1.loc5_7 // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %.var, constants.%Destroy.Op.1a2547.2 // CHECK:STDOUT: %Destroy.Op.call: init %empty_tuple.type = call %Destroy.Op.bound(%.var) // CHECK:STDOUT: return @@ -527,13 +527,13 @@ fn Call() { // CHECK:STDOUT: %.loc4_10.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_10.3: type = converted %.loc4_10.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %empty_tuple.type = value_binding x, %x.param +// CHECK:STDOUT: %x: %empty_tuple.type = wrapper_binding x, %x.param // CHECK:STDOUT: %y.param: ref %empty_tuple.type = ref_param call_param1 // CHECK:STDOUT: %.loc4_21.1: type = splice_block %.loc4_21.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc4_21.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_21.3: type = converted %.loc4_21.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: ref %empty_tuple.type = ref_binding y, %y.param +// CHECK:STDOUT: %y: ref %empty_tuple.type = wrapper_binding y, %y.param // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [concrete = constants.%G] {} {} // CHECK:STDOUT: } @@ -555,7 +555,7 @@ fn Call() { // CHECK:STDOUT: %.loc7_11.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_11.3: type = converted %.loc7_11.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %v: ref %empty_tuple.type = ref_binding v, %v.var +// CHECK:STDOUT: %v: ref %empty_tuple.type = wrapper_binding v, %v.var // CHECK:STDOUT: %F.ref: %F.type = name_ref F, file.%F.decl [concrete = constants.%F] // CHECK:STDOUT: %v.ref: ref %empty_tuple.type = name_ref v, %v // CHECK:STDOUT: %.loc8_9.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] @@ -613,13 +613,13 @@ fn Call() { // CHECK:STDOUT: %.loc4_10.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_10.3: type = converted %.loc4_10.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %empty_tuple.type = value_binding x, %x.param +// CHECK:STDOUT: %x: %empty_tuple.type = wrapper_binding x, %x.param // CHECK:STDOUT: %y.param: ref %empty_tuple.type = ref_param call_param1 // CHECK:STDOUT: %.loc4_21.1: type = splice_block %.loc4_21.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc4_21.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_21.3: type = converted %.loc4_21.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: ref %empty_tuple.type = ref_binding y, %y.param +// CHECK:STDOUT: %y: ref %empty_tuple.type = wrapper_binding y, %y.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -665,13 +665,13 @@ fn Call() { // CHECK:STDOUT: %.loc4_17.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_17.3: type = converted %.loc4_17.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %empty_tuple.type = value_binding x, %x.param +// CHECK:STDOUT: %x: %empty_tuple.type = wrapper_binding x, %x.param // CHECK:STDOUT: %y.param: ref %empty_tuple.type = ref_param call_param1 // CHECK:STDOUT: %.loc4_35.1: type = splice_block %.loc4_35.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc4_35.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_35.3: type = converted %.loc4_35.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: ref %empty_tuple.type = ref_binding y, %y.param +// CHECK:STDOUT: %y: ref %empty_tuple.type = wrapper_binding y, %y.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -808,7 +808,7 @@ fn Call() { // CHECK:STDOUT: %self.param.loc5_8: ref %C = ref_param call_param0 // CHECK:STDOUT: %self.param.loc5_12: %C = value_param call_param1 // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%C [concrete = constants.%C] -// CHECK:STDOUT: %self: %C = value_binding self, %self.param.loc5_12 +// CHECK:STDOUT: %self: %C = wrapper_binding self, %self.param.loc5_12 // CHECK:STDOUT: } // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%empty_struct_type [concrete = constants.%complete_type] // CHECK:STDOUT: complete_type_witness = %complete_type @@ -901,13 +901,13 @@ fn Call() { // CHECK:STDOUT: %.loc8_19.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_19.3: type = converted %.loc8_19.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %empty_tuple.type = value_binding x, %.loc8_59.3 +// CHECK:STDOUT: %x: %empty_tuple.type = wrapper_binding x, %.loc8_59.3 // CHECK:STDOUT: assign %y.var, %F.call.loc8_64 // CHECK:STDOUT: %.loc8_37.1: type = splice_block %.loc8_37.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc8_37.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_37.3: type = converted %.loc8_37.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %y: ref %empty_tuple.type = ref_binding y, %y.var +// CHECK:STDOUT: %y: ref %empty_tuple.type = wrapper_binding y, %y.var // CHECK:STDOUT: %.loc8_69.1: ref %empty_tuple.type = temporary_storage // CHECK:STDOUT: %.loc8_69.2: ref %empty_tuple.type = temporary %.loc8_69.1, %F.call.loc8_69 // CHECK:STDOUT: %tuple.loc8_69: %empty_tuple.type = tuple_value () [concrete = constants.%empty_tuple] @@ -916,7 +916,7 @@ fn Call() { // CHECK:STDOUT: %.loc8_51.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_51.3: type = converted %.loc8_51.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %z: %empty_tuple.type = value_binding z, %.loc8_69.3 +// CHECK:STDOUT: %z: %empty_tuple.type = wrapper_binding z, %.loc8_69.3 // CHECK:STDOUT: %Destroy.Op.bound.loc8_69: = bound_method %.loc8_69.2, constants.%Destroy.Op // CHECK:STDOUT: %Destroy.Op.call.loc8_69: init %empty_tuple.type = call %Destroy.Op.bound.loc8_69(%.loc8_69.2) // CHECK:STDOUT: %Destroy.Op.bound.loc8_59: = bound_method %.loc8_59.2, constants.%Destroy.Op @@ -952,7 +952,7 @@ fn Call() { // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: ref %X = ref_param call_param0 // CHECK:STDOUT: %X.ref: type = name_ref X, file.%X.decl [concrete = constants.%X] -// CHECK:STDOUT: %a: ref %X = ref_binding a, %a.param +// CHECK:STDOUT: %a: ref %X = wrapper_binding a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1021,7 +1021,7 @@ fn Call() { // CHECK:STDOUT: } { // CHECK:STDOUT: %n.param: ref %i32 = ref_param call_param0 // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] -// CHECK:STDOUT: %n: ref %i32 = ref_binding n, %n.param +// CHECK:STDOUT: %n: ref %i32 = wrapper_binding n, %n.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/where_expr/constraints.carbon b/toolchain/check/testdata/where_expr/constraints.carbon index 4bc7996a26fe..a1edf76a4f11 100644 --- a/toolchain/check/testdata/where_expr/constraints.carbon +++ b/toolchain/check/testdata/where_expr/constraints.carbon @@ -561,7 +561,7 @@ fn F() { // CHECK:STDOUT: %.loc8_18.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_18.3: type = converted %.loc8_18.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] // CHECK:STDOUT: } -// CHECK:STDOUT: %x: %empty_tuple.type = value_binding x, [concrete = ] +// CHECK:STDOUT: %x: %empty_tuple.type = wrapper_binding x, [concrete = ] // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/where_expr/dot_self_index.carbon b/toolchain/check/testdata/where_expr/dot_self_index.carbon index 70962136fb51..646056df9534 100644 --- a/toolchain/check/testdata/where_expr/dot_self_index.carbon +++ b/toolchain/check/testdata/where_expr/dot_self_index.carbon @@ -102,7 +102,7 @@ fn G(U: Empty(i32) where .A = i32*) { // CHECK:STDOUT: requirement_rewrite %impl.elem0.loc21_41.2, %ptr.loc21_47.2 // CHECK:STDOUT: } // CHECK:STDOUT: } -// CHECK:STDOUT: %U: @H.%Empty_where.type (%Empty_where.type.e78) = value_binding U, %U.param +// CHECK:STDOUT: %U: @H.%Empty_where.type (%Empty_where.type.e78) = wrapper_binding U, %U.param // CHECK:STDOUT: %.loc21_61.1: type = splice_block %.loc21_61.2 [concrete = type] { // CHECK:STDOUT: %.Self.loc21_58: %type = symbolic_binding .Self [symbolic_self = constants.%.Self.c39] // CHECK:STDOUT: %.loc21_61.2: type = type_literal type [concrete = type] diff --git a/toolchain/check/testdata/where_expr/non_generic.carbon b/toolchain/check/testdata/where_expr/non_generic.carbon index 04b488fd8d6f..89d3366c74a5 100644 --- a/toolchain/check/testdata/where_expr/non_generic.carbon +++ b/toolchain/check/testdata/where_expr/non_generic.carbon @@ -57,7 +57,7 @@ fn NotGenericF(unused U: I where .T == i32) {} // CHECK:STDOUT: requirement_equivalent %impl.elem0, %i32 // CHECK:STDOUT: } // CHECK:STDOUT: } -// CHECK:STDOUT: %U: %I_where.type = value_binding U, %U.param +// CHECK:STDOUT: %U: %I_where.type = wrapper_binding U, %U.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/lower/handle.cpp b/toolchain/lower/handle.cpp index fee05f20ed13..fadea586bc33 100644 --- a/toolchain/lower/handle.cpp +++ b/toolchain/lower/handle.cpp @@ -105,16 +105,6 @@ auto HandleInst(FunctionContext& context, SemIR::InstId inst_id, context.SetLocal(inst_id, context.GetValue(inst.value_id)); } -auto HandleInst(FunctionContext& context, SemIR::InstId inst_id, - SemIR::RefBinding inst) -> void { - context.SetLocal(inst_id, context.GetValue(inst.value_id)); -} - -auto HandleInst(FunctionContext& context, SemIR::InstId inst_id, - SemIR::ValueBinding inst) -> void { - context.SetLocal(inst_id, context.GetValue(inst.value_id)); -} - auto HandleInst(FunctionContext& context, SemIR::InstId inst_id, SemIR::SymbolicBinding inst) -> void { context.SetLocal(inst_id, context.GetValue(inst.value_id)); diff --git a/toolchain/sem_ir/expr_info.cpp b/toolchain/sem_ir/expr_info.cpp index e62284d82272..588ba04408d3 100644 --- a/toolchain/sem_ir/expr_info.cpp +++ b/toolchain/sem_ir/expr_info.cpp @@ -106,6 +106,17 @@ static auto GetExprCategoryImpl(const File* ir, InstId inst_id) } else { CARBON_FATAL("Inst doesn't have action category: {0}", action); } + } else if constexpr (std::same_as) { + if (!inst.value_id.has_value()) { + // `value_id` can be empty if we're trying to access the binding + // before pattern matching, e.g. in code like `fn F(t: I, u: t.X)`, + // where `I` is an interface with an `X` member. We assume that + // the binding in such cases is a value binding. + // TODO: Find a more robust solution. + return value_category; + } + inst_id = inst.value_id; + return std::nullopt; } else { static_assert( TypedInstT::Kind.expr_category() != diff --git a/toolchain/sem_ir/inst_categories.h b/toolchain/sem_ir/inst_categories.h index 2acd4253f765..f957088d0b5f 100644 --- a/toolchain/sem_ir/inst_categories.h +++ b/toolchain/sem_ir/inst_categories.h @@ -141,9 +141,7 @@ struct AnyBindingPattern { // clang-format off #define AnyBinding_CARBON_INST_CATEGORY(X, Sep) \ X(::Carbon::SemIR::AliasBinding) Sep() \ - X(::Carbon::SemIR::RefBinding) Sep() \ X(::Carbon::SemIR::SymbolicBinding) Sep() \ - X(::Carbon::SemIR::ValueBinding) Sep() \ X(::Carbon::SemIR::WrapperBinding) // clang-format on diff --git a/toolchain/sem_ir/inst_kind.def b/toolchain/sem_ir/inst_kind.def index 0e980220a21e..17db80af3a6a 100644 --- a/toolchain/sem_ir/inst_kind.def +++ b/toolchain/sem_ir/inst_kind.def @@ -116,7 +116,6 @@ CARBON_SEM_IR_INST_KIND(OutParamPattern) CARBON_SEM_IR_INST_KIND(PartialType) CARBON_SEM_IR_INST_KIND(PatternType) CARBON_SEM_IR_INST_KIND(PointerType) -CARBON_SEM_IR_INST_KIND(RefBinding) CARBON_SEM_IR_INST_KIND(RefBindingPattern) CARBON_SEM_IR_INST_KIND(RefForm) CARBON_SEM_IR_INST_KIND(RefParam) @@ -168,7 +167,6 @@ CARBON_SEM_IR_INST_KIND(UnboundElementType) CARBON_SEM_IR_INST_KIND(UninitializedValue) CARBON_SEM_IR_INST_KIND(UpdateInit) CARBON_SEM_IR_INST_KIND(ValueAsRef) -CARBON_SEM_IR_INST_KIND(ValueBinding) CARBON_SEM_IR_INST_KIND(ValueBindingPattern) CARBON_SEM_IR_INST_KIND(ValueForm) CARBON_SEM_IR_INST_KIND(ValueOfInitializer) diff --git a/toolchain/sem_ir/typed_insts.h b/toolchain/sem_ir/typed_insts.h index 0e7c9f8a0fe2..77ab0195b770 100644 --- a/toolchain/sem_ir/typed_insts.h +++ b/toolchain/sem_ir/typed_insts.h @@ -1466,20 +1466,6 @@ struct PointerType { TypeInstId pointee_id; }; -// Binds a name as a reference expression, such as `x` in `var x: i32`. -// See AnyBinding for member documentation. -struct RefBinding { - // TODO: Make Parse::NodeId more specific. - static constexpr auto Kind = InstKind::RefBinding.Define( - {.ir_name = "ref_binding", - .expr_category = ExprCategory::DurableRef, - .constant_kind = InstConstantKind::Indirect}); - - TypeId type_id; - EntityNameId entity_name_id; - InstId value_id; -}; - // An action that performs type refinement for an instruction, by creating an // instruction that converts from a template symbolic type to a concrete type. struct RefineTypeAction { @@ -2208,19 +2194,6 @@ struct ValueAsRef { InstId value_id; }; -// Binds a name as a value expression, such as `x` in `let x: i32`. See -// AnyBinding for member documentation. -struct ValueBinding { - // TODO: Make Parse::NodeId more specific. - static constexpr auto Kind = InstKind::ValueBinding.Define( - {.ir_name = "value_binding", - .constant_kind = InstConstantKind::Indirect}); - - TypeId type_id; - EntityNameId entity_name_id; - InstId value_id; -}; - // Represents a value binding pattern that is not a parameter. See // `AnyBindingPattern` for member documentation. struct ValueBindingPattern { @@ -2415,12 +2388,11 @@ using WitnessType = SingletonTypeInst">; // Binds a name to a result (which must not be an initializing expression), // forwarding its type and category. See `AnyBinding` for member documentation. // -// TODO: replace RefBinding and ValueBinding (and possibly SymbolicBinding) with -// WrapperBinding. +// TODO: replace SymbolicBinding with WrapperBinding. struct WrapperBinding { static constexpr auto Kind = InstKind::WrapperBinding.Define( {.ir_name = "wrapper_binding", - .expr_category = ComputedExprCategory::SameAsSecondOperand}); + .expr_category = ComputedExprCategory::DependsOnOperands}); TypeId type_id; EntityNameId entity_name_id; InstId value_id;