From e67b6db910f672e960a16743fe3877d51481d7c2 Mon Sep 17 00:00:00 2001 From: Geoff Romer Date: Thu, 12 Nov 2026 23:34:32 +0000 Subject: [PATCH] Give files shorthand names in textual SemIR (#8104) Shorthand names are intended to be used in the textual format of references to instructions in another IR (which can't happen now, but will be possible in a forthcoming PR). The shorthand name uses the file name (minus the `.carbon` suffix) as a base, and if that base name is ambiguous within the compilation, it is given a numerical suffix `.N`, just like other textual IR names. Shorthand names are prefixed with `$` in the textual format, to distinguish them from inst and scope names. For example, a file `foo/bar.carbon` has the shorthand name `$bar`, and an instruction `@baz.%qux` in that file can be referenced from another file as `$bar.@baz.%qux`. This PR adds `toolchain/check/testdata/basics/file_name.carbon` to test this behavior. All other test changes are just applying this change to the existing textual SemIR dumps. --------- Co-authored-by: Dana Jansens --- toolchain/check/BUILD | 1 + toolchain/check/check.cpp | 14 +- toolchain/check/check.h | 2 + toolchain/check/testdata/alias/basics.carbon | 6 +- .../check/testdata/alias/builtins.carbon | 6 +- .../check/testdata/alias/export_name.carbon | 12 +- toolchain/check/testdata/alias/import.carbon | 12 +- .../check/testdata/alias/import_access.carbon | 8 +- .../check/testdata/alias/import_order.carbon | 4 +- .../check/testdata/alias/in_namespace.carbon | 2 +- toolchain/check/testdata/alias/var.carbon | 4 +- toolchain/check/testdata/array/basics.carbon | 10 +- .../check/testdata/array/bound_values.carbon | 4 +- toolchain/check/testdata/array/import.carbon | 4 +- .../testdata/array/index_not_literal.carbon | 4 +- .../array/init_dependent_bound.carbon | 4 +- .../testdata/as/adapter_conversion.carbon | 10 +- toolchain/check/testdata/as/basics.carbon | 10 +- toolchain/check/testdata/as/const.carbon | 6 +- .../check/testdata/as/maybe_unformed.carbon | 6 +- toolchain/check/testdata/as/partial.carbon | 6 +- toolchain/check/testdata/as/var_init.carbon | 2 +- .../testdata/basics/dump_sem_ir_ranges.carbon | 10 +- .../basics/dump_sem_ir_ranges_ignore.carbon | 6 +- .../basics/dump_sem_ir_ranges_only.carbon | 4 +- .../basics/duplicate_name_same_line.carbon | 2 +- toolchain/check/testdata/basics/empty.carbon | 4 +- .../check/testdata/basics/file_name.carbon | 32 +++ .../testdata/basics/include_in_dumps.carbon | 8 +- .../check/testdata/basics/multi_error.carbon | 2 +- .../check/testdata/basics/name_lookup.carbon | 4 +- toolchain/check/testdata/basics/parens.carbon | 2 +- .../testdata/basics/raw_identifier.carbon | 2 +- .../multifile_with_textual_ir.carbon | 4 +- .../one_file_with_textual_ir.carbon | 2 +- .../testdata/builtins/array/make_type.carbon | 2 +- .../check/testdata/builtins/bool/eq.carbon | 4 +- .../testdata/builtins/bool/make_type.carbon | 2 +- .../check/testdata/builtins/bool/neq.carbon | 4 +- .../testdata/builtins/char_literal/add.carbon | 2 +- .../builtins/char_literal/convert_char.carbon | 2 +- .../builtins/char_literal/convert_int.carbon | 2 +- .../testdata/builtins/char_literal/eq.carbon | 2 +- .../builtins/char_literal/greater.carbon | 2 +- .../builtins/char_literal/greater_eq.carbon | 2 +- .../builtins/char_literal/less.carbon | 2 +- .../builtins/char_literal/less_eq.carbon | 2 +- .../builtins/char_literal/make_type.carbon | 2 +- .../testdata/builtins/char_literal/neq.carbon | 2 +- .../builtins/char_literal/sub_char.carbon | 2 +- .../builtins/char_literal/sub_int.carbon | 2 +- .../check/testdata/builtins/float/add.carbon | 2 +- .../testdata/builtins/float/convert.carbon | 14 +- .../builtins/float/convert_checked.carbon | 18 +- .../builtins/float/convert_int.carbon | 4 +- .../check/testdata/builtins/float/div.carbon | 2 +- .../check/testdata/builtins/float/eq.carbon | 2 +- .../testdata/builtins/float/greater.carbon | 2 +- .../testdata/builtins/float/greater_eq.carbon | 2 +- .../check/testdata/builtins/float/less.carbon | 2 +- .../testdata/builtins/float/less_eq.carbon | 2 +- .../testdata/builtins/float/make_type.carbon | 2 +- .../check/testdata/builtins/float/mul.carbon | 2 +- .../testdata/builtins/float/negate.carbon | 2 +- .../check/testdata/builtins/float/neq.carbon | 2 +- .../check/testdata/builtins/float/sub.carbon | 2 +- .../builtins/float_literal/add.carbon | 2 +- .../builtins/float_literal/make_type.carbon | 2 +- .../builtins/float_literal/negate.carbon | 2 +- .../builtins/float_literal/sub.carbon | 2 +- .../testdata/builtins/form/make_type.carbon | 2 +- .../builtins/int/add_char_literal.carbon | 2 +- .../check/testdata/builtins/int/and.carbon | 2 +- .../testdata/builtins/int/and_assign.carbon | 2 +- .../testdata/builtins/int/complement.carbon | 2 +- .../testdata/builtins/int/convert.carbon | 2 +- .../builtins/int/convert_char_literal.carbon | 2 +- .../builtins/int/convert_checked.carbon | 2 +- .../builtins/int/convert_float.carbon | 2 +- .../builtins/int/convert_float_checked.carbon | 2 +- .../check/testdata/builtins/int/eq.carbon | 2 +- .../testdata/builtins/int/greater.carbon | 2 +- .../testdata/builtins/int/greater_eq.carbon | 2 +- .../testdata/builtins/int/left_shift.carbon | 4 +- .../builtins/int/left_shift_assign.carbon | 2 +- .../check/testdata/builtins/int/less.carbon | 2 +- .../testdata/builtins/int/less_eq.carbon | 2 +- .../builtins/int/make_type_signed.carbon | 2 +- .../builtins/int/make_type_unsigned.carbon | 2 +- .../check/testdata/builtins/int/neq.carbon | 2 +- .../check/testdata/builtins/int/or.carbon | 2 +- .../testdata/builtins/int/or_assign.carbon | 2 +- .../testdata/builtins/int/right_shift.carbon | 4 +- .../builtins/int/right_shift_assign.carbon | 2 +- .../check/testdata/builtins/int/sadd.carbon | 2 +- .../check/testdata/builtins/int/sdiv.carbon | 2 +- .../testdata/builtins/int/sdiv_assign.carbon | 2 +- .../check/testdata/builtins/int/smod.carbon | 2 +- .../testdata/builtins/int/smod_assign.carbon | 2 +- .../check/testdata/builtins/int/smul.carbon | 2 +- .../testdata/builtins/int/smul_assign.carbon | 2 +- .../testdata/builtins/int/snegate.carbon | 2 +- .../check/testdata/builtins/int/ssub.carbon | 2 +- .../testdata/builtins/int/ssub_assign.carbon | 2 +- .../check/testdata/builtins/int/uadd.carbon | 2 +- .../testdata/builtins/int/uadd_assign.carbon | 2 +- .../check/testdata/builtins/int/udiv.carbon | 2 +- .../testdata/builtins/int/udiv_assign.carbon | 2 +- .../check/testdata/builtins/int/umod.carbon | 2 +- .../testdata/builtins/int/umod_assign.carbon | 2 +- .../check/testdata/builtins/int/umul.carbon | 2 +- .../testdata/builtins/int/umul_assign.carbon | 2 +- .../testdata/builtins/int/unegate.carbon | 2 +- .../check/testdata/builtins/int/usub.carbon | 2 +- .../testdata/builtins/int/usub_assign.carbon | 2 +- .../check/testdata/builtins/int/xor.carbon | 2 +- .../testdata/builtins/int/xor_assign.carbon | 2 +- .../builtins/maybe_unformed/make_type.carbon | 4 +- .../check/testdata/builtins/no_op.carbon | 8 +- .../testdata/builtins/pointer/is_null.carbon | 4 +- .../builtins/pointer/make_null.carbon | 4 +- .../check/testdata/builtins/print/char.carbon | 2 +- .../check/testdata/builtins/print/int.carbon | 2 +- .../check/testdata/builtins/read/char.carbon | 2 +- toolchain/check/testdata/choice/basic.carbon | 6 +- .../check/testdata/choice/generic.carbon | 2 +- .../testdata/class/abstract/abstract.carbon | 26 +-- .../abstract/fail_abstract_in_struct.carbon | 16 +- .../abstract/fail_abstract_in_tuple.carbon | 16 +- .../class/access/access_modifiers.carbon | 14 +- .../check/testdata/class/adapter/adapt.carbon | 6 +- .../testdata/class/adapter/adapt_copy.carbon | 10 +- .../class/adapter/extend_adapt.carbon | 12 +- .../adapter/fail_adapt_with_subobjects.carbon | 6 +- .../testdata/class/adapter/init_adapt.carbon | 4 +- toolchain/check/testdata/class/basic.carbon | 2 +- .../class/complete_in_member_fn.carbon | 2 +- .../class/cross_package_import.carbon | 14 +- .../check/testdata/class/destroy_calls.carbon | 12 +- .../check/testdata/class/export_name.carbon | 6 +- toolchain/check/testdata/class/extern.carbon | 40 ++-- .../testdata/class/extern_library.carbon | 2 +- .../class/field/comp_time_field.carbon | 4 +- .../class/field/compound_field.carbon | 2 +- .../testdata/class/field/field_access.carbon | 2 +- .../class/field/field_access_in_value.carbon | 2 +- .../class/field/field_initializer.carbon | 2 +- .../check/testdata/class/field/static.carbon | 2 +- .../testdata/class/forward_declared.carbon | 2 +- .../check/testdata/class/generic/adapt.carbon | 14 +- .../class/generic/base_is_generic.carbon | 10 +- .../check/testdata/class/generic/basic.carbon | 2 +- .../check/testdata/class/generic/call.carbon | 10 +- .../generic/complete_in_conversion.carbon | 2 +- .../class/generic/empty_params.carbon | 2 +- .../check/testdata/class/generic/field.carbon | 2 +- .../class/generic/generic_vs_params.carbon | 10 +- .../testdata/class/generic/import.carbon | 10 +- .../check/testdata/class/generic/init.carbon | 4 +- .../class/generic/member_access.carbon | 4 +- .../class/generic/member_inline.carbon | 4 +- .../class/generic/member_lookup.carbon | 2 +- .../class/generic/member_out_of_line.carbon | 4 +- .../testdata/class/generic/member_type.carbon | 4 +- .../class/generic/method_deduce.carbon | 2 +- .../testdata/class/generic/redeclare.carbon | 12 +- .../check/testdata/class/generic/self.carbon | 2 +- .../testdata/class/generic/stringify.carbon | 8 +- .../testdata/class/implicit_import.carbon | 16 +- toolchain/check/testdata/class/import.carbon | 4 +- .../testdata/class/import_forward_decl.carbon | 4 +- .../testdata/class/import_indirect.carbon | 14 +- .../testdata/class/import_member_cycle.carbon | 4 +- .../testdata/class/import_struct_cycle.carbon | 4 +- .../class/indirect_import_member.carbon | 22 +- .../testdata/class/inheritance/base.carbon | 4 +- .../class/inheritance/base_field.carbon | 2 +- .../base_function_unqualified.carbon | 2 +- .../class/inheritance/base_method.carbon | 2 +- .../inheritance/base_method_qualified.carbon | 2 +- .../inheritance/base_method_shadow.carbon | 2 +- .../class/inheritance/derived_to_base.carbon | 8 +- .../class/inheritance/import_base.carbon | 4 +- .../class/inheritance/self_conversion.carbon | 2 +- toolchain/check/testdata/class/init.carbon | 2 +- toolchain/check/testdata/class/init_as.carbon | 2 +- .../check/testdata/class/init_nested.carbon | 2 +- toolchain/check/testdata/class/local.carbon | 2 +- .../method/call_without_method_syntax.carbon | 2 +- .../class/method/generic_method.carbon | 2 +- .../check/testdata/class/method/method.carbon | 2 +- .../class/method/static_method.carbon | 2 +- .../testdata/class/method/virtual.carbon | 22 +- toolchain/check/testdata/class/nested.carbon | 2 +- .../check/testdata/class/nested_name.carbon | 2 +- .../check/testdata/class/partial/init.carbon | 2 +- .../testdata/class/partial/qualifier.carbon | 18 +- .../check/testdata/class/redeclaration.carbon | 2 +- .../class/redeclaration_introducer.carbon | 2 +- .../check/testdata/class/reenter_scope.carbon | 2 +- toolchain/check/testdata/class/reorder.carbon | 2 +- .../testdata/class/reorder_qualified.carbon | 2 +- toolchain/check/testdata/class/scope.carbon | 2 +- .../testdata/class/self/fail_ref_self.carbon | 2 +- .../check/testdata/class/self/raw_self.carbon | 2 +- .../testdata/class/self/raw_self_type.carbon | 2 +- .../check/testdata/class/self/self.carbon | 8 +- .../testdata/class/self/self_type.carbon | 2 +- .../testdata/class/syntactic_merge.carbon | 26 +-- .../class/syntactic_merge_literal.carbon | 4 +- toolchain/check/testdata/const/basics.carbon | 4 +- toolchain/check/testdata/const/import.carbon | 2 +- toolchain/check/testdata/deduce/array.carbon | 14 +- .../check/testdata/deduce/conversion.carbon | 6 +- .../check/testdata/deduce/generic_type.carbon | 8 +- .../check/testdata/deduce/int_float.carbon | 4 +- toolchain/check/testdata/deduce/tuple.carbon | 6 +- .../testdata/deduce/type_operator.carbon | 8 +- .../value_with_type_through_access.carbon | 8 +- .../check/testdata/eval/aggregates.carbon | 6 +- toolchain/check/testdata/eval/binding.carbon | 2 +- toolchain/check/testdata/eval/branch.carbon | 4 +- toolchain/check/testdata/eval/call.carbon | 10 +- toolchain/check/testdata/eval/symbolic.carbon | 2 +- toolchain/check/testdata/facet/access.carbon | 10 +- .../facet/call_combined_impl_witness.carbon | 2 +- .../convert_class_type_to_facet_type.carbon | 2 +- ...t_class_type_to_generic_facet_value.carbon | 4 +- ...rt_class_value_to_facet_value_value.carbon | 2 +- ..._value_to_generic_facet_value_value.carbon | 8 +- ...t_value_as_type_knows_original_type.carbon | 6 +- .../convert_facet_value_to_itself.carbon | 2 +- ..._facet_value_to_narrowed_facet_type.carbon | 12 +- ...t_facet_value_value_to_blanket_impl.carbon | 2 +- ..._value_to_generic_facet_value_value.carbon | 2 +- ...convert_facet_value_value_to_itself.carbon | 2 +- .../testdata/facet/convert_interface.carbon | 2 +- .../testdata/facet/facet_assoc_const.carbon | 2 +- ...t_class_type_to_generic_facet_value.carbon | 2 +- ...convert_facet_value_to_missing_impl.carbon | 2 +- ...l_convert_type_erased_type_to_facet.carbon | 2 +- ...uction_uses_runtime_type_conversion.carbon | 2 +- .../check/testdata/facet/period_self.carbon | 4 +- .../testdata/facet/require_import.carbon | 2 +- .../check/testdata/facet/runtime_value.carbon | 4 +- .../facet/self_in_interface_param.carbon | 2 +- .../facet/validate_rewrite_constraints.carbon | 2 +- toolchain/check/testdata/for/actual.carbon | 4 +- toolchain/check/testdata/for/basic.carbon | 2 +- toolchain/check/testdata/for/pattern.carbon | 8 +- .../function/builtin/adapted_type.carbon | 4 +- .../testdata/function/builtin/call.carbon | 2 +- .../builtin/call_from_operator.carbon | 4 +- .../function/builtin/definition.carbon | 2 +- .../function/builtin/fail_redefined.carbon | 2 +- .../function/builtin/fail_unknown.carbon | 2 +- .../testdata/function/builtin/import.carbon | 4 +- .../testdata/function/builtin/method.carbon | 2 +- .../function/builtin/positional.carbon | 2 +- .../check/testdata/function/call/alias.carbon | 2 +- .../function/call/default_values.carbon | 6 +- .../function/call/empty_struct.carbon | 2 +- .../testdata/function/call/empty_tuple.carbon | 2 +- .../function/call/fail_param_count.carbon | 2 +- .../function/call/fail_param_type.carbon | 2 +- .../call/fail_return_type_mismatch.carbon | 2 +- .../call/fail_runtime_implicit_param.carbon | 2 +- .../check/testdata/function/call/form.carbon | 24 +-- .../check/testdata/function/call/i32.carbon | 2 +- .../function/call/more_param_ir.carbon | 2 +- .../testdata/function/call/params_one.carbon | 2 +- .../function/call/params_one_comma.carbon | 2 +- .../testdata/function/call/params_two.carbon | 2 +- .../function/call/params_two_comma.carbon | 2 +- .../testdata/function/call/params_zero.carbon | 2 +- .../call/prefer_unqualified_lookup.carbon | 2 +- .../check/testdata/function/call/ref.carbon | 4 +- .../function/call/return_implicit.carbon | 2 +- .../function/capture/uncaptured_locals.carbon | 2 +- .../declaration/default_values.carbon | 6 +- .../function/declaration/export_name.carbon | 6 +- .../function/declaration/extern.carbon | 12 +- .../declaration/extern_library.carbon | 26 +-- .../extern_library_for_default.carbon | 6 +- .../extern_library_from_default.carbon | 6 +- .../fail_import_incomplete_return.carbon | 4 +- .../declaration/fail_modifiers.carbon | 2 +- .../declaration/fail_param_in_type.carbon | 2 +- .../declaration/fail_param_redecl.carbon | 2 +- .../function/declaration/fail_redecl.carbon | 2 +- .../declaration/implicit_import.carbon | 12 +- .../function/declaration/import.carbon | 18 +- .../declaration/param_same_name.carbon | 2 +- .../declaration/pattern_in_signature.carbon | 2 +- .../testdata/function/declaration/ref.carbon | 4 +- .../function/declaration/simple.carbon | 2 +- .../declaration/val_var_return.carbon | 8 +- .../function/deduced_return/basic.carbon | 6 +- .../function/deduced_return/form.carbon | 6 +- .../function/deduced_return/generic.carbon | 8 +- .../deduced_return/generic_form.carbon | 6 +- .../function/deduced_return/import.carbon | 4 +- .../deduced_return/returned_var.carbon | 6 +- .../function/deduced_return/template.carbon | 2 +- .../function/definition/basics.carbon | 2 +- .../function/definition/default_values.carbon | 4 +- .../function/definition/extern.carbon | 20 +- .../function/definition/extern_library.carbon | 42 ++-- .../fail_decl_param_mismatch.carbon | 2 +- .../function/definition/fail_redef.carbon | 2 +- .../function/definition/forward_decl.carbon | 2 +- .../definition/implicit_import.carbon | 24 +-- .../function/definition/import.carbon | 12 +- .../function/definition/import_access.carbon | 26 +-- .../testdata/function/definition/order.carbon | 2 +- .../function/definition/params_one.carbon | 2 +- .../definition/params_one_comma.carbon | 2 +- .../function/definition/params_two.carbon | 2 +- .../definition/params_two_comma.carbon | 2 +- .../function/definition/params_zero.carbon | 2 +- .../definition/syntactic_merge.carbon | 28 +-- .../testdata/function/definition/terse.carbon | 2 +- .../testdata/function/generic/call.carbon | 4 +- .../call_method_on_generic_facet.carbon | 2 +- .../testdata/function/generic/deduce.carbon | 26 +-- .../generic/deduce_nested_facet_value.carbon | 2 +- .../function/generic/default_values.carbon | 2 +- .../fail_deduce_imported_function.carbon | 4 +- .../function/generic/forward_decl.carbon | 2 +- .../function/generic/import_specific.carbon | 4 +- .../generic/indirect_generic_type.carbon | 2 +- .../function/generic/param_in_type.carbon | 2 +- .../function/generic/redeclare.carbon | 8 +- .../function/generic/resolve_used.carbon | 2 +- .../function/generic/return_slot.carbon | 2 +- .../function/generic/template_param.carbon | 2 +- .../function/generic/type_param.carbon | 2 +- .../function/generic/type_param_scope.carbon | 2 +- .../testdata/generic/call_basic_depth.carbon | 2 +- .../testdata/generic/complete_type.carbon | 6 +- .../testdata/generic/dependent_param.carbon | 2 +- .../generic/dot_self_symbolic_type.carbon | 4 +- toolchain/check/testdata/generic/local.carbon | 6 +- .../testdata/generic/local_function.carbon | 4 +- .../testdata/generic/template/convert.carbon | 18 +- .../generic/template/dependence.carbon | 4 +- .../generic/template/member_access.carbon | 4 +- .../template/member_out_of_line.carbon | 2 +- .../testdata/generic/template/operator.carbon | 2 +- .../template_access_assoc_const.carbon | 2 +- .../generic/template/unimplemented.carbon | 4 +- .../check/testdata/generic/var_param.carbon | 2 +- toolchain/check/testdata/global/basics.carbon | 10 +- toolchain/check/testdata/if/basics.carbon | 6 +- toolchain/check/testdata/if/lifetime.carbon | 2 +- toolchain/check/testdata/if_expr/basic.carbon | 2 +- .../if_expr/constant_condition.carbon | 2 +- .../testdata/if_expr/control_flow.carbon | 2 +- .../if_expr/fail_not_in_function.carbon | 10 +- .../if_expr/fail_partial_constant.carbon | 4 +- .../check/testdata/if_expr/nested.carbon | 2 +- .../check/testdata/if_expr/struct.carbon | 2 +- .../testdata/impl/assoc_const_self.carbon | 10 +- toolchain/check/testdata/impl/basic.carbon | 2 +- toolchain/check/testdata/impl/compound.carbon | 12 +- .../check/testdata/impl/declaration.carbon | 2 +- toolchain/check/testdata/impl/empty.carbon | 2 +- .../check/testdata/impl/error_recovery.carbon | 10 +- .../check/testdata/impl/extend_impl.carbon | 2 +- .../testdata/impl/extend_impl_generic.carbon | 4 +- .../check/testdata/impl/fail_alias.carbon | 2 +- .../testdata/impl/fail_call_invalid.carbon | 2 +- .../impl/fail_extend_impl_forall.carbon | 2 +- .../impl/fail_extend_impl_scope.carbon | 6 +- .../impl/fail_extend_impl_type_as.carbon | 2 +- .../impl/fail_extend_non_interface.carbon | 2 +- ..._extend_partially_defined_interface.carbon | 2 +- .../fail_extend_undefined_interface.carbon | 2 +- .../testdata/impl/fail_impl_as_scope.carbon | 8 +- .../impl/fail_impl_bad_assoc_const.carbon | 2 +- .../impl/fail_impl_bad_assoc_fn.carbon | 2 +- .../impl/fail_impl_bad_interface.carbon | 8 +- .../testdata/impl/fail_impl_bad_type.carbon | 2 +- .../testdata/impl/fail_redefinition.carbon | 2 +- .../impl/fail_self_type_mismatch.carbon | 2 +- .../check/testdata/impl/forward_decls.carbon | 26 +-- .../impl/generic_redeclaration.carbon | 8 +- toolchain/check/testdata/impl/impl_as.carbon | 2 +- .../impl/impl_as_named_constraint.carbon | 199 +----------------- .../testdata/impl/impl_assoc_const.carbon | 4 +- .../impl/impl_assoc_const_with_prelude.carbon | 4 +- .../impl/impl_assoc_fn_as_alias.carbon | 2 +- .../check/testdata/impl/impl_forall.carbon | 4 +- .../check/testdata/impl/impl_thunk.carbon | 22 +- .../impl/impl_thunk_min_prelude.carbon | 2 +- .../testdata/impl/import_builtin_call.carbon | 4 +- .../impl/import_canonical_witnesses.carbon | 4 +- .../testdata/impl/import_compound.carbon | 12 +- .../testdata/impl/import_extend_impl.carbon | 4 +- .../check/testdata/impl/import_generic.carbon | 20 +- .../impl/import_interface_assoc_const.carbon | 30 +-- .../check/testdata/impl/import_self.carbon | 4 +- .../testdata/impl/import_self_specific.carbon | 4 +- .../check/testdata/impl/import_thunk.carbon | 6 +- .../testdata/impl/import_use_generic.carbon | 4 +- .../check/testdata/impl/incomplete.carbon | 22 +- .../check/testdata/impl/interface_args.carbon | 12 +- .../check/testdata/impl/lookup/alias.carbon | 2 +- .../impl/lookup/canonical_query_self.carbon | 2 +- .../lookup/fail_alias_impl_not_found.carbon | 2 +- .../lookup/fail_todo_undefined_impl.carbon | 2 +- .../check/testdata/impl/lookup/generic.carbon | 12 +- .../testdata/impl/lookup/impl_forall.carbon | 2 +- .../check/testdata/impl/lookup/import.carbon | 30 +-- .../impl/lookup/instance_method.carbon | 2 +- ...g_generic_inside_rewrite_constraint.carbon | 4 +- ...pecialization_with_symbolic_rewrite.carbon | 10 +- .../testdata/impl/lookup/specific_args.carbon | 10 +- .../testdata/impl/lookup/transitive.carbon | 8 +- .../testdata/impl/multiple_extend.carbon | 10 +- .../name_lookup_in_impl_definition.carbon | 2 +- .../impl/no_definition_in_impl_file.carbon | 20 +- .../check/testdata/impl/period_self.carbon | 8 +- .../check/testdata/impl/self_in_class.carbon | 2 +- .../testdata/impl/self_in_signature.carbon | 2 +- .../impl/todo_impl_with_unrelated_fn.carbon | 2 +- .../testdata/impl/use_assoc_entity.carbon | 16 +- .../index/array_element_access.carbon | 2 +- .../check/testdata/index/expr_category.carbon | 2 +- .../index/fail_array_large_index.carbon | 2 +- .../index/fail_array_non_int_indexing.carbon | 2 +- .../fail_array_out_of_bound_access.carbon | 2 +- .../testdata/index/fail_expr_category.carbon | 2 +- .../testdata/index/fail_invalid_base.carbon | 2 +- .../testdata/index/fail_name_not_found.carbon | 2 +- .../index/fail_negative_indexing.carbon | 2 +- .../index/fail_non_tuple_access.carbon | 2 +- .../check/testdata/interface/as_type.carbon | 2 +- .../testdata/interface/as_type_of_type.carbon | 2 +- .../testdata/interface/assoc_const.carbon | 2 +- .../interface/assoc_const_in_generic.carbon | 2 +- .../check/testdata/interface/basic.carbon | 2 +- .../interface/compound_member_access.carbon | 14 +- .../testdata/interface/default_fn.carbon | 4 +- .../testdata/interface/export_name.carbon | 6 +- .../interface/extend_require_call.carbon | 2 +- .../fail_add_member_outside_definition.carbon | 2 +- .../interface/fail_assoc_const_alias.carbon | 4 +- .../fail_assoc_const_bad_default.carbon | 2 +- .../fail_assoc_fn_invalid_use.carbon | 2 +- .../interface/fail_definition_imported.carbon | 4 +- .../testdata/interface/fail_duplicate.carbon | 8 +- .../fail_generic_redeclaration.carbon | 2 +- .../interface/fail_lookup_in_type_type.carbon | 4 +- .../interface/fail_lookup_undefined.carbon | 2 +- .../interface/fail_member_lookup.carbon | 2 +- .../testdata/interface/fail_modifiers.carbon | 12 +- .../interface/fail_redeclare_member.carbon | 2 +- .../fail_todo_assoc_const_default.carbon | 2 +- .../check/testdata/interface/final.carbon | 10 +- .../check/testdata/interface/generic.carbon | 6 +- .../generic_binding_after_assoc_const.carbon | 2 +- .../testdata/interface/generic_import.carbon | 4 +- .../testdata/interface/generic_method.carbon | 4 +- .../interface/generic_vs_params.carbon | 10 +- .../check/testdata/interface/import.carbon | 4 +- .../testdata/interface/import_access.carbon | 26 +-- .../interface/import_interface_decl.carbon | 4 +- .../testdata/interface/incomplete.carbon | 12 +- .../check/testdata/interface/local.carbon | 2 +- .../testdata/interface/member_lookup.carbon | 4 +- .../check/testdata/interface/modifiers.carbon | 16 +- .../check/testdata/interface/observe.carbon | 8 +- .../check/testdata/interface/require.carbon | 18 +- .../check/testdata/interface/self.carbon | 2 +- .../testdata/interface/syntactic_merge.carbon | 24 +-- .../interface/todo_define_not_default.carbon | 2 +- .../interop/cpp/basics/cpp_diagnostics.carbon | 8 +- .../cpp/basics/import/cpp_namespace.carbon | 8 +- .../interop/cpp/basics/import/import.carbon | 4 +- .../interop/cpp/basics/import/include.carbon | 2 +- .../interop/cpp/basics/import/indirect.carbon | 6 +- .../cpp/basics/import/multiple_imports.carbon | 2 +- .../interop/cpp/basics/inline/import.carbon | 4 +- .../cpp/basics/unsupported_decl_type.carbon | 2 +- .../interop/cpp/class/import/abstract.carbon | 2 +- .../interop/cpp/class/import/access.carbon | 30 +-- .../interop/cpp/class/import/base.carbon | 8 +- .../interop/cpp/class/import/class.carbon | 18 +- .../cpp/class/import/constructor.carbon | 16 +- .../interop/cpp/class/import/dynamic.carbon | 2 +- .../interop/cpp/class/import/field.carbon | 8 +- .../interop/cpp/class/import/method.carbon | 8 +- .../interop/cpp/class/import/struct.carbon | 2 +- .../interop/cpp/class/import/template.carbon | 10 +- .../interop/cpp/class/import/union.carbon | 14 +- .../interop/cpp/enum/anonymous.carbon | 2 +- .../testdata/interop/cpp/enum/convert.carbon | 2 +- .../testdata/interop/cpp/enum/copy.carbon | 2 +- .../testdata/interop/cpp/enum/fixed.carbon | 2 +- .../interop/cpp/enum/incomplete.carbon | 2 +- .../testdata/interop/cpp/enum/member.carbon | 2 +- .../testdata/interop/cpp/enum/scoped.carbon | 2 +- .../testdata/interop/cpp/enum/unscoped.carbon | 2 +- .../testdata/interop/cpp/enum/using.carbon | 2 +- .../cpp/function/export/generic.carbon | 4 +- .../import/arithmetic_types_bridged.carbon | 48 ++--- .../import/arithmetic_types_direct.carbon | 24 +-- .../interop/cpp/function/import/class.carbon | 30 +-- .../cpp/function/import/constexpr.carbon | 2 +- .../cpp/function/import/decayed_param.carbon | 4 +- .../cpp/function/import/default_arg.carbon | 6 +- .../cpp/function/import/extern_c.carbon | 8 +- .../cpp/function/import/full_semir.carbon | 6 +- .../cpp/function/import/function.carbon | 12 +- .../cpp/function/import/function_ptr.carbon | 18 +- .../cpp/function/import/in_template.carbon | 2 +- .../interop/cpp/function/import/inline.carbon | 6 +- .../cpp/function/import/method_ptr.carbon | 8 +- .../import/multiple_too_few_args_calls.carbon | 2 +- .../function/import/param_unsupported.carbon | 4 +- .../cpp/function/import/pointer.carbon | 36 ++-- .../function/import/qualified_param.carbon | 2 +- .../cpp/function/import/reference.carbon | 24 +-- .../interop/cpp/function/import/return.carbon | 8 +- .../interop/cpp/function/import/struct.carbon | 28 +-- .../interop/cpp/function/import/union.carbon | 26 +-- .../cpp/function/import/variadic.carbon | 2 +- .../cpp/function/import/void_pointer.carbon | 14 +- .../testdata/interop/cpp/impls/as.carbon | 6 +- .../testdata/interop/cpp/impls/copy.carbon | 4 +- .../testdata/interop/cpp/impls/destroy.carbon | 6 +- .../interop/cpp/impls/implicit_as.carbon | 26 +-- .../interop/cpp/macros/invalid.carbon | 2 +- .../testdata/interop/cpp/macros/macros.carbon | 40 ++-- .../interop/cpp/namespace/import.carbon | 10 +- .../cpp/operators/arithmetic_operators.carbon | 2 +- .../interop/cpp/operators/deref.carbon | 4 +- .../interop/cpp/operators/eq_with.carbon | 4 +- .../interop/cpp/operators/operators.carbon | 26 +-- .../interop/cpp/operators/ordered_with.carbon | 4 +- .../interop/cpp/operators/spaceship.carbon | 2 +- .../cpp/primitive_types/arithmetic.carbon | 6 +- .../long_and_long_long.darwin.carbon | 28 +-- .../long_and_long_long.llp64.carbon | 30 +-- .../long_and_long_long.lp64.carbon | 28 +-- .../cpp/primitive_types/void_pointer.carbon | 16 +- .../testdata/interop/cpp/range_for.carbon | 16 +- .../cpp/stdlib/initializer_list.carbon | 2 +- .../interop/cpp/stdlib/string_view.carbon | 4 +- .../cpp/template/alias_template.carbon | 2 +- .../cpp/template/argument_count.carbon | 4 +- .../cpp/template/class_template.carbon | 2 +- .../interop/cpp/template/concept.carbon | 2 +- .../interop/cpp/template/generic_call.carbon | 2 +- .../cpp/template/non_type_param.carbon | 4 +- .../template/template_template_param.carbon | 4 +- .../interop/cpp/template/type_param.carbon | 4 +- .../interop/cpp/template/var_template.carbon | 2 +- .../interop/cpp/type_alias/import.carbon | 4 +- .../interop/cpp/var/import/global.carbon | 4 +- .../interop/cpp/var/import/namespace.carbon | 2 +- toolchain/check/testdata/lambda/lambda.carbon | 19 +- .../testdata/let/compile_time_bindings.carbon | 20 +- toolchain/check/testdata/let/convert.carbon | 2 +- .../testdata/let/fail_duplicate_decl.carbon | 2 +- .../check/testdata/let/fail_generic.carbon | 2 +- .../testdata/let/fail_generic_import.carbon | 4 +- .../testdata/let/fail_missing_value.carbon | 2 +- .../check/testdata/let/fail_modifiers.carbon | 2 +- .../testdata/let/fail_use_in_init.carbon | 2 +- toolchain/check/testdata/let/generic.carbon | 4 +- .../check/testdata/let/generic_import.carbon | 4 +- toolchain/check/testdata/let/global.carbon | 2 +- toolchain/check/testdata/let/import.carbon | 8 +- .../check/testdata/let/import_access.carbon | 8 +- toolchain/check/testdata/let/lifetime.carbon | 2 +- toolchain/check/testdata/let/local.carbon | 4 +- toolchain/check/testdata/let/ref.carbon | 2 +- .../check/testdata/let/shadowed_decl.carbon | 2 +- .../check/testdata/main_run/no_return.carbon | 4 +- .../check/testdata/main_run/return_i32.carbon | 4 +- .../check/testdata/match_first/basic.carbon | 12 +- .../testdata/named_constraint/basic.carbon | 4 +- .../testdata/named_constraint/convert.carbon | 4 +- .../testdata/named_constraint/empty.carbon | 2 +- .../named_constraint/empty_generic.carbon | 2 +- .../extend_name_lookup.carbon | 4 +- .../extend_require_call.carbon | 2 +- .../testdata/named_constraint/generic.carbon | 2 +- .../import_constraint_decl.carbon | 4 +- .../named_constraint/import_type_and.carbon | 4 +- .../testdata/named_constraint/require.carbon | 22 +- .../testdata/namespace/add_to_import.carbon | 4 +- .../check/testdata/namespace/alias.carbon | 2 +- .../fail_conflict_after_merge.carbon | 4 +- ...l_conflict_imported_namespace_first.carbon | 4 +- ..._conflict_imported_namespace_nested.carbon | 4 +- ..._conflict_imported_namespace_second.carbon | 4 +- ...conflict_in_imports_namespace_first.carbon | 6 +- ...onflict_in_imports_namespace_second.carbon | 6 +- .../namespace/fail_decl_in_alias.carbon | 2 +- .../testdata/namespace/fail_duplicate.carbon | 2 +- .../testdata/namespace/fail_modifiers.carbon | 2 +- .../namespace/fail_not_top_level.carbon | 2 +- .../testdata/namespace/fail_params.carbon | 2 +- .../namespace/fail_unresolved_scope.carbon | 2 +- .../check/testdata/namespace/function.carbon | 2 +- .../check/testdata/namespace/imported.carbon | 4 +- .../namespace/imported_indirect.carbon | 14 +- .../check/testdata/namespace/merging.carbon | 6 +- .../merging_with_indirections.carbon | 6 +- .../check/testdata/namespace/nested.carbon | 2 +- .../check/testdata/namespace/shadow.carbon | 2 +- .../namespace/unqualified_lookup.carbon | 2 +- .../testdata/operators/builtin/and.carbon | 2 +- .../operators/builtin/assignment.carbon | 2 +- .../fail_and_or_not_in_function.carbon | 10 +- .../fail_and_or_partial_constant.carbon | 4 +- .../builtin/fail_assignment_to_error.carbon | 2 +- .../fail_assignment_to_non_assignable.carbon | 2 +- .../fail_redundant_compound_access.carbon | 2 +- .../builtin/fail_type_mismatch.carbon | 2 +- .../fail_type_mismatch_assignment.carbon | 2 +- .../builtin/fail_type_mismatch_once.carbon | 2 +- .../builtin/fail_unimplemented_op.carbon | 2 +- .../testdata/operators/builtin/or.carbon | 2 +- .../operators/builtin/unary_op.carbon | 2 +- .../testdata/operators/overloaded/add.carbon | 2 +- .../operators/overloaded/bit_and.carbon | 2 +- .../overloaded/bit_complement.carbon | 2 +- .../operators/overloaded/bit_or.carbon | 2 +- .../operators/overloaded/bit_xor.carbon | 2 +- .../testdata/operators/overloaded/dec.carbon | 2 +- .../testdata/operators/overloaded/div.carbon | 2 +- .../overloaded/fail_assign_non_ref.carbon | 2 +- .../overloaded/fail_error_recovery.carbon | 2 +- .../operators/overloaded/fail_no_impl.carbon | 2 +- .../operators/overloaded/implicit_as.carbon | 2 +- .../testdata/operators/overloaded/inc.carbon | 2 +- .../operators/overloaded/index.carbon | 4 +- .../overloaded/index_with_prelude.carbon | 8 +- .../overloaded/indirect_index_with.carbon | 14 +- .../operators/overloaded/left_shift.carbon | 2 +- .../testdata/operators/overloaded/mod.carbon | 2 +- .../testdata/operators/overloaded/mul.carbon | 2 +- .../operators/overloaded/negate.carbon | 2 +- .../operators/overloaded/right_shift.carbon | 2 +- .../overloaded/string_indexing.carbon | 4 +- .../testdata/operators/overloaded/sub.carbon | 2 +- .../check/testdata/package_expr/syntax.carbon | 6 +- .../packages/cross_package_export.carbon | 38 ++-- .../packages/cross_package_import.carbon | 30 +-- .../testdata/packages/explicit_imports.carbon | 12 +- .../testdata/packages/export_import.carbon | 40 ++-- .../testdata/packages/export_mixed.carbon | 22 +- .../testdata/packages/export_name.carbon | 34 +-- .../packages/fail_api_not_found.carbon | 6 +- .../fail_conflict_no_namespaces.carbon | 6 +- .../check/testdata/packages/fail_cycle.carbon | 10 +- .../packages/fail_duplicate_api.carbon | 16 +- .../packages/fail_export_name_member.carbon | 4 +- .../packages/fail_export_name_params.carbon | 4 +- .../testdata/packages/fail_extension.carbon | 20 +- .../packages/fail_import_default.carbon | 8 +- .../packages/fail_import_invalid.carbon | 18 +- .../packages/fail_import_repeat.carbon | 10 +- .../packages/fail_import_type_error.carbon | 4 +- .../fail_name_with_import_failure.carbon | 2 +- .../packages/implicit_imports_empty.carbon | 20 +- .../packages/implicit_imports_entities.carbon | 40 ++-- .../packages/implicit_imports_prelude.carbon | 4 +- .../testdata/packages/loaded_global.carbon | 8 +- .../testdata/packages/missing_prelude.carbon | 16 +- .../check/testdata/packages/raw_core.carbon | 8 +- .../packages/restricted_package_names.carbon | 20 +- .../packages/unused_lazy_import.carbon | 4 +- .../check/testdata/patterns/expression.carbon | 2 +- .../check/testdata/patterns/struct.carbon | 50 ++--- .../check/testdata/patterns/tuple.carbon | 20 +- .../check/testdata/patterns/underscore.carbon | 14 +- .../testdata/pointer/address_of_deref.carbon | 2 +- .../testdata/pointer/address_of_lvalue.carbon | 2 +- toolchain/check/testdata/pointer/arrow.carbon | 2 +- toolchain/check/testdata/pointer/basic.carbon | 2 +- .../pointer/convert_qualifiers.carbon | 4 +- .../pointer/fail_address_of_error.carbon | 2 +- .../testdata/pointer/fail_deref_error.carbon | 2 +- .../pointer/fail_deref_function.carbon | 2 +- .../pointer/fail_deref_namespace.carbon | 2 +- .../pointer/fail_deref_not_pointer.carbon | 2 +- .../testdata/pointer/fail_deref_type.carbon | 2 +- .../pointer/fail_type_mismatch.carbon | 2 +- .../check/testdata/pointer/import.carbon | 4 +- .../testdata/pointer/nested_const.carbon | 2 +- toolchain/check/testdata/pointer/types.carbon | 2 +- .../primitives/import_symbolic.carbon | 16 +- .../primitives/numeric_literals.carbon | 2 +- .../primitives/string_literals.carbon | 4 +- .../testdata/primitives/type_literals.carbon | 12 +- .../testdata/return/code_after_return.carbon | 2 +- .../return/code_after_return_value.carbon | 2 +- .../testdata/return/fail_call_in_type.carbon | 2 +- .../testdata/return/fail_error_in_type.carbon | 2 +- .../testdata/return/fail_let_in_type.carbon | 2 +- .../return/fail_missing_return.carbon | 2 +- .../fail_missing_return_empty_tuple.carbon | 2 +- .../fail_return_var_no_returned_var.carbon | 2 +- .../fail_return_with_returned_var.carbon | 2 +- .../fail_returned_var_no_return_type.carbon | 4 +- .../return/fail_returned_var_shadow.carbon | 2 +- .../return/fail_returned_var_type.carbon | 2 +- .../testdata/return/fail_type_mismatch.carbon | 2 +- .../return/fail_value_disallowed.carbon | 2 +- .../testdata/return/fail_value_missing.carbon | 2 +- .../testdata/return/fail_var_in_type.carbon | 2 +- .../return/import_convert_function.carbon | 4 +- .../missing_return_no_return_type.carbon | 2 +- .../check/testdata/return/no_value.carbon | 2 +- .../check/testdata/return/returned_var.carbon | 2 +- .../testdata/return/returned_var_scope.carbon | 2 +- toolchain/check/testdata/return/struct.carbon | 2 +- toolchain/check/testdata/return/tuple.carbon | 2 +- .../check/testdata/return/val_form.carbon | 2 +- toolchain/check/testdata/return/value.carbon | 2 +- toolchain/check/testdata/struct/empty.carbon | 2 +- .../struct/fail_access_into_invalid.carbon | 2 +- .../testdata/struct/fail_assign_empty.carbon | 2 +- .../testdata/struct/fail_assign_nested.carbon | 2 +- .../struct/fail_assign_to_empty.carbon | 2 +- .../struct/fail_duplicate_name.carbon | 2 +- .../struct/fail_field_name_mismatch.carbon | 2 +- .../struct/fail_field_type_mismatch.carbon | 2 +- .../struct/fail_member_access_type.carbon | 2 +- .../struct/fail_member_of_function.carbon | 2 +- .../struct/fail_nested_incomplete.carbon | 2 +- .../struct/fail_non_member_access.carbon | 2 +- .../struct/fail_too_few_values.carbon | 2 +- .../testdata/struct/fail_type_assign.carbon | 2 +- .../testdata/struct/fail_value_as_type.carbon | 2 +- toolchain/check/testdata/struct/import.carbon | 4 +- .../struct/literal_member_access.carbon | 2 +- .../testdata/struct/member_access.carbon | 2 +- .../struct/nested_struct_in_place.carbon | 2 +- .../check/testdata/struct/one_entry.carbon | 2 +- .../testdata/struct/partially_const.carbon | 2 +- .../testdata/struct/reorder_fields.carbon | 2 +- .../testdata/struct/tuple_as_element.carbon | 2 +- .../check/testdata/struct/two_entries.carbon | 2 +- toolchain/check/testdata/tuple/basics.carbon | 8 +- .../testdata/tuple/element_access.carbon | 6 +- toolchain/check/testdata/tuple/import.carbon | 4 +- .../testdata/tuple/in_place_tuple_init.carbon | 4 +- .../check/testdata/tuple/tuple_pattern.carbon | 8 +- toolchain/check/testdata/typeof/basics.carbon | 12 +- .../testdata/var/destroy_control_flow.carbon | 10 +- .../check/testdata/var/export_name.carbon | 6 +- .../testdata/var/fail_duplicate_decl.carbon | 2 +- .../check/testdata/var/fail_generic.carbon | 2 +- .../var/fail_init_type_mismatch.carbon | 2 +- .../testdata/var/fail_init_with_self.carbon | 2 +- .../var/fail_storage_is_literal.carbon | 2 +- .../var/fail_todo_control_flow_init.carbon | 8 +- .../check/testdata/var/global_decl.carbon | 2 +- .../testdata/var/global_decl_import.carbon | 2 +- .../testdata/var/global_decl_with_init.carbon | 6 +- .../check/testdata/var/global_lookup.carbon | 2 +- .../var/global_lookup_in_scope.carbon | 2 +- toolchain/check/testdata/var/import.carbon | 4 +- .../check/testdata/var/import_access.carbon | 8 +- .../check/testdata/var/initialization.carbon | 4 +- toolchain/check/testdata/var/lifetime.carbon | 2 +- toolchain/check/testdata/var/lookup.carbon | 2 +- toolchain/check/testdata/var/shadowing.carbon | 2 +- .../check/testdata/var/var_pattern.carbon | 30 +-- .../testdata/where_expr/constraints.carbon | 12 +- .../testdata/where_expr/designator.carbon | 2 +- .../testdata/where_expr/dot_self_index.carbon | 2 +- .../testdata/where_expr/equal_rewrite.carbon | 8 +- .../testdata/where_expr/non_generic.carbon | 2 +- .../check/testdata/while/lifetime.carbon | 2 +- toolchain/check/testdata/while/while.carbon | 6 +- toolchain/driver/compile_driver.cpp | 3 +- toolchain/driver/compile_driver.h | 34 ++- toolchain/driver/testdata/stdin.carbon | 2 +- toolchain/driver/testdata/verbose.carbon | 2 +- toolchain/sem_ir/formatter.cpp | 10 +- toolchain/sem_ir/formatter.h | 5 +- toolchain/sem_ir/inst_namer.cpp | 58 +++-- toolchain/sem_ir/inst_namer.h | 112 ++++++---- 790 files changed, 2398 insertions(+), 2479 deletions(-) create mode 100644 toolchain/check/testdata/basics/file_name.carbon diff --git a/toolchain/check/BUILD b/toolchain/check/BUILD index 469ca6c826f4..2892ca5df642 100644 --- a/toolchain/check/BUILD +++ b/toolchain/check/BUILD @@ -279,6 +279,7 @@ cc_library( "//toolchain/sem_ir:expr_info", "//toolchain/sem_ir:file", "//toolchain/sem_ir:formatter", + "//toolchain/sem_ir:inst_namer", "//toolchain/sem_ir:read_only_ast_source", "//toolchain/sem_ir:typed_insts", "@llvm-project//clang:ast", diff --git a/toolchain/check/check.cpp b/toolchain/check/check.cpp index 2ea83ffbe498..1e4bae3da464 100644 --- a/toolchain/check/check.cpp +++ b/toolchain/check/check.cpp @@ -331,7 +331,8 @@ static auto BuildApiMapAndDiagnosePackaging( // Handles printing of formatted SemIR. static auto MaybeDumpFormattedSemIR( const SemIR::File& sem_ir, int total_ir_count, - Parse::GetTreeAndSubtreesFn tree_and_subtrees_getter, bool include_in_dumps, + Parse::GetTreeAndSubtreesFn tree_and_subtrees_getter, + const SemIR::ShortFileNameStore& short_file_names, bool include_in_dumps, const CheckParseTreesOptions& options) -> void { bool dump = options.dump_stream && include_in_dumps; if (!options.vlog_stream && !dump) { @@ -349,8 +350,9 @@ static auto MaybeDumpFormattedSemIR( options.dump_sem_ir_ranges != CheckParseTreesOptions::DumpSemIRRanges::Ignore && tokens.has_dump_sem_ir_ranges(); - SemIR::Formatter formatter(&sem_ir, total_ir_count, tree_and_subtrees_getter, - options.include_in_dumps, use_dump_sem_ir_ranges); + SemIR::Formatter formatter(&sem_ir, &short_file_names, total_ir_count, + tree_and_subtrees_getter, options.include_in_dumps, + use_dump_sem_ir_ranges); formatter.Format(); if (options.vlog_stream) { CARBON_VLOG_TO(options.vlog_stream, "*** SemIR::File ***\n"); @@ -365,6 +367,7 @@ static auto MaybeDumpFormattedSemIR( static auto MaybeDumpSemIR( llvm::ArrayRef units, const Parse::GetTreeAndSubtreesStore& tree_and_subtrees_getters, + const SemIR::ShortFileNameStore& short_file_names, const CheckParseTreesOptions& options) -> void { if (!options.vlog_stream && !options.dump_stream && !options.raw_dump_stream) { @@ -387,7 +390,7 @@ static auto MaybeDumpSemIR( MaybeDumpFormattedSemIR( *unit.sem_ir, units.size(), tree_and_subtrees_getters.Get(unit.sem_ir->check_ir_id()), - include_in_dumps, options); + short_file_names, include_in_dumps, options); } } @@ -411,6 +414,7 @@ static auto MaybeDumpCppAST(llvm::ArrayRef units, auto CheckParseTrees( llvm::MutableArrayRef units, const Parse::GetTreeAndSubtreesStore& tree_and_subtrees_getters, + const SemIR::ShortFileNameStore& short_file_names, llvm::IntrusiveRefCntPtr fs, const CheckParseTreesOptions& options, std::shared_ptr clang_invocation) -> void { @@ -606,7 +610,7 @@ auto CheckParseTrees( FinalizeCppDomain(*domain); } - MaybeDumpSemIR(units, tree_and_subtrees_getters, options); + MaybeDumpSemIR(units, tree_and_subtrees_getters, short_file_names, options); MaybeDumpCppAST(units, options); } diff --git a/toolchain/check/check.h b/toolchain/check/check.h index 6e19017a367e..b9e5f26a54e7 100644 --- a/toolchain/check/check.h +++ b/toolchain/check/check.h @@ -14,6 +14,7 @@ #include "toolchain/parse/tree_and_subtrees.h" #include "toolchain/sem_ir/file.h" #include "toolchain/sem_ir/ids.h" +#include "toolchain/sem_ir/inst_namer.h" namespace Carbon::Check { @@ -93,6 +94,7 @@ struct CheckParseTreesOptions { auto CheckParseTrees( llvm::MutableArrayRef units, const Parse::GetTreeAndSubtreesStore& tree_and_subtrees_getters, + const SemIR::ShortFileNameStore& short_file_names, llvm::IntrusiveRefCntPtr fs, const CheckParseTreesOptions& options, std::shared_ptr clang_invocation) -> void; diff --git a/toolchain/check/testdata/alias/basics.carbon b/toolchain/check/testdata/alias/basics.carbon index 129461680143..99081670bb05 100644 --- a/toolchain/check/testdata/alias/basics.carbon +++ b/toolchain/check/testdata/alias/basics.carbon @@ -193,7 +193,7 @@ impl alias B = Class; // CHECK:STDERR: extern alias C = Class; -// CHECK:STDOUT: --- alias.carbon +// CHECK:STDOUT: --- alias.carbon = $alias // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -210,7 +210,7 @@ extern alias C = Class; // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- alias_of_alias.carbon +// CHECK:STDOUT: --- alias_of_alias.carbon = $alias_of_alias // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -248,7 +248,7 @@ extern alias C = Class; // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- alias_to_generic.carbon +// CHECK:STDOUT: --- alias_to_generic.carbon = $alias_to_generic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/alias/builtins.carbon b/toolchain/check/testdata/alias/builtins.carbon index 2f99069480cf..a330b934b8f9 100644 --- a/toolchain/check/testdata/alias/builtins.carbon +++ b/toolchain/check/testdata/alias/builtins.carbon @@ -36,7 +36,7 @@ alias a = false; let a_test: bool = a; //@dump-sem-ir-end -// CHECK:STDOUT: --- i32.carbon +// CHECK:STDOUT: --- i32.carbon = $i32 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -49,7 +49,7 @@ let a_test: bool = a; // CHECK:STDOUT: %a: type = alias_binding a, %i32 [concrete = constants.%i32] // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- bool.carbon +// CHECK:STDOUT: --- bool.carbon = $bool.2 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -60,7 +60,7 @@ let a_test: bool = a; // CHECK:STDOUT: %b: type = alias_binding b, %.loc5 [concrete = bool] // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- bool_value.carbon +// CHECK:STDOUT: --- bool_value.carbon = $bool_value // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/alias/export_name.carbon b/toolchain/check/testdata/alias/export_name.carbon index c18741e48320..1f74369101f7 100644 --- a/toolchain/check/testdata/alias/export_name.carbon +++ b/toolchain/check/testdata/alias/export_name.carbon @@ -74,7 +74,7 @@ import library "export_orig"; var c: C = {}; var d: D* = &c; -// CHECK:STDOUT: --- base.carbon +// CHECK:STDOUT: --- base.carbon = $base // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -110,7 +110,7 @@ var d: D* = &c; // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- export.carbon +// CHECK:STDOUT: --- export.carbon = $export // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -148,7 +148,7 @@ var d: D* = &c; // CHECK:STDOUT: .Self = imports.%Main.import_ref.e47 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- export_orig.carbon +// CHECK:STDOUT: --- export_orig.carbon = $export_orig // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -186,7 +186,7 @@ var d: D* = &c; // CHECK:STDOUT: .Self = imports.%Main.import_ref.e47 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_export.carbon +// CHECK:STDOUT: --- use_export.carbon = $use_export // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -243,7 +243,7 @@ var d: D* = &c; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_orig_name_not_in_export.carbon +// CHECK:STDOUT: --- fail_orig_name_not_in_export.carbon = $fail_orig_name_not_in_export // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -284,7 +284,7 @@ var d: D* = &c; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- indirect_compat.carbon +// CHECK:STDOUT: --- indirect_compat.carbon = $indirect_compat // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/alias/import.carbon b/toolchain/check/testdata/alias/import.carbon index 0e8b91232016..ad0c797ad5b7 100644 --- a/toolchain/check/testdata/alias/import.carbon +++ b/toolchain/check/testdata/alias/import.carbon @@ -65,7 +65,7 @@ import library "var2"; var c: () = a_alias_alias; -// CHECK:STDOUT: --- class1.carbon +// CHECK:STDOUT: --- class1.carbon = $class1 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -141,7 +141,7 @@ var c: () = a_alias_alias; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- class2.carbon +// CHECK:STDOUT: --- class2.carbon = $class2 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -223,7 +223,7 @@ var c: () = a_alias_alias; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- class3.carbon +// CHECK:STDOUT: --- class3.carbon = $class3 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -300,7 +300,7 @@ var c: () = a_alias_alias; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- var1.carbon +// CHECK:STDOUT: --- var1.carbon = $var1 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -348,7 +348,7 @@ var c: () = a_alias_alias; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- var2.carbon +// CHECK:STDOUT: --- var2.carbon = $var2 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -404,7 +404,7 @@ var c: () = a_alias_alias; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- var3.carbon +// CHECK:STDOUT: --- var3.carbon = $var3 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/alias/import_access.carbon b/toolchain/check/testdata/alias/import_access.carbon index c8a37063def2..1936030d2079 100644 --- a/toolchain/check/testdata/alias/import_access.carbon +++ b/toolchain/check/testdata/alias/import_access.carbon @@ -61,7 +61,7 @@ import Test library "def"; // CHECK:STDERR: var inst: Test.A = {}; -// CHECK:STDOUT: --- def.carbon +// CHECK:STDOUT: --- def.carbon = $def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -88,7 +88,7 @@ var inst: Test.A = {}; // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- def.impl.carbon +// CHECK:STDOUT: --- def.impl.carbon = $def.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -142,7 +142,7 @@ var inst: Test.A = {}; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_local_def.carbon +// CHECK:STDOUT: --- fail_local_def.carbon = $fail_local_def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -177,7 +177,7 @@ var inst: Test.A = {}; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_other_def.carbon +// CHECK:STDOUT: --- fail_other_def.carbon = $fail_other_def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/alias/import_order.carbon b/toolchain/check/testdata/alias/import_order.carbon index 465b91d35beb..018f9a820b53 100644 --- a/toolchain/check/testdata/alias/import_order.carbon +++ b/toolchain/check/testdata/alias/import_order.carbon @@ -33,7 +33,7 @@ var c_val: c = {.v = d_val.v}; var b_val: b = {.v = c_val.v}; var a_val: a = {.v = b_val.v}; -// CHECK:STDOUT: --- a.carbon +// CHECK:STDOUT: --- a.carbon = $a // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -77,7 +77,7 @@ var a_val: a = {.v = b_val.v}; // CHECK:STDOUT: .v = %field_decl // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- b.carbon +// CHECK:STDOUT: --- b.carbon = $b // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/alias/in_namespace.carbon b/toolchain/check/testdata/alias/in_namespace.carbon index acdf2c4116f3..1f9b78cccc33 100644 --- a/toolchain/check/testdata/alias/in_namespace.carbon +++ b/toolchain/check/testdata/alias/in_namespace.carbon @@ -51,7 +51,7 @@ fn F() -> {} { return NS.a; } -// CHECK:STDOUT: --- in_namespace.carbon +// CHECK:STDOUT: --- in_namespace.carbon = $in_namespace // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/alias/var.carbon b/toolchain/check/testdata/alias/var.carbon index 18c3432281fc..4754ac2a19da 100644 --- a/toolchain/check/testdata/alias/var.carbon +++ b/toolchain/check/testdata/alias/var.carbon @@ -46,7 +46,7 @@ fn F() -> () { return b; } -// CHECK:STDOUT: --- global.carbon +// CHECK:STDOUT: --- global.carbon = $global // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -65,7 +65,7 @@ fn F() -> () { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_local.carbon +// CHECK:STDOUT: --- fail_local.carbon = $fail_local // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/array/basics.carbon b/toolchain/check/testdata/array/basics.carbon index dae6548eb363..1e83830fc7be 100644 --- a/toolchain/check/testdata/array/basics.carbon +++ b/toolchain/check/testdata/array/basics.carbon @@ -133,7 +133,7 @@ library "[[@TEST_NAME]]"; // CHECK:STDERR: var a: array(1, 1); -// CHECK:STDOUT: --- assign_var.carbon +// CHECK:STDOUT: --- assign_var.carbon = $assign_var // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -197,7 +197,7 @@ var a: array(1, 1); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- array_in_place.carbon +// CHECK:STDOUT: --- array_in_place.carbon = $array_in_place // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -343,7 +343,7 @@ var a: array(1, 1); // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- array_vs_tuple.carbon +// CHECK:STDOUT: --- array_vs_tuple.carbon = $array_vs_tuple // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -523,7 +523,7 @@ var a: array(1, 1); // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- assign_return_value.carbon +// CHECK:STDOUT: --- assign_return_value.carbon = $assign_return_value // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -639,7 +639,7 @@ var a: array(1, 1); // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- nine_elements.carbon +// CHECK:STDOUT: --- nine_elements.carbon = $nine_elements // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/array/bound_values.carbon b/toolchain/check/testdata/array/bound_values.carbon index 934799f09147..532451a250b9 100644 --- a/toolchain/check/testdata/array/bound_values.carbon +++ b/toolchain/check/testdata/array/bound_values.carbon @@ -75,7 +75,7 @@ library "[[@TEST_NAME]]"; // CHECK:STDERR: var b: array(1, 39999999999999999993); -// CHECK:STDOUT: --- addition.carbon +// CHECK:STDOUT: --- addition.carbon = $addition // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -120,7 +120,7 @@ var b: array(1, 39999999999999999993); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- unsigned.carbon +// CHECK:STDOUT: --- unsigned.carbon = $unsigned // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/array/import.carbon b/toolchain/check/testdata/array/import.carbon index ff4b44c66e4c..50b2f175c1bb 100644 --- a/toolchain/check/testdata/array/import.carbon +++ b/toolchain/check/testdata/array/import.carbon @@ -50,7 +50,7 @@ fn F() -> i32 { return a[0]; } -// CHECK:STDOUT: --- user.carbon +// CHECK:STDOUT: --- user.carbon = $user // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -506,7 +506,7 @@ fn F() -> i32 { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_symbolic_decl.carbon +// CHECK:STDOUT: --- import_symbolic_decl.carbon = $import_symbolic_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/array/index_not_literal.carbon b/toolchain/check/testdata/array/index_not_literal.carbon index 60a777542837..206ec60b8511 100644 --- a/toolchain/check/testdata/array/index_not_literal.carbon +++ b/toolchain/check/testdata/array/index_not_literal.carbon @@ -49,7 +49,7 @@ fn F(a: array({}, 3)) -> {} { return a[{.index = 3}.index]; } -// CHECK:STDOUT: --- function_param.carbon +// CHECK:STDOUT: --- function_param.carbon = $function_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -229,7 +229,7 @@ fn F(a: array({}, 3)) -> {} { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- index_non_literal.carbon +// CHECK:STDOUT: --- index_non_literal.carbon = $index_non_literal // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/array/init_dependent_bound.carbon b/toolchain/check/testdata/array/init_dependent_bound.carbon index eccb00bee877..eda5d7bf222f 100644 --- a/toolchain/check/testdata/array/init_dependent_bound.carbon +++ b/toolchain/check/testdata/array/init_dependent_bound.carbon @@ -80,7 +80,7 @@ fn G(template N: i32) { fn H() { G(3); } -// CHECK:STDOUT: --- generic_empty.carbon +// CHECK:STDOUT: --- generic_empty.carbon = $generic_empty // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -194,7 +194,7 @@ fn H() { G(3); } // CHECK:STDOUT: %SelfDestruct.specific_fn.2 => constants.%SelfDestruct.specific_fn.cac // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- init_template_dependent_bound.carbon +// CHECK:STDOUT: --- init_template_dependent_bound.carbon = $init_template_dependent_bound // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/as/adapter_conversion.carbon b/toolchain/check/testdata/as/adapter_conversion.carbon index 410a687141c2..a79c548be5bf 100644 --- a/toolchain/check/testdata/as/adapter_conversion.carbon +++ b/toolchain/check/testdata/as/adapter_conversion.carbon @@ -174,7 +174,7 @@ class B { // CHECK:STDERR: var b: B = {.x = ()} as B; -// CHECK:STDOUT: --- adapt_class.carbon +// CHECK:STDOUT: --- adapt_class.carbon = $adapt_class // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -240,7 +240,7 @@ var b: B = {.x = ()} as B; // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- adapt_i32.carbon +// CHECK:STDOUT: --- adapt_i32.carbon = $adapt_i32 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -309,7 +309,7 @@ var b: B = {.x = ()} as B; // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- multi_level_adapt.carbon +// CHECK:STDOUT: --- multi_level_adapt.carbon = $multi_level_adapt // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -339,7 +339,7 @@ var b: B = {.x = ()} as B; // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- init_class_value.carbon +// CHECK:STDOUT: --- init_class_value.carbon = $init_class_value // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -421,7 +421,7 @@ var b: B = {.x = ()} as B; // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- init_tuple_value.carbon +// CHECK:STDOUT: --- init_tuple_value.carbon = $init_tuple_value // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/as/basics.carbon b/toolchain/check/testdata/as/basics.carbon index 5cd09081a85e..89d2bb80929a 100644 --- a/toolchain/check/testdata/as/basics.carbon +++ b/toolchain/check/testdata/as/basics.carbon @@ -136,7 +136,7 @@ library "[[@TEST_NAME]]"; // CHECK:STDERR: let n: {.x: ()} = {.x = ()} as {.x = ()}; -// CHECK:STDOUT: --- simple_as.carbon +// CHECK:STDOUT: --- simple_as.carbon = $simple_as // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -179,7 +179,7 @@ let n: {.x: ()} = {.x = ()} as {.x = ()}; // CHECK:STDOUT: return %.loc6_48 to %return.param // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- as_type.carbon +// CHECK:STDOUT: --- as_type.carbon = $as_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -211,7 +211,7 @@ let n: {.x: ()} = {.x = ()} as {.x = ()}; // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- as_tuple.carbon +// CHECK:STDOUT: --- as_tuple.carbon = $as_tuple // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -359,7 +359,7 @@ let n: {.x: ()} = {.x = ()} as {.x = ()}; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- identity.carbon +// CHECK:STDOUT: --- identity.carbon = $identity // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -449,7 +449,7 @@ let n: {.x: ()} = {.x = ()} as {.x = ()}; // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc24_3.2(%self.param: ref %X) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- overloaded.carbon +// CHECK:STDOUT: --- overloaded.carbon = $overloaded // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/as/const.carbon b/toolchain/check/testdata/as/const.carbon index 523dc7492eaf..57878700ece5 100644 --- a/toolchain/check/testdata/as/const.carbon +++ b/toolchain/check/testdata/as/const.carbon @@ -100,7 +100,7 @@ fn Use() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- add_const.carbon +// CHECK:STDOUT: --- add_const.carbon = $add_const // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -227,7 +227,7 @@ fn Use() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- remove_const.carbon +// CHECK:STDOUT: --- remove_const.carbon = $remove_const // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -303,7 +303,7 @@ fn Use() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- unsafe_remove_const.carbon +// CHECK:STDOUT: --- unsafe_remove_const.carbon = $unsafe_remove_const // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/as/maybe_unformed.carbon b/toolchain/check/testdata/as/maybe_unformed.carbon index 03e5845672c8..6ac2c78251c1 100644 --- a/toolchain/check/testdata/as/maybe_unformed.carbon +++ b/toolchain/check/testdata/as/maybe_unformed.carbon @@ -167,7 +167,7 @@ fn Use() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- add_unformed.carbon +// CHECK:STDOUT: --- add_unformed.carbon = $add_unformed // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -245,7 +245,7 @@ fn Use() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_add_unformed_nonref.carbon +// CHECK:STDOUT: --- fail_todo_add_unformed_nonref.carbon = $fail_todo_add_unformed_nonref // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -359,7 +359,7 @@ fn Use() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- unsafe_remove_unformed.carbon +// CHECK:STDOUT: --- unsafe_remove_unformed.carbon = $unsafe_remove_unformed // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/as/partial.carbon b/toolchain/check/testdata/as/partial.carbon index a19e7e590083..71a1c664b099 100644 --- a/toolchain/check/testdata/as/partial.carbon +++ b/toolchain/check/testdata/as/partial.carbon @@ -118,7 +118,7 @@ fn Use() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- add_partial.carbon +// CHECK:STDOUT: --- add_partial.carbon = $add_partial // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -240,7 +240,7 @@ fn Use() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- remove_partial_in_init.carbon +// CHECK:STDOUT: --- remove_partial_in_init.carbon = $remove_partial_in_init // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -343,7 +343,7 @@ fn Use() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc12_3.2(%self.param: ref %X) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- unsafe_remove_partial.carbon +// CHECK:STDOUT: --- unsafe_remove_partial.carbon = $unsafe_remove_partial // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/as/var_init.carbon b/toolchain/check/testdata/as/var_init.carbon index e22361b2bd04..d7c25f2d9ce5 100644 --- a/toolchain/check/testdata/as/var_init.carbon +++ b/toolchain/check/testdata/as/var_init.carbon @@ -27,7 +27,7 @@ fn Convert(unused t: ()) { } -// CHECK:STDOUT: --- var_init.carbon +// CHECK:STDOUT: --- var_init.carbon = $var_init // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/basics/dump_sem_ir_ranges.carbon b/toolchain/check/testdata/basics/dump_sem_ir_ranges.carbon index be230ca630d9..1ccd29d5089a 100644 --- a/toolchain/check/testdata/basics/dump_sem_ir_ranges.carbon +++ b/toolchain/check/testdata/basics/dump_sem_ir_ranges.carbon @@ -97,7 +97,7 @@ library "[[@TEST_NAME]]"; //@include-in-dumps -// CHECK:STDOUT: --- function.carbon +// CHECK:STDOUT: --- function.carbon = $function // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -188,7 +188,7 @@ library "[[@TEST_NAME]]"; // CHECK:STDOUT: return %.loc20_11 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- class.carbon +// CHECK:STDOUT: --- class.carbon = $class // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -231,7 +231,7 @@ library "[[@TEST_NAME]]"; // CHECK:STDOUT: // CHECK:STDOUT: fn @C.I(); // CHECK:STDOUT: -// CHECK:STDOUT: --- call_params.carbon +// CHECK:STDOUT: --- call_params.carbon = $call_params // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -295,7 +295,7 @@ library "[[@TEST_NAME]]"; // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc17(%self.param: ref %empty_tuple.type) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- file_without_ranges.carbon +// CHECK:STDOUT: --- file_without_ranges.carbon = $file_without_ranges // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -321,7 +321,7 @@ library "[[@TEST_NAME]]"; // CHECK:STDOUT: // CHECK:STDOUT: fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: --- explicit_dump_file.carbon +// CHECK:STDOUT: --- explicit_dump_file.carbon = $explicit_dump_file // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [concrete] { diff --git a/toolchain/check/testdata/basics/dump_sem_ir_ranges_ignore.carbon b/toolchain/check/testdata/basics/dump_sem_ir_ranges_ignore.carbon index 80aa0822e4a5..e1378c4a40e6 100644 --- a/toolchain/check/testdata/basics/dump_sem_ir_ranges_ignore.carbon +++ b/toolchain/check/testdata/basics/dump_sem_ir_ranges_ignore.carbon @@ -31,7 +31,7 @@ library "[[@TEST_NAME]]"; //@include-in-dumps -// CHECK:STDOUT: --- with-range.carbon +// CHECK:STDOUT: --- with-range.carbon = $with-range // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -48,7 +48,7 @@ library "[[@TEST_NAME]]"; // CHECK:STDOUT: // CHECK:STDOUT: fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: --- without-range.carbon +// CHECK:STDOUT: --- without-range.carbon = $without-range // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -65,7 +65,7 @@ library "[[@TEST_NAME]]"; // CHECK:STDOUT: // CHECK:STDOUT: fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: --- explicit_dump_file.carbon +// CHECK:STDOUT: --- explicit_dump_file.carbon = $explicit_dump_file // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} diff --git a/toolchain/check/testdata/basics/dump_sem_ir_ranges_only.carbon b/toolchain/check/testdata/basics/dump_sem_ir_ranges_only.carbon index c92609776d00..609540580256 100644 --- a/toolchain/check/testdata/basics/dump_sem_ir_ranges_only.carbon +++ b/toolchain/check/testdata/basics/dump_sem_ir_ranges_only.carbon @@ -33,7 +33,7 @@ library "[[@TEST_NAME]]"; //@include-in-dumps -// CHECK:STDOUT: --- with-range.carbon +// CHECK:STDOUT: --- with-range.carbon = $with-range // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -47,7 +47,7 @@ library "[[@TEST_NAME]]"; // CHECK:STDOUT: // CHECK:STDOUT: fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: --- explicit_dump_file.carbon +// CHECK:STDOUT: --- explicit_dump_file.carbon = $explicit_dump_file // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} diff --git a/toolchain/check/testdata/basics/duplicate_name_same_line.carbon b/toolchain/check/testdata/basics/duplicate_name_same_line.carbon index 9f0be32240fc..8c6e01d8c4be 100644 --- a/toolchain/check/testdata/basics/duplicate_name_same_line.carbon +++ b/toolchain/check/testdata/basics/duplicate_name_same_line.carbon @@ -20,7 +20,7 @@ fn A() { } } -// CHECK:STDOUT: --- duplicate_name_same_line.carbon +// CHECK:STDOUT: --- duplicate_name_same_line.carbon = $duplicate_name_same_line // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/basics/empty.carbon b/toolchain/check/testdata/basics/empty.carbon index fa7aafae5188..482e1c38a1c1 100644 --- a/toolchain/check/testdata/basics/empty.carbon +++ b/toolchain/check/testdata/basics/empty.carbon @@ -19,13 +19,13 @@ library "[[@TEST_NAME]]"; ; -// CHECK:STDOUT: --- empty.carbon +// CHECK:STDOUT: --- empty.carbon = $empty // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- empty_decl.carbon +// CHECK:STDOUT: --- empty_decl.carbon = $empty_decl // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} diff --git a/toolchain/check/testdata/basics/file_name.carbon b/toolchain/check/testdata/basics/file_name.carbon new file mode 100644 index 000000000000..e849ccb8c862 --- /dev/null +++ b/toolchain/check/testdata/basics/file_name.carbon @@ -0,0 +1,32 @@ +// Part of the Carbon Language project, under the Apache License v2.0 with LLVM +// Exceptions. See /LICENSE for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/none.carbon +// +// AUTOUPDATE +// TIP: To test this file alone, run: +// TIP: bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/check/testdata/basics/file_name.carbon +// TIP: To dump output, run: +// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/check/testdata/basics/file_name.carbon + +// --- bar/foo.carbon +library "bar"; +//@include-in-dumps + +// --- baz/foo.carbon +library "baz"; +//@include-in-dumps + +// CHECK:STDOUT: --- bar/foo.carbon = $foo.1 +// CHECK:STDOUT: +// CHECK:STDOUT: file { +// CHECK:STDOUT: package: = namespace [concrete] {} +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: --- baz/foo.carbon = $foo.2 +// CHECK:STDOUT: +// CHECK:STDOUT: file { +// CHECK:STDOUT: package: = namespace [concrete] {} +// CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/include_in_dumps.carbon b/toolchain/check/testdata/basics/include_in_dumps.carbon index d41cf3f21ec8..01837678cf33 100644 --- a/toolchain/check/testdata/basics/include_in_dumps.carbon +++ b/toolchain/check/testdata/basics/include_in_dumps.carbon @@ -80,7 +80,7 @@ import library "excluded_with_range"; fn F(c: C) { c.(I.Op)(); } -// CHECK:STDOUT: --- exclude/included.carbon +// CHECK:STDOUT: --- exclude/included.carbon = $included // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -117,7 +117,7 @@ fn F(c: C) { c.(I.Op)(); } // CHECK:STDOUT: // CHECK:STDOUT: specific @I.WithSelf(constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- exclude/included_with_range.carbon +// CHECK:STDOUT: --- exclude/included_with_range.carbon = $included_with_range // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -212,7 +212,7 @@ fn F(c: C) { c.(I.Op)(); } // CHECK:STDOUT: %self.patt.loc8_9.2 => constants.%self.patt.36a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_included.carbon +// CHECK:STDOUT: --- import_included.carbon = $import_included // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -350,7 +350,7 @@ fn F(c: C) { c.(I.Op)(); } // CHECK:STDOUT: %I.WithSelf.Op => constants.%I.WithSelf.Op.ca6 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_excluded.carbon +// CHECK:STDOUT: --- import_excluded.carbon = $import_excluded // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/basics/multi_error.carbon b/toolchain/check/testdata/basics/multi_error.carbon index 5027bfa187e3..eeef80900c13 100644 --- a/toolchain/check/testdata/basics/multi_error.carbon +++ b/toolchain/check/testdata/basics/multi_error.carbon @@ -34,7 +34,7 @@ fn Foo[runtime a: ()](); // CHECK:STDERR: fn Boo[runtime a: ()]() {} -// CHECK:STDOUT: --- fail_multi_error.carbon +// CHECK:STDOUT: --- fail_multi_error.carbon = $fail_multi_error // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/basics/name_lookup.carbon b/toolchain/check/testdata/basics/name_lookup.carbon index 34a867c3b1e5..d297df71cebb 100644 --- a/toolchain/check/testdata/basics/name_lookup.carbon +++ b/toolchain/check/testdata/basics/name_lookup.carbon @@ -43,7 +43,7 @@ fn F() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- fail_not_found.carbon +// CHECK:STDOUT: --- fail_not_found.carbon = $fail_not_found // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { // CHECK:STDOUT: !entry: @@ -51,7 +51,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_qualififier_unsupported.carbon +// CHECK:STDOUT: --- fail_qualififier_unsupported.carbon = $fail_qualififier_unsupported // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %true: bool = bool_literal true [concrete] diff --git a/toolchain/check/testdata/basics/parens.carbon b/toolchain/check/testdata/basics/parens.carbon index 22b70dad72d1..90fca0eaf865 100644 --- a/toolchain/check/testdata/basics/parens.carbon +++ b/toolchain/check/testdata/basics/parens.carbon @@ -14,7 +14,7 @@ var a: i32 = (1); var b: i32 = ((2)); -// CHECK:STDOUT: --- parens.carbon +// CHECK:STDOUT: --- parens.carbon = $parens // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/basics/raw_identifier.carbon b/toolchain/check/testdata/basics/raw_identifier.carbon index d34789342623..afcf6d992ab6 100644 --- a/toolchain/check/testdata/basics/raw_identifier.carbon +++ b/toolchain/check/testdata/basics/raw_identifier.carbon @@ -23,7 +23,7 @@ fn C(r#if: ()) -> () { return r#if; } -// CHECK:STDOUT: --- raw_identifier.carbon +// CHECK:STDOUT: --- raw_identifier.carbon = $raw_identifier // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/basics/raw_sem_ir/multifile_with_textual_ir.carbon b/toolchain/check/testdata/basics/raw_sem_ir/multifile_with_textual_ir.carbon index caaa7e897ab6..87e2389c4a98 100644 --- a/toolchain/check/testdata/basics/raw_sem_ir/multifile_with_textual_ir.carbon +++ b/toolchain/check/testdata/basics/raw_sem_ir/multifile_with_textual_ir.carbon @@ -131,7 +131,7 @@ fn B() { // CHECK:STDOUT: identifier0: A // CHECK:STDOUT: strings: {} // CHECK:STDOUT: ... -// CHECK:STDOUT: --- a.carbon +// CHECK:STDOUT: --- a.carbon = $a // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -285,7 +285,7 @@ fn B() { // CHECK:STDOUT: identifier1: A // CHECK:STDOUT: strings: {} // CHECK:STDOUT: ... -// CHECK:STDOUT: --- b.carbon +// CHECK:STDOUT: --- b.carbon = $b // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 aab8cf54120c..00da6c31d3e5 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 @@ -269,7 +269,7 @@ fn Foo(n: ()) -> ((), ()) { // CHECK:STDOUT: identifier1: n // CHECK:STDOUT: strings: {} // CHECK:STDOUT: ... -// CHECK:STDOUT: --- one_file_with_textual_ir.carbon +// CHECK:STDOUT: --- one_file_with_textual_ir.carbon = $one_file_with_textual_ir // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/array/make_type.carbon b/toolchain/check/testdata/builtins/array/make_type.carbon index ef8beca43acb..566062953bfe 100644 --- a/toolchain/check/testdata/builtins/array/make_type.carbon +++ b/toolchain/check/testdata/builtins/array/make_type.carbon @@ -103,7 +103,7 @@ fn F(n: Core.IntLiteral) { var unused a: MakeArray(i32, n); } -// CHECK:STDOUT: --- use_types.carbon +// CHECK:STDOUT: --- use_types.carbon = $use_types // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/bool/eq.carbon b/toolchain/check/testdata/builtins/bool/eq.carbon index 00b797e413c0..4669aededcbc 100644 --- a/toolchain/check/testdata/builtins/bool/eq.carbon +++ b/toolchain/check/testdata/builtins/bool/eq.carbon @@ -44,7 +44,7 @@ var b: C(true == false) = False(); var c: C(false == true) = False(); var d: C(false == false) = True(); -// CHECK:STDOUT: --- builtin_call.carbon +// CHECK:STDOUT: --- builtin_call.carbon = $builtin_call // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -89,7 +89,7 @@ var d: C(false == false) = True(); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- prelude.carbon +// CHECK:STDOUT: --- prelude.carbon = $prelude.2 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/bool/make_type.carbon b/toolchain/check/testdata/builtins/bool/make_type.carbon index 9d518ce2d3fb..c75090cbba50 100644 --- a/toolchain/check/testdata/builtins/bool/make_type.carbon +++ b/toolchain/check/testdata/builtins/bool/make_type.carbon @@ -26,7 +26,7 @@ import library "types"; let b: Bool() = false; //@dump-sem-ir-end -// CHECK:STDOUT: --- use_types.carbon +// CHECK:STDOUT: --- use_types.carbon = $use_types // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/bool/neq.carbon b/toolchain/check/testdata/builtins/bool/neq.carbon index 5ea3e2a9f047..5c21f8450f1b 100644 --- a/toolchain/check/testdata/builtins/bool/neq.carbon +++ b/toolchain/check/testdata/builtins/bool/neq.carbon @@ -44,7 +44,7 @@ var b: C(true != false) = True(); var c: C(false != true) = True(); var d: C(false != false) = False(); -// CHECK:STDOUT: --- builtin_call.carbon +// CHECK:STDOUT: --- builtin_call.carbon = $builtin_call // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -90,7 +90,7 @@ var d: C(false != false) = False(); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- prelude.carbon +// CHECK:STDOUT: --- prelude.carbon = $prelude.2 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/char_literal/add.carbon b/toolchain/check/testdata/builtins/char_literal/add.carbon index ff4a33cc8bec..c8843ebfe64e 100644 --- a/toolchain/check/testdata/builtins/char_literal/add.carbon +++ b/toolchain/check/testdata/builtins/char_literal/add.carbon @@ -92,7 +92,7 @@ let b: CharLiteral = AddCharInt('\u{D7FF}', 1); // CHECK:STDERR: let c: CharLiteral = AddCharInt('a', Negate(98)); -// CHECK:STDOUT: --- success.carbon +// CHECK:STDOUT: --- success.carbon = $success // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/char_literal/convert_char.carbon b/toolchain/check/testdata/builtins/char_literal/convert_char.carbon index fb54a00b6f02..d904bd7e03ce 100644 --- a/toolchain/check/testdata/builtins/char_literal/convert_char.carbon +++ b/toolchain/check/testdata/builtins/char_literal/convert_char.carbon @@ -115,7 +115,7 @@ import library "builtin"; // CHECK:STDERR: let c: UInt(8) = ToChar('\u{1E15}'); -// CHECK:STDOUT: --- narrow.carbon +// CHECK:STDOUT: --- narrow.carbon = $narrow // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/char_literal/convert_int.carbon b/toolchain/check/testdata/builtins/char_literal/convert_int.carbon index 2b2da6747bcf..35be9a4330f8 100644 --- a/toolchain/check/testdata/builtins/char_literal/convert_int.carbon +++ b/toolchain/check/testdata/builtins/char_literal/convert_int.carbon @@ -65,7 +65,7 @@ fn ConvertToU8(c: CharLiteral) -> UInt(8) = "char_literal.convert_int"; // CHECK:STDERR: let g: u8 = ConvertToU8('\u{100}'); -// CHECK:STDOUT: --- success.carbon +// CHECK:STDOUT: --- success.carbon = $success // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/char_literal/eq.carbon b/toolchain/check/testdata/builtins/char_literal/eq.carbon index 63bff3f95477..70b5cf897c0d 100644 --- a/toolchain/check/testdata/builtins/char_literal/eq.carbon +++ b/toolchain/check/testdata/builtins/char_literal/eq.carbon @@ -22,7 +22,7 @@ let a: bool = Eq('a', 'a'); let b: bool = Eq('a', 'b'); //@dump-sem-ir-end -// CHECK:STDOUT: --- eq.carbon +// CHECK:STDOUT: --- eq.carbon = $eq // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/char_literal/greater.carbon b/toolchain/check/testdata/builtins/char_literal/greater.carbon index 237be512137e..2977b542758b 100644 --- a/toolchain/check/testdata/builtins/char_literal/greater.carbon +++ b/toolchain/check/testdata/builtins/char_literal/greater.carbon @@ -22,7 +22,7 @@ let a: bool = Greater('b', 'a'); let b: bool = Greater('a', 'b'); //@dump-sem-ir-end -// CHECK:STDOUT: --- greater.carbon +// CHECK:STDOUT: --- greater.carbon = $greater // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/char_literal/greater_eq.carbon b/toolchain/check/testdata/builtins/char_literal/greater_eq.carbon index bb62f8cd9abf..15fc1e3d3b69 100644 --- a/toolchain/check/testdata/builtins/char_literal/greater_eq.carbon +++ b/toolchain/check/testdata/builtins/char_literal/greater_eq.carbon @@ -23,7 +23,7 @@ let b: bool = GreaterEq('b', 'a'); let c: bool = GreaterEq('a', 'b'); //@dump-sem-ir-end -// CHECK:STDOUT: --- greater_eq.carbon +// CHECK:STDOUT: --- greater_eq.carbon = $greater_eq // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/char_literal/less.carbon b/toolchain/check/testdata/builtins/char_literal/less.carbon index b10038576b08..93a849b763fe 100644 --- a/toolchain/check/testdata/builtins/char_literal/less.carbon +++ b/toolchain/check/testdata/builtins/char_literal/less.carbon @@ -22,7 +22,7 @@ let a: bool = Less('a', 'b'); let b: bool = Less('b', 'a'); //@dump-sem-ir-end -// CHECK:STDOUT: --- less.carbon +// CHECK:STDOUT: --- less.carbon = $less // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/char_literal/less_eq.carbon b/toolchain/check/testdata/builtins/char_literal/less_eq.carbon index 86043f0f49f0..5cd2ffb01c8e 100644 --- a/toolchain/check/testdata/builtins/char_literal/less_eq.carbon +++ b/toolchain/check/testdata/builtins/char_literal/less_eq.carbon @@ -23,7 +23,7 @@ let b: bool = LessEq('a', 'b'); let c: bool = LessEq('b', 'a'); //@dump-sem-ir-end -// CHECK:STDOUT: --- less_eq.carbon +// CHECK:STDOUT: --- less_eq.carbon = $less_eq // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/char_literal/make_type.carbon b/toolchain/check/testdata/builtins/char_literal/make_type.carbon index 774ffe92e420..68d9cf45ffc3 100644 --- a/toolchain/check/testdata/builtins/char_literal/make_type.carbon +++ b/toolchain/check/testdata/builtins/char_literal/make_type.carbon @@ -29,7 +29,7 @@ let not_7_bit: CharLiteral = '\u{80}'; let not_8_bit: CharLiteral = '\u{1E15}'; //@dump-sem-ir-end -// CHECK:STDOUT: --- use_types.carbon +// CHECK:STDOUT: --- use_types.carbon = $use_types // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/char_literal/neq.carbon b/toolchain/check/testdata/builtins/char_literal/neq.carbon index 30b388be8581..1ca1e75e7565 100644 --- a/toolchain/check/testdata/builtins/char_literal/neq.carbon +++ b/toolchain/check/testdata/builtins/char_literal/neq.carbon @@ -22,7 +22,7 @@ let a: bool = Neq('a', 'b'); let b: bool = Neq('a', 'a'); //@dump-sem-ir-end -// CHECK:STDOUT: --- neq.carbon +// CHECK:STDOUT: --- neq.carbon = $neq // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/char_literal/sub_char.carbon b/toolchain/check/testdata/builtins/char_literal/sub_char.carbon index 39d1d60616f7..aed426d759fb 100644 --- a/toolchain/check/testdata/builtins/char_literal/sub_char.carbon +++ b/toolchain/check/testdata/builtins/char_literal/sub_char.carbon @@ -29,7 +29,7 @@ let max: i32 = SubCharCharToI32('\u{10FFFF}', '\u{0}'); let min: i32 = SubCharCharToI32('\u{0}', '\u{10FFFF}'); //@dump-sem-ir-end -// CHECK:STDOUT: --- sub_char.carbon +// CHECK:STDOUT: --- sub_char.carbon = $sub_char // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/char_literal/sub_int.carbon b/toolchain/check/testdata/builtins/char_literal/sub_int.carbon index 16cdf122a595..cc2f8599df8b 100644 --- a/toolchain/check/testdata/builtins/char_literal/sub_int.carbon +++ b/toolchain/check/testdata/builtins/char_literal/sub_int.carbon @@ -62,7 +62,7 @@ let a: CharLiteral = SubCharInt('\u{0000}', 1); // CHECK:STDERR: let b: CharLiteral = SubCharInt('\u{10FFFF}', Negate(1)); -// CHECK:STDOUT: --- success.carbon +// CHECK:STDOUT: --- success.carbon = $success // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/float/add.carbon b/toolchain/check/testdata/builtins/float/add.carbon index 7d7493a55652..5b15adeb09a3 100644 --- a/toolchain/check/testdata/builtins/float/add.carbon +++ b/toolchain/check/testdata/builtins/float/add.carbon @@ -66,7 +66,7 @@ fn RuntimeCallIsValidBadReturnType(a: f64, b: f64) -> bool { return BadReturnType(a, b); } -// CHECK:STDOUT: --- float_add.carbon +// CHECK:STDOUT: --- float_add.carbon = $float_add // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/float/convert.carbon b/toolchain/check/testdata/builtins/float/convert.carbon index 6b9c14e5d85e..42ae37834d53 100644 --- a/toolchain/check/testdata/builtins/float/convert.carbon +++ b/toolchain/check/testdata/builtins/float/convert.carbon @@ -119,7 +119,7 @@ let a: f64 = Float32ToFloat64(1.0); let b: f64 = Float32ToFloat64(1.0e30); //@dump-sem-ir-end -// CHECK:STDOUT: --- identity_literal.carbon +// CHECK:STDOUT: --- identity_literal.carbon = $identity_literal // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -153,7 +153,7 @@ let b: f64 = Float32ToFloat64(1.0e30); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- literal_f64.carbon +// CHECK:STDOUT: --- literal_f64.carbon = $literal_f64 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -228,7 +228,7 @@ let b: f64 = Float32ToFloat64(1.0e30); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- literal_f32.carbon +// CHECK:STDOUT: --- literal_f32.carbon = $literal_f32 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -303,7 +303,7 @@ let b: f64 = Float32ToFloat64(1.0e30); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- identity_f64.carbon +// CHECK:STDOUT: --- identity_f64.carbon = $identity_f64 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -405,7 +405,7 @@ let b: f64 = Float32ToFloat64(1.0e30); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- identity_f32.carbon +// CHECK:STDOUT: --- identity_f32.carbon = $identity_f32 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -507,7 +507,7 @@ let b: f64 = Float32ToFloat64(1.0e30); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- truncate.carbon +// CHECK:STDOUT: --- truncate.carbon = $truncate // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -591,7 +591,7 @@ let b: f64 = Float32ToFloat64(1.0e30); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- extend.carbon +// CHECK:STDOUT: --- extend.carbon = $extend // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/float/convert_checked.carbon b/toolchain/check/testdata/builtins/float/convert_checked.carbon index 2c0957e356e4..bd045463ec71 100644 --- a/toolchain/check/testdata/builtins/float/convert_checked.carbon +++ b/toolchain/check/testdata/builtins/float/convert_checked.carbon @@ -171,7 +171,7 @@ let not_constant_64: f64 = 0.0; let convert_not_constant: f64 = Float64ToFloat64(not_constant_64); //@dump-sem-ir-end -// CHECK:STDOUT: --- identity_literal.carbon +// CHECK:STDOUT: --- identity_literal.carbon = $identity_literal // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -205,7 +205,7 @@ let convert_not_constant: f64 = Float64ToFloat64(not_constant_64); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- literal_f64.carbon +// CHECK:STDOUT: --- literal_f64.carbon = $literal_f64 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -267,7 +267,7 @@ let convert_not_constant: f64 = Float64ToFloat64(not_constant_64); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- literal_f32.carbon +// CHECK:STDOUT: --- literal_f32.carbon = $literal_f32 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -329,7 +329,7 @@ let convert_not_constant: f64 = Float64ToFloat64(not_constant_64); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- identity_f64.carbon +// CHECK:STDOUT: --- identity_f64.carbon = $identity_f64 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -431,7 +431,7 @@ let convert_not_constant: f64 = Float64ToFloat64(not_constant_64); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- identity_f32.carbon +// CHECK:STDOUT: --- identity_f32.carbon = $identity_f32 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -533,7 +533,7 @@ let convert_not_constant: f64 = Float64ToFloat64(not_constant_64); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- truncate.carbon +// CHECK:STDOUT: --- truncate.carbon = $truncate // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -594,7 +594,7 @@ let convert_not_constant: f64 = Float64ToFloat64(not_constant_64); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_truncate_overflow.carbon +// CHECK:STDOUT: --- fail_truncate_overflow.carbon = $fail_truncate_overflow // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -685,7 +685,7 @@ let convert_not_constant: f64 = Float64ToFloat64(not_constant_64); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- extend.carbon +// CHECK:STDOUT: --- extend.carbon = $extend // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -769,7 +769,7 @@ let convert_not_constant: f64 = Float64ToFloat64(not_constant_64); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_not_constant.carbon +// CHECK:STDOUT: --- fail_not_constant.carbon = $fail_not_constant // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/float/convert_int.carbon b/toolchain/check/testdata/builtins/float/convert_int.carbon index dca61222b2bf..875f4fafedfb 100644 --- a/toolchain/check/testdata/builtins/float/convert_int.carbon +++ b/toolchain/check/testdata/builtins/float/convert_int.carbon @@ -296,7 +296,7 @@ let nan_val: i32 = ConvertF64ToI32(Div(0.0, 0.0)); let inf_val: i32 = ConvertF64ToI32(Div(1.0, 0.0)); //@dump-sem-ir-end -// CHECK:STDOUT: --- fail_overflow.carbon +// CHECK:STDOUT: --- fail_overflow.carbon = $fail_overflow // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -596,7 +596,7 @@ let inf_val: i32 = ConvertF64ToI32(Div(1.0, 0.0)); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_nan_inf.carbon +// CHECK:STDOUT: --- fail_nan_inf.carbon = $fail_nan_inf // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/float/div.carbon b/toolchain/check/testdata/builtins/float/div.carbon index 9dc5f22b3b5c..bbe9a26d8903 100644 --- a/toolchain/check/testdata/builtins/float/div.carbon +++ b/toolchain/check/testdata/builtins/float/div.carbon @@ -91,7 +91,7 @@ fn Literal() -> type = "float_literal.make_type"; // CHECK:STDERR: fn DivLiteral(a: Literal(), b: Literal()) -> Literal() = "float.div"; -// CHECK:STDOUT: --- float_div.carbon +// CHECK:STDOUT: --- float_div.carbon = $float_div // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/float/eq.carbon b/toolchain/check/testdata/builtins/float/eq.carbon index 5e857e036c65..942adf8b5c69 100644 --- a/toolchain/check/testdata/builtins/float/eq.carbon +++ b/toolchain/check/testdata/builtins/float/eq.carbon @@ -54,7 +54,7 @@ library "[[@TEST_NAME]]"; // CHECK:STDERR: fn Eq(a: Core.FloatLiteral, b: Core.FloatLiteral) -> bool = "float.eq"; -// CHECK:STDOUT: --- float_eq.carbon +// CHECK:STDOUT: --- float_eq.carbon = $float_eq // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/float/greater.carbon b/toolchain/check/testdata/builtins/float/greater.carbon index 041e1a98d01b..5582b8c004e5 100644 --- a/toolchain/check/testdata/builtins/float/greater.carbon +++ b/toolchain/check/testdata/builtins/float/greater.carbon @@ -32,7 +32,7 @@ fn RuntimeCallIsValid(a: f64, b: f64) -> bool { //@dump-sem-ir-end } -// CHECK:STDOUT: --- float_greater.carbon +// CHECK:STDOUT: --- float_greater.carbon = $float_greater // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/float/greater_eq.carbon b/toolchain/check/testdata/builtins/float/greater_eq.carbon index 291dc5bd465b..f8e8e2f0ae1a 100644 --- a/toolchain/check/testdata/builtins/float/greater_eq.carbon +++ b/toolchain/check/testdata/builtins/float/greater_eq.carbon @@ -32,7 +32,7 @@ fn RuntimeCallIsValid(a: f64, b: f64) -> bool { //@dump-sem-ir-end } -// CHECK:STDOUT: --- float_greater_eq.carbon +// CHECK:STDOUT: --- float_greater_eq.carbon = $float_greater_eq // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/float/less.carbon b/toolchain/check/testdata/builtins/float/less.carbon index b44f12ea6781..be2fa4b11696 100644 --- a/toolchain/check/testdata/builtins/float/less.carbon +++ b/toolchain/check/testdata/builtins/float/less.carbon @@ -32,7 +32,7 @@ fn RuntimeCallIsValid(a: f64, b: f64) -> bool { //@dump-sem-ir-end } -// CHECK:STDOUT: --- float_less.carbon +// CHECK:STDOUT: --- float_less.carbon = $float_less // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/float/less_eq.carbon b/toolchain/check/testdata/builtins/float/less_eq.carbon index f792db3bcd74..e5237fa175b8 100644 --- a/toolchain/check/testdata/builtins/float/less_eq.carbon +++ b/toolchain/check/testdata/builtins/float/less_eq.carbon @@ -45,7 +45,7 @@ library "[[@TEST_NAME]]"; // CHECK:STDERR: fn LessEq(a: Core.FloatLiteral, b: Core.FloatLiteral) -> bool = "float.less_eq"; -// CHECK:STDOUT: --- float_less_eq.carbon +// CHECK:STDOUT: --- float_less_eq.carbon = $float_less_eq // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/float/make_type.carbon b/toolchain/check/testdata/builtins/float/make_type.carbon index 76520710e6f1..6f365d7e7fde 100644 --- a/toolchain/check/testdata/builtins/float/make_type.carbon +++ b/toolchain/check/testdata/builtins/float/make_type.carbon @@ -64,7 +64,7 @@ var dyn_size: i32 = 64; // CHECK:STDERR: var dyn: Float(dyn_size); -// CHECK:STDOUT: --- use_types.carbon +// CHECK:STDOUT: --- use_types.carbon = $use_types // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/float/mul.carbon b/toolchain/check/testdata/builtins/float/mul.carbon index 6bd45028df32..2d85c1150fed 100644 --- a/toolchain/check/testdata/builtins/float/mul.carbon +++ b/toolchain/check/testdata/builtins/float/mul.carbon @@ -89,7 +89,7 @@ fn Literal() -> type = "float_literal.make_type"; // CHECK:STDERR: fn MulLiteral(a: Literal(), b: Literal()) -> Literal() = "float.mul"; -// CHECK:STDOUT: --- mul_sub.carbon +// CHECK:STDOUT: --- mul_sub.carbon = $mul_sub // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/float/negate.carbon b/toolchain/check/testdata/builtins/float/negate.carbon index 98ce1a852f0c..064fa5f9cd3e 100644 --- a/toolchain/check/testdata/builtins/float/negate.carbon +++ b/toolchain/check/testdata/builtins/float/negate.carbon @@ -75,7 +75,7 @@ fn RuntimeCallIsValidBadReturnType(a: f64) -> bool { return BadReturnType(a); } -// CHECK:STDOUT: --- float_negate.carbon +// CHECK:STDOUT: --- float_negate.carbon = $float_negate // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/float/neq.carbon b/toolchain/check/testdata/builtins/float/neq.carbon index 0bf1ceb97494..f60a042ab86b 100644 --- a/toolchain/check/testdata/builtins/float/neq.carbon +++ b/toolchain/check/testdata/builtins/float/neq.carbon @@ -43,7 +43,7 @@ library "[[@TEST_NAME]]"; // CHECK:STDERR: fn WrongResult(a: f64, b: f64) -> f64 = "float.neq"; -// CHECK:STDOUT: --- float_neq.carbon +// CHECK:STDOUT: --- float_neq.carbon = $float_neq // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/float/sub.carbon b/toolchain/check/testdata/builtins/float/sub.carbon index 99766824ab05..aaf6d0e46cf9 100644 --- a/toolchain/check/testdata/builtins/float/sub.carbon +++ b/toolchain/check/testdata/builtins/float/sub.carbon @@ -75,7 +75,7 @@ fn RuntimeCallIsValidBadReturnType(a: f64, b: f64) -> bool { return BadReturnType(a, b); } -// CHECK:STDOUT: --- float_sub.carbon +// CHECK:STDOUT: --- float_sub.carbon = $float_sub // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/float_literal/add.carbon b/toolchain/check/testdata/builtins/float_literal/add.carbon index 3a09058a1ace..b98218a18df6 100644 --- a/toolchain/check/testdata/builtins/float_literal/add.carbon +++ b/toolchain/check/testdata/builtins/float_literal/add.carbon @@ -53,7 +53,7 @@ fn F(){ Add(0x1.0p1024000000000, 0.0000000000000000001); } -// CHECK:STDOUT: --- float_literal_add.carbon +// CHECK:STDOUT: --- float_literal_add.carbon = $float_literal_add // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/float_literal/make_type.carbon b/toolchain/check/testdata/builtins/float_literal/make_type.carbon index bde3e934b428..be5113eb58a5 100644 --- a/toolchain/check/testdata/builtins/float_literal/make_type.carbon +++ b/toolchain/check/testdata/builtins/float_literal/make_type.carbon @@ -27,7 +27,7 @@ import library "types"; let f: FloatLiteral = 1.0; //@dump-sem-ir-end -// CHECK:STDOUT: --- use_types.carbon +// CHECK:STDOUT: --- use_types.carbon = $use_types // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/float_literal/negate.carbon b/toolchain/check/testdata/builtins/float_literal/negate.carbon index 202a0eeb798f..6f1e09f5b9c2 100644 --- a/toolchain/check/testdata/builtins/float_literal/negate.carbon +++ b/toolchain/check/testdata/builtins/float_literal/negate.carbon @@ -28,7 +28,7 @@ let v5: Core.FloatLiteral = Negate(0.0); let v6: Core.FloatLiteral = Negate(Negate(0.0)); //@dump-sem-ir-end -// CHECK:STDOUT: --- negate.carbon +// CHECK:STDOUT: --- negate.carbon = $negate // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/float_literal/sub.carbon b/toolchain/check/testdata/builtins/float_literal/sub.carbon index 546e4bd618de..db3099477028 100644 --- a/toolchain/check/testdata/builtins/float_literal/sub.carbon +++ b/toolchain/check/testdata/builtins/float_literal/sub.carbon @@ -56,7 +56,7 @@ fn Sub(a: Core.FloatLiteral, b: Core.FloatLiteral) -> Core.FloatLiteral = "float // CHECK:STDERR: let v1: Core.FloatLiteral = Sub(0x1.0p1024000000000, 0.0000000000000000001); -// CHECK:STDOUT: --- float_literal_sub.carbon +// CHECK:STDOUT: --- float_literal_sub.carbon = $float_literal_sub // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/form/make_type.carbon b/toolchain/check/testdata/builtins/form/make_type.carbon index ed05ec225b25..c711abbb3630 100644 --- a/toolchain/check/testdata/builtins/form/make_type.carbon +++ b/toolchain/check/testdata/builtins/form/make_type.carbon @@ -27,7 +27,7 @@ import library "types"; let f: Form = form(var ()); //@dump-sem-ir-end -// CHECK:STDOUT: --- use_types.carbon +// CHECK:STDOUT: --- use_types.carbon = $use_types // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/add_char_literal.carbon b/toolchain/check/testdata/builtins/int/add_char_literal.carbon index 4dc8d7d7e34d..52548cbba5f1 100644 --- a/toolchain/check/testdata/builtins/int/add_char_literal.carbon +++ b/toolchain/check/testdata/builtins/int/add_char_literal.carbon @@ -88,7 +88,7 @@ let b: CharLiteral = AddIntChar(1, '\u{D7FF}'); // CHECK:STDERR: let c: CharLiteral = AddIntChar(Negate(98), 'a'); -// CHECK:STDOUT: --- success.carbon +// CHECK:STDOUT: --- success.carbon = $success // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/and.carbon b/toolchain/check/testdata/builtins/int/and.carbon index 7c0b1c161410..16044827c271 100644 --- a/toolchain/check/testdata/builtins/int/and.carbon +++ b/toolchain/check/testdata/builtins/int/and.carbon @@ -155,7 +155,7 @@ fn Test(n: Core.IntLiteral) { And(n, n); } -// CHECK:STDOUT: --- int_and.carbon +// CHECK:STDOUT: --- int_and.carbon = $int_and // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/and_assign.carbon b/toolchain/check/testdata/builtins/int/and_assign.carbon index fc0d332d82dd..b5750444383d 100644 --- a/toolchain/check/testdata/builtins/int/and_assign.carbon +++ b/toolchain/check/testdata/builtins/int/and_assign.carbon @@ -63,7 +63,7 @@ fn NotRef(a: i32, b: i32) = "int.and_assign"; // CHECK:STDERR: fn MixedTypes(ref a: i32, b: i64) = "int.and_assign"; -// CHECK:STDOUT: --- call.carbon +// CHECK:STDOUT: --- call.carbon = $call // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/complement.carbon b/toolchain/check/testdata/builtins/int/complement.carbon index 94be4ca1c134..b8126d24ef5c 100644 --- a/toolchain/check/testdata/builtins/int/complement.carbon +++ b/toolchain/check/testdata/builtins/int/complement.carbon @@ -67,7 +67,7 @@ fn F(a: Core.IntLiteral) -> Core.IntLiteral { return Complement(a); } -// CHECK:STDOUT: --- int_complement.carbon +// CHECK:STDOUT: --- int_complement.carbon = $int_complement // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/convert.carbon b/toolchain/check/testdata/builtins/int/convert.carbon index f85d310773df..caba918ea1e9 100644 --- a/toolchain/check/testdata/builtins/int/convert.carbon +++ b/toolchain/check/testdata/builtins/int/convert.carbon @@ -296,7 +296,7 @@ fn F() { } -// CHECK:STDOUT: --- runtime_call.carbon +// CHECK:STDOUT: --- runtime_call.carbon = $runtime_call // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/convert_char_literal.carbon b/toolchain/check/testdata/builtins/int/convert_char_literal.carbon index 4a01668beff3..1af2e93074ce 100644 --- a/toolchain/check/testdata/builtins/int/convert_char_literal.carbon +++ b/toolchain/check/testdata/builtins/int/convert_char_literal.carbon @@ -70,7 +70,7 @@ let b: CharLiteral = ConvertFromIntLiteral(0xD800); // CHECK:STDERR: let c: CharLiteral = ConvertFromIntLiteral(0x110000); -// CHECK:STDOUT: --- success.carbon +// CHECK:STDOUT: --- success.carbon = $success // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/convert_checked.carbon b/toolchain/check/testdata/builtins/int/convert_checked.carbon index 2574e5c7370a..531c6c29ac7a 100644 --- a/toolchain/check/testdata/builtins/int/convert_checked.carbon +++ b/toolchain/check/testdata/builtins/int/convert_checked.carbon @@ -312,7 +312,7 @@ let convert_not_constant_same: i32 = Int32ToInt32(not_constant); // CHECK:STDERR: let convert_not_constant_widen: i64 = Int32ToInt64(not_constant); -// CHECK:STDOUT: --- runtime_call.carbon +// CHECK:STDOUT: --- runtime_call.carbon = $runtime_call // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/convert_float.carbon b/toolchain/check/testdata/builtins/int/convert_float.carbon index 7f430509c4ae..8683810ae361 100644 --- a/toolchain/check/testdata/builtins/int/convert_float.carbon +++ b/toolchain/check/testdata/builtins/int/convert_float.carbon @@ -61,7 +61,7 @@ import library "int_to_float"; let overflow: f64 = ConvertIntLiteralToF64(1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000); //@dump-sem-ir-end -// CHECK:STDOUT: --- fail_overflow.carbon +// CHECK:STDOUT: --- fail_overflow.carbon = $fail_overflow // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/convert_float_checked.carbon b/toolchain/check/testdata/builtins/int/convert_float_checked.carbon index d336dfd7fbf5..60b11a788c5f 100644 --- a/toolchain/check/testdata/builtins/int/convert_float_checked.carbon +++ b/toolchain/check/testdata/builtins/int/convert_float_checked.carbon @@ -47,7 +47,7 @@ import library "int_to_float_checked"; let lossy: f32 = ConvertIntLiteralToF32(123456789); //@dump-sem-ir-end -// CHECK:STDOUT: --- fail_lossy.carbon +// CHECK:STDOUT: --- fail_lossy.carbon = $fail_lossy // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/eq.carbon b/toolchain/check/testdata/builtins/int/eq.carbon index b6a9e53371c8..019ff59f0297 100644 --- a/toolchain/check/testdata/builtins/int/eq.carbon +++ b/toolchain/check/testdata/builtins/int/eq.carbon @@ -125,7 +125,7 @@ fn Test(n: Core.IntLiteral) { Eq(n, n); } -// CHECK:STDOUT: --- int_eq.carbon +// CHECK:STDOUT: --- int_eq.carbon = $int_eq // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/greater.carbon b/toolchain/check/testdata/builtins/int/greater.carbon index 73a744a42d8e..91de2b0303cc 100644 --- a/toolchain/check/testdata/builtins/int/greater.carbon +++ b/toolchain/check/testdata/builtins/int/greater.carbon @@ -32,7 +32,7 @@ fn RuntimeCallIsValid(a: i32, b: i32) -> bool { //@dump-sem-ir-end } -// CHECK:STDOUT: --- int_greater.carbon +// CHECK:STDOUT: --- int_greater.carbon = $int_greater // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/greater_eq.carbon b/toolchain/check/testdata/builtins/int/greater_eq.carbon index 8c75bb9870ce..b9f87941da12 100644 --- a/toolchain/check/testdata/builtins/int/greater_eq.carbon +++ b/toolchain/check/testdata/builtins/int/greater_eq.carbon @@ -70,7 +70,7 @@ fn F() { Test(GreaterEq(1, -1)) as Expect(true); } -// CHECK:STDOUT: --- int_greater_eq.carbon +// CHECK:STDOUT: --- int_greater_eq.carbon = $int_greater_eq // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/left_shift.carbon b/toolchain/check/testdata/builtins/int/left_shift.carbon index 0d8b35e8f754..cf5638ee90a6 100644 --- a/toolchain/check/testdata/builtins/int/left_shift.carbon +++ b/toolchain/check/testdata/builtins/int/left_shift.carbon @@ -289,7 +289,7 @@ let bad3: i32 = LeftShiftByLit(an_i32, 12); // CHECK:STDERR: let bad4: Core.IntLiteral = LeftShiftOfLit(12, an_i32); -// CHECK:STDOUT: --- i32.carbon +// CHECK:STDOUT: --- i32.carbon = $i32 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -308,7 +308,7 @@ let bad4: Core.IntLiteral = LeftShiftOfLit(12, an_i32); // CHECK:STDOUT: return %LeftShift.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- u32.carbon +// CHECK:STDOUT: --- u32.carbon = $u32 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/left_shift_assign.carbon b/toolchain/check/testdata/builtins/int/left_shift_assign.carbon index f41fb0b5fca4..9638cb721a0c 100644 --- a/toolchain/check/testdata/builtins/int/left_shift_assign.carbon +++ b/toolchain/check/testdata/builtins/int/left_shift_assign.carbon @@ -56,7 +56,7 @@ library "[[@TEST_NAME]]"; // CHECK:STDERR: fn NotRef(a: i32, b: i32) = "int.left_shift_assign"; -// CHECK:STDOUT: --- call.carbon +// CHECK:STDOUT: --- call.carbon = $call // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/less.carbon b/toolchain/check/testdata/builtins/int/less.carbon index 9999de790a50..ca4a3dd427a2 100644 --- a/toolchain/check/testdata/builtins/int/less.carbon +++ b/toolchain/check/testdata/builtins/int/less.carbon @@ -32,7 +32,7 @@ fn RuntimeCallIsValid(a: i32, b: i32) -> bool { //@dump-sem-ir-end } -// CHECK:STDOUT: --- int_less.carbon +// CHECK:STDOUT: --- int_less.carbon = $int_less // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/less_eq.carbon b/toolchain/check/testdata/builtins/int/less_eq.carbon index 01f458215183..c93068cd2c6b 100644 --- a/toolchain/check/testdata/builtins/int/less_eq.carbon +++ b/toolchain/check/testdata/builtins/int/less_eq.carbon @@ -120,7 +120,7 @@ fn Test(n: Core.IntLiteral) { LessEq(n, n); } -// CHECK:STDOUT: --- int_less_eq.carbon +// CHECK:STDOUT: --- int_less_eq.carbon = $int_less_eq // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/make_type_signed.carbon b/toolchain/check/testdata/builtins/int/make_type_signed.carbon index bb2e68b3c341..1d8053d037ca 100644 --- a/toolchain/check/testdata/builtins/int/make_type_signed.carbon +++ b/toolchain/check/testdata/builtins/int/make_type_signed.carbon @@ -113,7 +113,7 @@ import library "types"; // CHECK:STDERR: var m: Int(1000000000); -// CHECK:STDOUT: --- use_types.carbon +// CHECK:STDOUT: --- use_types.carbon = $use_types // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/make_type_unsigned.carbon b/toolchain/check/testdata/builtins/int/make_type_unsigned.carbon index f2e9aa33a3a2..448ef52b07d6 100644 --- a/toolchain/check/testdata/builtins/int/make_type_unsigned.carbon +++ b/toolchain/check/testdata/builtins/int/make_type_unsigned.carbon @@ -95,7 +95,7 @@ import library "types"; // CHECK:STDERR: var m: UInt(1000000000); -// CHECK:STDOUT: --- use_types.carbon +// CHECK:STDOUT: --- use_types.carbon = $use_types // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/neq.carbon b/toolchain/check/testdata/builtins/int/neq.carbon index 9648ded38e79..c35c219ba8b7 100644 --- a/toolchain/check/testdata/builtins/int/neq.carbon +++ b/toolchain/check/testdata/builtins/int/neq.carbon @@ -28,7 +28,7 @@ fn RuntimeCallIsValid(a: i32, b: i32) -> bool { //@dump-sem-ir-end } -// CHECK:STDOUT: --- int_neq.carbon +// CHECK:STDOUT: --- int_neq.carbon = $int_neq // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/or.carbon b/toolchain/check/testdata/builtins/int/or.carbon index 2a744e8147c9..998a27ecba65 100644 --- a/toolchain/check/testdata/builtins/int/or.carbon +++ b/toolchain/check/testdata/builtins/int/or.carbon @@ -23,7 +23,7 @@ fn RuntimeCallIsValid(a: i32, b: i32) -> i32 { //@dump-sem-ir-end } -// CHECK:STDOUT: --- int_or.carbon +// CHECK:STDOUT: --- int_or.carbon = $int_or // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/or_assign.carbon b/toolchain/check/testdata/builtins/int/or_assign.carbon index ffd2c4cc839e..b1aab9de2c4a 100644 --- a/toolchain/check/testdata/builtins/int/or_assign.carbon +++ b/toolchain/check/testdata/builtins/int/or_assign.carbon @@ -57,7 +57,7 @@ fn NotRef(a: i32, b: i32) = "int.or_assign"; // CHECK:STDERR: fn MixedTypes(ref a: i32, b: i64) = "int.or_assign"; -// CHECK:STDOUT: --- call.carbon +// CHECK:STDOUT: --- call.carbon = $call // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/right_shift.carbon b/toolchain/check/testdata/builtins/int/right_shift.carbon index b2077a0847b3..09e77d837c2c 100644 --- a/toolchain/check/testdata/builtins/int/right_shift.carbon +++ b/toolchain/check/testdata/builtins/int/right_shift.carbon @@ -153,7 +153,7 @@ let negative_lit: Core.IntLiteral = RightShiftLit(1, -1); // CHECK:STDERR: let negative_lit_zero: Core.IntLiteral = RightShiftLit(0, -1); -// CHECK:STDOUT: --- i32.carbon +// CHECK:STDOUT: --- i32.carbon = $i32 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -172,7 +172,7 @@ let negative_lit_zero: Core.IntLiteral = RightShiftLit(0, -1); // CHECK:STDOUT: return %RightShift.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- u32.carbon +// CHECK:STDOUT: --- u32.carbon = $u32 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/right_shift_assign.carbon b/toolchain/check/testdata/builtins/int/right_shift_assign.carbon index 2e5cce58e1c1..fd382a5eb188 100644 --- a/toolchain/check/testdata/builtins/int/right_shift_assign.carbon +++ b/toolchain/check/testdata/builtins/int/right_shift_assign.carbon @@ -56,7 +56,7 @@ library "[[@TEST_NAME]]"; // CHECK:STDERR: fn NotRef(a: i32, b: i32) = "int.right_shift_assign"; -// CHECK:STDOUT: --- call.carbon +// CHECK:STDOUT: --- call.carbon = $call // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/sadd.carbon b/toolchain/check/testdata/builtins/int/sadd.carbon index 85cce2909da9..c778f6dd4aca 100644 --- a/toolchain/check/testdata/builtins/int/sadd.carbon +++ b/toolchain/check/testdata/builtins/int/sadd.carbon @@ -195,7 +195,7 @@ let a: i32 = Add(0x7FFFFFFF, 0); // CHECK:STDERR: let b: i32 = Add(0x7FFFFFFF, 1); -// CHECK:STDOUT: --- i32.carbon +// CHECK:STDOUT: --- i32.carbon = $i32 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/sdiv.carbon b/toolchain/check/testdata/builtins/int/sdiv.carbon index dbb1ab52684f..45e34be929cf 100644 --- a/toolchain/check/testdata/builtins/int/sdiv.carbon +++ b/toolchain/check/testdata/builtins/int/sdiv.carbon @@ -105,7 +105,7 @@ let c: Core.IntLiteral = DivLit(1, 0); // CHECK:STDERR: let d: Core.IntLiteral = DivLit(0, 0); -// CHECK:STDOUT: --- int_div.carbon +// CHECK:STDOUT: --- int_div.carbon = $int_div // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/sdiv_assign.carbon b/toolchain/check/testdata/builtins/int/sdiv_assign.carbon index 6d9b882538bf..74d8d367bd1f 100644 --- a/toolchain/check/testdata/builtins/int/sdiv_assign.carbon +++ b/toolchain/check/testdata/builtins/int/sdiv_assign.carbon @@ -57,7 +57,7 @@ fn NotRef(a: i32, b: i32) = "int.sdiv_assign"; // CHECK:STDERR: fn MixedTypes(ref a: i32, b: i64) = "int.sdiv_assign"; -// CHECK:STDOUT: --- call.carbon +// CHECK:STDOUT: --- call.carbon = $call // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/smod.carbon b/toolchain/check/testdata/builtins/int/smod.carbon index a66e7428dfa7..f8bab01cecaa 100644 --- a/toolchain/check/testdata/builtins/int/smod.carbon +++ b/toolchain/check/testdata/builtins/int/smod.carbon @@ -74,7 +74,7 @@ let a: i32 = Mod(1, 0); // CHECK:STDERR: let b: i32 = Mod(0, 0); -// CHECK:STDOUT: --- int_div.carbon +// CHECK:STDOUT: --- int_div.carbon = $int_div // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/smod_assign.carbon b/toolchain/check/testdata/builtins/int/smod_assign.carbon index c4cfc4f300f3..17af4ed4d191 100644 --- a/toolchain/check/testdata/builtins/int/smod_assign.carbon +++ b/toolchain/check/testdata/builtins/int/smod_assign.carbon @@ -57,7 +57,7 @@ fn NotRef(a: i32, b: i32) = "int.smod_assign"; // CHECK:STDERR: fn MixedTypes(ref a: i32, b: i64) = "int.smod_assign"; -// CHECK:STDOUT: --- call.carbon +// CHECK:STDOUT: --- call.carbon = $call // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/smul.carbon b/toolchain/check/testdata/builtins/int/smul.carbon index 14ec3a68a73f..1d0b61f5c992 100644 --- a/toolchain/check/testdata/builtins/int/smul.carbon +++ b/toolchain/check/testdata/builtins/int/smul.carbon @@ -77,7 +77,7 @@ let a: i32 = Mul(0x7FFF, 0x10000); // CHECK:STDERR: let b: i32 = Mul(0x8000, 0x10000); -// CHECK:STDOUT: --- i32.carbon +// CHECK:STDOUT: --- i32.carbon = $i32 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/smul_assign.carbon b/toolchain/check/testdata/builtins/int/smul_assign.carbon index 3b5621a084bf..80e58f87db7e 100644 --- a/toolchain/check/testdata/builtins/int/smul_assign.carbon +++ b/toolchain/check/testdata/builtins/int/smul_assign.carbon @@ -57,7 +57,7 @@ fn NotRef(a: i32, b: i32) = "int.smul_assign"; // CHECK:STDERR: fn MixedTypes(ref a: i32, b: i64) = "int.smul_assign"; -// CHECK:STDOUT: --- call.carbon +// CHECK:STDOUT: --- call.carbon = $call // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/snegate.carbon b/toolchain/check/testdata/builtins/int/snegate.carbon index 29db3459847e..d7a95c0e62f9 100644 --- a/toolchain/check/testdata/builtins/int/snegate.carbon +++ b/toolchain/check/testdata/builtins/int/snegate.carbon @@ -161,7 +161,7 @@ let a: i32 = Negate(Negate(0x7FFF_FFFF)); // CHECK:STDERR: let b: i32 = Negate(-0x8000_0000); -// CHECK:STDOUT: --- int_negate.carbon +// CHECK:STDOUT: --- int_negate.carbon = $int_negate // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/ssub.carbon b/toolchain/check/testdata/builtins/int/ssub.carbon index b0de98e92459..59b227d36a25 100644 --- a/toolchain/check/testdata/builtins/int/ssub.carbon +++ b/toolchain/check/testdata/builtins/int/ssub.carbon @@ -42,7 +42,7 @@ let b: i32 = Sub(Sub(0, 0x7FFFFFFF), 1); // CHECK:STDERR: let c: i32 = Sub(Sub(0, 0x7FFFFFFF), 2); -// CHECK:STDOUT: --- int_sub.carbon +// CHECK:STDOUT: --- int_sub.carbon = $int_sub // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/ssub_assign.carbon b/toolchain/check/testdata/builtins/int/ssub_assign.carbon index d23272ef2209..387779cb0f66 100644 --- a/toolchain/check/testdata/builtins/int/ssub_assign.carbon +++ b/toolchain/check/testdata/builtins/int/ssub_assign.carbon @@ -57,7 +57,7 @@ fn NotRef(a: i32, b: i32) = "int.ssub_assign"; // CHECK:STDERR: fn MixedTypes(ref a: i32, b: i64) = "int.ssub_assign"; -// CHECK:STDOUT: --- call.carbon +// CHECK:STDOUT: --- call.carbon = $call // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/uadd.carbon b/toolchain/check/testdata/builtins/int/uadd.carbon index f71eea896e33..7d32c1b539c4 100644 --- a/toolchain/check/testdata/builtins/int/uadd.carbon +++ b/toolchain/check/testdata/builtins/int/uadd.carbon @@ -133,7 +133,7 @@ fn Add(a: i32, b: i32) -> i32 = "int.uadd"; let a: i32 = Add(0x7FFFFFFF, 0); let b: i32 = Add(0x7FFFFFFF, 1); -// CHECK:STDOUT: --- int_add.carbon +// CHECK:STDOUT: --- int_add.carbon = $int_add // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/uadd_assign.carbon b/toolchain/check/testdata/builtins/int/uadd_assign.carbon index f5fe2ee89e4c..af1abdc0613d 100644 --- a/toolchain/check/testdata/builtins/int/uadd_assign.carbon +++ b/toolchain/check/testdata/builtins/int/uadd_assign.carbon @@ -57,7 +57,7 @@ fn NotRef(a: i32, b: i32) = "int.uadd_assign"; // CHECK:STDERR: fn MixedTypes(ref a: i32, b: i64) = "int.uadd_assign"; -// CHECK:STDOUT: --- call.carbon +// CHECK:STDOUT: --- call.carbon = $call // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/udiv.carbon b/toolchain/check/testdata/builtins/int/udiv.carbon index ce412926077a..64c25d93776c 100644 --- a/toolchain/check/testdata/builtins/int/udiv.carbon +++ b/toolchain/check/testdata/builtins/int/udiv.carbon @@ -64,7 +64,7 @@ let a: i32 = Div(1, 0); // CHECK:STDERR: let b: i32 = Div(0, 0); -// CHECK:STDOUT: --- int_div.carbon +// CHECK:STDOUT: --- int_div.carbon = $int_div // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/udiv_assign.carbon b/toolchain/check/testdata/builtins/int/udiv_assign.carbon index 061a64131bb3..b89be0a0a385 100644 --- a/toolchain/check/testdata/builtins/int/udiv_assign.carbon +++ b/toolchain/check/testdata/builtins/int/udiv_assign.carbon @@ -57,7 +57,7 @@ fn NotRef(a: i32, b: i32) = "int.udiv_assign"; // CHECK:STDERR: fn MixedTypes(ref a: i32, b: i64) = "int.udiv_assign"; -// CHECK:STDOUT: --- call.carbon +// CHECK:STDOUT: --- call.carbon = $call // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/umod.carbon b/toolchain/check/testdata/builtins/int/umod.carbon index 909e8955603b..5a986077ddb8 100644 --- a/toolchain/check/testdata/builtins/int/umod.carbon +++ b/toolchain/check/testdata/builtins/int/umod.carbon @@ -66,7 +66,7 @@ let a: i32 = Mod(1, 0); // CHECK:STDERR: let b: i32 = Mod(0, 0); -// CHECK:STDOUT: --- int_div.carbon +// CHECK:STDOUT: --- int_div.carbon = $int_div // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/umod_assign.carbon b/toolchain/check/testdata/builtins/int/umod_assign.carbon index 930bbf0d7050..0b46220d671e 100644 --- a/toolchain/check/testdata/builtins/int/umod_assign.carbon +++ b/toolchain/check/testdata/builtins/int/umod_assign.carbon @@ -57,7 +57,7 @@ fn NotRef(a: i32, b: i32) = "int.umod_assign"; // CHECK:STDERR: fn MixedTypes(ref a: i32, b: i64) = "int.umod_assign"; -// CHECK:STDOUT: --- call.carbon +// CHECK:STDOUT: --- call.carbon = $call // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/umul.carbon b/toolchain/check/testdata/builtins/int/umul.carbon index f4b1f82a86cf..e494424c3cb5 100644 --- a/toolchain/check/testdata/builtins/int/umul.carbon +++ b/toolchain/check/testdata/builtins/int/umul.carbon @@ -34,7 +34,7 @@ fn Mul(a: i32, b: i32) -> i32 = "int.umul"; let a: i32 = Mul(0x7FFF, 0x10000); let b: i32 = Mul(0x8000, 0x10000); -// CHECK:STDOUT: --- int_mul.carbon +// CHECK:STDOUT: --- int_mul.carbon = $int_mul // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/umul_assign.carbon b/toolchain/check/testdata/builtins/int/umul_assign.carbon index 6a80b8e5eebb..e30ce07db48f 100644 --- a/toolchain/check/testdata/builtins/int/umul_assign.carbon +++ b/toolchain/check/testdata/builtins/int/umul_assign.carbon @@ -57,7 +57,7 @@ fn NotRef(a: i32, b: i32) = "int.umul_assign"; // CHECK:STDERR: fn MixedTypes(ref a: i32, b: i64) = "int.umul_assign"; -// CHECK:STDOUT: --- call.carbon +// CHECK:STDOUT: --- call.carbon = $call // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/unegate.carbon b/toolchain/check/testdata/builtins/int/unegate.carbon index 65cc44be4f7d..78c8c18dd817 100644 --- a/toolchain/check/testdata/builtins/int/unegate.carbon +++ b/toolchain/check/testdata/builtins/int/unegate.carbon @@ -143,7 +143,7 @@ fn F() { Test(-(Negate(0x8000_0000))) as Expect(0x8000_0000); } -// CHECK:STDOUT: --- int_negate.carbon +// CHECK:STDOUT: --- int_negate.carbon = $int_negate // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/usub.carbon b/toolchain/check/testdata/builtins/int/usub.carbon index 0c1a60f3855f..221cbacb77ee 100644 --- a/toolchain/check/testdata/builtins/int/usub.carbon +++ b/toolchain/check/testdata/builtins/int/usub.carbon @@ -35,7 +35,7 @@ let a: i32 = Sub(0, 0x7FFFFFFF); let b: i32 = Sub(Sub(0, 0x7FFFFFFF), 1); let c: i32 = Sub(Sub(0, 0x7FFFFFFF), 2); -// CHECK:STDOUT: --- int_sub.carbon +// CHECK:STDOUT: --- int_sub.carbon = $int_sub // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/usub_assign.carbon b/toolchain/check/testdata/builtins/int/usub_assign.carbon index 5c89683abbcc..5cfaf8ce74f2 100644 --- a/toolchain/check/testdata/builtins/int/usub_assign.carbon +++ b/toolchain/check/testdata/builtins/int/usub_assign.carbon @@ -57,7 +57,7 @@ fn NotRef(a: i32, b: i32) = "int.usub_assign"; // CHECK:STDERR: fn MixedTypes(ref a: i32, b: i64) = "int.usub_assign"; -// CHECK:STDOUT: --- call.carbon +// CHECK:STDOUT: --- call.carbon = $call // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/xor.carbon b/toolchain/check/testdata/builtins/int/xor.carbon index f965fdc5edfc..8b51915158aa 100644 --- a/toolchain/check/testdata/builtins/int/xor.carbon +++ b/toolchain/check/testdata/builtins/int/xor.carbon @@ -23,7 +23,7 @@ fn RuntimeCallIsValid(a: i32, b: i32) -> i32 { //@dump-sem-ir-end } -// CHECK:STDOUT: --- int_xor.carbon +// CHECK:STDOUT: --- int_xor.carbon = $int_xor // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/int/xor_assign.carbon b/toolchain/check/testdata/builtins/int/xor_assign.carbon index 80c041ab47ca..83faba40576f 100644 --- a/toolchain/check/testdata/builtins/int/xor_assign.carbon +++ b/toolchain/check/testdata/builtins/int/xor_assign.carbon @@ -57,7 +57,7 @@ fn NotRef(a: i32, b: i32) = "int.xor_assign"; // CHECK:STDERR: fn MixedTypes(ref a: i32, b: i64) = "int.xor_assign"; -// CHECK:STDOUT: --- call.carbon +// CHECK:STDOUT: --- call.carbon = $call // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/maybe_unformed/make_type.carbon b/toolchain/check/testdata/builtins/maybe_unformed/make_type.carbon index 47fbc85de778..9894df8a344f 100644 --- a/toolchain/check/testdata/builtins/maybe_unformed/make_type.carbon +++ b/toolchain/check/testdata/builtins/maybe_unformed/make_type.carbon @@ -59,7 +59,7 @@ fn NoParam() -> type = "maybe_unformed.make_type"; // CHECK:STDERR: fn ColonBangParam(generic T: type) -> type = "maybe_unformed.make_type"; -// CHECK:STDOUT: --- use_types.carbon +// CHECK:STDOUT: --- use_types.carbon = $use_types // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -107,7 +107,7 @@ fn ColonBangParam(generic T: type) -> type = "maybe_unformed.make_type"; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- runtime_call.carbon +// CHECK:STDOUT: --- runtime_call.carbon = $runtime_call // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/no_op.carbon b/toolchain/check/testdata/builtins/no_op.carbon index 0f9dc0804875..8f067c41038e 100644 --- a/toolchain/check/testdata/builtins/no_op.carbon +++ b/toolchain/check/testdata/builtins/no_op.carbon @@ -69,7 +69,7 @@ library "[[@TEST_NAME]]"; // CHECK:STDERR: fn NoOp() -> {} = "no_op"; -// CHECK:STDOUT: --- no_op.carbon +// CHECK:STDOUT: --- no_op.carbon = $no_op // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -86,7 +86,7 @@ fn NoOp() -> {} = "no_op"; // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- explicit_return.carbon +// CHECK:STDOUT: --- explicit_return.carbon = $explicit_return // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -103,7 +103,7 @@ fn NoOp() -> {} = "no_op"; // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- ignore_args.carbon +// CHECK:STDOUT: --- ignore_args.carbon = $ignore_args // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -123,7 +123,7 @@ fn NoOp() -> {} = "no_op"; // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- assign.carbon +// CHECK:STDOUT: --- assign.carbon = $assign // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/pointer/is_null.carbon b/toolchain/check/testdata/builtins/pointer/is_null.carbon index 25f3a83df0d8..f0a7edb667c4 100644 --- a/toolchain/check/testdata/builtins/pointer/is_null.carbon +++ b/toolchain/check/testdata/builtins/pointer/is_null.carbon @@ -100,7 +100,7 @@ fn NoUnformed(p: {}*) -> bool = "pointer.is_null"; // CHECK:STDERR: fn NotPointer(p: MakeUnformed({})) -> bool = "pointer.is_null"; -// CHECK:STDOUT: --- call_exact.carbon +// CHECK:STDOUT: --- call_exact.carbon = $call_exact // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -195,7 +195,7 @@ fn NotPointer(p: MakeUnformed({})) -> bool = "pointer.is_null"; // CHECK:STDOUT: return %IsNullC.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- call_generic.carbon +// CHECK:STDOUT: --- call_generic.carbon = $call_generic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/pointer/make_null.carbon b/toolchain/check/testdata/builtins/pointer/make_null.carbon index 34fd66712629..ca5eeee29b36 100644 --- a/toolchain/check/testdata/builtins/pointer/make_null.carbon +++ b/toolchain/check/testdata/builtins/pointer/make_null.carbon @@ -72,7 +72,7 @@ fn NoUnformed() -> {}* = "pointer.make_null"; // CHECK:STDERR: fn NotPointer() -> MakeUnformed({}) = "pointer.make_null"; -// CHECK:STDOUT: --- call_exact.carbon +// CHECK:STDOUT: --- call_exact.carbon = $call_exact // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -136,7 +136,7 @@ fn NotPointer() -> MakeUnformed({}) = "pointer.make_null"; // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- call_generic.carbon +// CHECK:STDOUT: --- call_generic.carbon = $call_generic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/print/char.carbon b/toolchain/check/testdata/builtins/print/char.carbon index 77a384b5b0db..2a92913cf228 100644 --- a/toolchain/check/testdata/builtins/print/char.carbon +++ b/toolchain/check/testdata/builtins/print/char.carbon @@ -22,7 +22,7 @@ fn Main() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- char.carbon +// CHECK:STDOUT: --- char.carbon = $char.2 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/print/int.carbon b/toolchain/check/testdata/builtins/print/int.carbon index d438bab9fa89..8768be21e3ee 100644 --- a/toolchain/check/testdata/builtins/print/int.carbon +++ b/toolchain/check/testdata/builtins/print/int.carbon @@ -22,7 +22,7 @@ fn Main() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- int.carbon +// CHECK:STDOUT: --- int.carbon = $int.3 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/builtins/read/char.carbon b/toolchain/check/testdata/builtins/read/char.carbon index ffcd75b5f4d8..2e1faa326443 100644 --- a/toolchain/check/testdata/builtins/read/char.carbon +++ b/toolchain/check/testdata/builtins/read/char.carbon @@ -24,7 +24,7 @@ fn Main() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- char.carbon +// CHECK:STDOUT: --- char.carbon = $char.2 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/choice/basic.carbon b/toolchain/check/testdata/choice/basic.carbon index 702058a3837d..13c59a823414 100644 --- a/toolchain/check/testdata/choice/basic.carbon +++ b/toolchain/check/testdata/choice/basic.carbon @@ -76,7 +76,7 @@ choice Never {} // CHECK:STDERR: let never: Never = {}; -// CHECK:STDOUT: --- no_alternative.carbon +// CHECK:STDOUT: --- no_alternative.carbon = $no_alternative // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -98,7 +98,7 @@ let never: Never = {}; // CHECK:STDOUT: .Self = constants.%Never // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- one_alternative.carbon +// CHECK:STDOUT: --- one_alternative.carbon = $one_alternative // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -153,7 +153,7 @@ let never: Never = {}; // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- multiple_alternatives.carbon +// CHECK:STDOUT: --- multiple_alternatives.carbon = $multiple_alternatives // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/choice/generic.carbon b/toolchain/check/testdata/choice/generic.carbon index 3817d2dea0ba..d52c3707ed6c 100644 --- a/toolchain/check/testdata/choice/generic.carbon +++ b/toolchain/check/testdata/choice/generic.carbon @@ -16,7 +16,7 @@ choice Always(T: type) { } //@dump-sem-ir-end -// CHECK:STDOUT: --- generic.carbon +// CHECK:STDOUT: --- generic.carbon = $generic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/abstract/abstract.carbon b/toolchain/check/testdata/class/abstract/abstract.carbon index a51ae5fd1b92..f9724e3941c5 100644 --- a/toolchain/check/testdata/class/abstract/abstract.carbon +++ b/toolchain/check/testdata/class/abstract/abstract.carbon @@ -293,7 +293,7 @@ fn Assign(ref a: Abstract) { a = a; } -// CHECK:STDOUT: --- fail_abstract_field.carbon +// CHECK:STDOUT: --- fail_abstract_field.carbon = $fail_abstract_field // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -342,7 +342,7 @@ fn Assign(ref a: Abstract) { // CHECK:STDOUT: .a = %field_decl // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_abstract_var.carbon +// CHECK:STDOUT: --- fail_abstract_var.carbon = $fail_abstract_var // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -396,7 +396,7 @@ fn Assign(ref a: Abstract) { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_abstract_var_function_param.carbon +// CHECK:STDOUT: --- fail_abstract_var_function_param.carbon = $fail_abstract_var_function_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -445,7 +445,7 @@ fn Assign(ref a: Abstract) { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- abstract_let.carbon +// CHECK:STDOUT: --- abstract_let.carbon = $abstract_let // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -504,7 +504,7 @@ fn Assign(ref a: Abstract) { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_abstract_adapter.carbon +// CHECK:STDOUT: --- fail_abstract_adapter.carbon = $fail_abstract_adapter // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -551,7 +551,7 @@ fn Assign(ref a: Abstract) { // CHECK:STDOUT: .Abstract = // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- define_and_call_abstract_param.carbon +// CHECK:STDOUT: --- define_and_call_abstract_param.carbon = $define_and_call_abstract_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -622,7 +622,7 @@ fn Assign(ref a: Abstract) { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- return_nonabstract_derived.carbon +// CHECK:STDOUT: --- return_nonabstract_derived.carbon = $return_nonabstract_derived // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -721,7 +721,7 @@ fn Assign(ref a: Abstract) { // CHECK:STDOUT: return %.loc13_31 to %return.param // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_return_abstract.carbon +// CHECK:STDOUT: --- fail_return_abstract.carbon = $fail_return_abstract // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -809,7 +809,7 @@ fn Assign(ref a: Abstract) { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- access_abstract_subobject.carbon +// CHECK:STDOUT: --- access_abstract_subobject.carbon = $access_abstract_subobject // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -946,7 +946,7 @@ fn Assign(ref a: Abstract) { // CHECK:STDOUT: return %.loc18_13 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_abstract_let_temporary_struct_literal.carbon +// CHECK:STDOUT: --- fail_abstract_let_temporary_struct_literal.carbon = $fail_abstract_let_temporary_struct_literal // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1008,7 +1008,7 @@ fn Assign(ref a: Abstract) { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_abstract_let_temporary.carbon +// CHECK:STDOUT: --- fail_todo_abstract_let_temporary.carbon = $fail_todo_abstract_let_temporary // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1103,7 +1103,7 @@ fn Assign(ref a: Abstract) { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_call_abstract_return.carbon +// CHECK:STDOUT: --- fail_call_abstract_return.carbon = $fail_call_abstract_return // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1165,7 +1165,7 @@ fn Assign(ref a: Abstract) { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_assign_to_abstract_ref.carbon +// CHECK:STDOUT: --- fail_assign_to_abstract_ref.carbon = $fail_assign_to_abstract_ref // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 72fd723055c0..3d39d3b28c09 100644 --- a/toolchain/check/testdata/class/abstract/fail_abstract_in_struct.carbon +++ b/toolchain/check/testdata/class/abstract/fail_abstract_in_struct.carbon @@ -146,7 +146,7 @@ import library "lib"; // CHECK:STDERR: var v5: {.m: Abstract}; -// CHECK:STDOUT: --- fail_abstract_field.carbon +// CHECK:STDOUT: --- fail_abstract_field.carbon = $fail_abstract_field // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -188,7 +188,7 @@ var v5: {.m: Abstract}; // CHECK:STDOUT: .a = %field_decl // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_abstract_var.carbon +// CHECK:STDOUT: --- fail_abstract_var.carbon = $fail_abstract_var // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -230,7 +230,7 @@ var v5: {.m: Abstract}; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- abstract_let.carbon +// CHECK:STDOUT: --- abstract_let.carbon = $abstract_let // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -288,7 +288,7 @@ var v5: {.m: Abstract}; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_abstract_twice.carbon +// CHECK:STDOUT: --- fail_abstract_twice.carbon = $fail_abstract_twice // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -342,7 +342,7 @@ var v5: {.m: Abstract}; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_abstract_first.carbon +// CHECK:STDOUT: --- fail_abstract_first.carbon = $fail_abstract_first // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -388,7 +388,7 @@ var v5: {.m: Abstract}; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_abstract_second.carbon +// CHECK:STDOUT: --- fail_abstract_second.carbon = $fail_abstract_second // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -434,7 +434,7 @@ var v5: {.m: Abstract}; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- lib.carbon +// CHECK:STDOUT: --- lib.carbon = $lib // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -458,7 +458,7 @@ var v5: {.m: Abstract}; // CHECK:STDOUT: .Self = constants.%Abstract // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_import.carbon +// CHECK:STDOUT: --- fail_import.carbon = $fail_import // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 eb34b21bf8ef..7f53697033a0 100644 --- a/toolchain/check/testdata/class/abstract/fail_abstract_in_tuple.carbon +++ b/toolchain/check/testdata/class/abstract/fail_abstract_in_tuple.carbon @@ -156,7 +156,7 @@ fn Var5() { var unused v5: (Abstract,); } -// CHECK:STDOUT: --- fail_abstract_field.carbon +// CHECK:STDOUT: --- fail_abstract_field.carbon = $fail_abstract_field // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -210,7 +210,7 @@ fn Var5() { // CHECK:STDOUT: .a = %field_decl // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_abstract_var.carbon +// CHECK:STDOUT: --- fail_abstract_var.carbon = $fail_abstract_var // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -271,7 +271,7 @@ fn Var5() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- abstract_let.carbon +// CHECK:STDOUT: --- abstract_let.carbon = $abstract_let // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -341,7 +341,7 @@ fn Var5() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_abstract_twice.carbon +// CHECK:STDOUT: --- fail_abstract_twice.carbon = $fail_abstract_twice // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -414,7 +414,7 @@ fn Var5() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_abstract_first.carbon +// CHECK:STDOUT: --- fail_abstract_first.carbon = $fail_abstract_first // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -478,7 +478,7 @@ fn Var5() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_abstract_second.carbon +// CHECK:STDOUT: --- fail_abstract_second.carbon = $fail_abstract_second // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -542,7 +542,7 @@ fn Var5() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- lib.carbon +// CHECK:STDOUT: --- lib.carbon = $lib // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -575,7 +575,7 @@ fn Var5() { // CHECK:STDOUT: .Self = constants.%Abstract // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_import.carbon +// CHECK:STDOUT: --- fail_import.carbon = $fail_import // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/access/access_modifiers.carbon b/toolchain/check/testdata/class/access/access_modifiers.carbon index de5b0c6a0bb6..c947ee9eb033 100644 --- a/toolchain/check/testdata/class/access/access_modifiers.carbon +++ b/toolchain/check/testdata/class/access/access_modifiers.carbon @@ -218,7 +218,7 @@ class A { } } -// CHECK:STDOUT: --- fail_private_field_access.carbon +// CHECK:STDOUT: --- fail_private_field_access.carbon = $fail_private_field_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -376,7 +376,7 @@ class A { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_protected_field_access.carbon +// CHECK:STDOUT: --- fail_protected_field_access.carbon = $fail_protected_field_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -399,7 +399,7 @@ class A { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- instance_private_field_access_on_self.carbon +// CHECK:STDOUT: --- instance_private_field_access_on_self.carbon = $instance_private_field_access_on_self // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -461,7 +461,7 @@ class A { // CHECK:STDOUT: return %Circle.SomeInternalFunction.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- out_of_line_instance_private_field_access_on_self.carbon +// CHECK:STDOUT: --- out_of_line_instance_private_field_access_on_self.carbon = $out_of_line_instance_private_field_access_on_self // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -511,7 +511,7 @@ class A { // CHECK:STDOUT: return %Circle.SomeInternalFunction.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- public_global_access.carbon +// CHECK:STDOUT: --- public_global_access.carbon = $public_global_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -539,7 +539,7 @@ class A { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_global_access.carbon +// CHECK:STDOUT: --- fail_global_access.carbon = $fail_global_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -574,7 +574,7 @@ class A { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- self_access.carbon +// CHECK:STDOUT: --- self_access.carbon = $self_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/adapter/adapt.carbon b/toolchain/check/testdata/class/adapter/adapt.carbon index a24450dfebed..2a119ad2da5e 100644 --- a/toolchain/check/testdata/class/adapter/adapt.carbon +++ b/toolchain/check/testdata/class/adapter/adapt.carbon @@ -79,7 +79,7 @@ interface I { adapt i32; } -// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: --- basic.carbon = $basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -156,7 +156,7 @@ interface I { // CHECK:STDOUT: .Self = constants.%StructAdapter // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_not_extend.carbon +// CHECK:STDOUT: --- fail_not_extend.carbon = $fail_not_extend // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -231,7 +231,7 @@ interface I { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_misplaced.carbon +// CHECK:STDOUT: --- fail_misplaced.carbon = $fail_misplaced // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/adapter/adapt_copy.carbon b/toolchain/check/testdata/class/adapter/adapt_copy.carbon index 377a57d94ce8..9232e8904cec 100644 --- a/toolchain/check/testdata/class/adapter/adapt_copy.carbon +++ b/toolchain/check/testdata/class/adapter/adapt_copy.carbon @@ -186,7 +186,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { return d; } -// CHECK:STDOUT: --- fail_adapt_copyable.carbon +// CHECK:STDOUT: --- fail_adapt_copyable.carbon = $fail_adapt_copyable // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -409,7 +409,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- adapt_copyable_tuple.carbon +// CHECK:STDOUT: --- adapt_copyable_tuple.carbon = $adapt_copyable_tuple // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -796,7 +796,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_adapt_not_copyable.carbon +// CHECK:STDOUT: --- fail_adapt_not_copyable.carbon = $fail_adapt_not_copyable // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -918,7 +918,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc24_3.3(%self.param: ref %AdaptNoncopyable) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_adapt_not_copyable_indirect.carbon +// CHECK:STDOUT: --- fail_adapt_not_copyable_indirect.carbon = $fail_adapt_not_copyable_indirect // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1137,7 +1137,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc27_3.5(%self.param: ref %AdaptNoncopyableIndirect) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- adapt_copyable_struct.carbon +// CHECK:STDOUT: --- adapt_copyable_struct.carbon = $adapt_copyable_struct // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/adapter/extend_adapt.carbon b/toolchain/check/testdata/class/adapter/extend_adapt.carbon index d34874f66d22..84afd8a8fbcc 100644 --- a/toolchain/check/testdata/class/adapter/extend_adapt.carbon +++ b/toolchain/check/testdata/class/adapter/extend_adapt.carbon @@ -161,7 +161,7 @@ fn F(a: IntAdapter) -> i32 { return a.foo; } -// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: --- basic.carbon = $basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -292,7 +292,7 @@ fn F(a: IntAdapter) -> i32 { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_method_access.carbon +// CHECK:STDOUT: --- fail_todo_method_access.carbon = $fail_todo_method_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -386,7 +386,7 @@ fn F(a: IntAdapter) -> i32 { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_field_access.carbon +// CHECK:STDOUT: --- fail_todo_field_access.carbon = $fail_todo_field_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -487,7 +487,7 @@ fn F(a: IntAdapter) -> i32 { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_adapt_struct.carbon +// CHECK:STDOUT: --- fail_todo_adapt_struct.carbon = $fail_todo_adapt_struct // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -563,7 +563,7 @@ fn F(a: IntAdapter) -> i32 { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_adapt_tuple.carbon +// CHECK:STDOUT: --- fail_todo_adapt_tuple.carbon = $fail_todo_adapt_tuple // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -642,7 +642,7 @@ fn F(a: IntAdapter) -> i32 { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_adapt_builtin.carbon +// CHECK:STDOUT: --- fail_adapt_builtin.carbon = $fail_adapt_builtin // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/adapter/fail_adapt_with_subobjects.carbon b/toolchain/check/testdata/class/adapter/fail_adapt_with_subobjects.carbon index 214491c5cfc5..372f591f69a2 100644 --- a/toolchain/check/testdata/class/adapter/fail_adapt_with_subobjects.carbon +++ b/toolchain/check/testdata/class/adapter/fail_adapt_with_subobjects.carbon @@ -88,7 +88,7 @@ class AdaptWithBaseAndFields { adapt {}; } -// CHECK:STDOUT: --- fail_adapt_with_base.carbon +// CHECK:STDOUT: --- fail_adapt_with_base.carbon = $fail_adapt_with_base // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -145,7 +145,7 @@ class AdaptWithBaseAndFields { // CHECK:STDOUT: extend %Base.ref // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_adapt_with_fields.carbon +// CHECK:STDOUT: --- fail_adapt_with_fields.carbon = $fail_adapt_with_fields // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -213,7 +213,7 @@ class AdaptWithBaseAndFields { // CHECK:STDOUT: .c = %field_decl.loc31 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_adapt_with_base_and_fields.carbon +// CHECK:STDOUT: --- fail_adapt_with_base_and_fields.carbon = $fail_adapt_with_base_and_fields // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/adapter/init_adapt.carbon b/toolchain/check/testdata/class/adapter/init_adapt.carbon index b0de10957620..effe14fb5f34 100644 --- a/toolchain/check/testdata/class/adapter/init_adapt.carbon +++ b/toolchain/check/testdata/class/adapter/init_adapt.carbon @@ -108,7 +108,7 @@ var d: AdaptC = MakeC(); // CHECK:STDERR: var e: C = MakeAdaptC(); -// CHECK:STDOUT: --- init_adapt.carbon +// CHECK:STDOUT: --- init_adapt.carbon = $init_adapt // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -329,7 +329,7 @@ var e: C = MakeAdaptC(); // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_not_implicit.carbon +// CHECK:STDOUT: --- fail_not_implicit.carbon = $fail_not_implicit // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/basic.carbon b/toolchain/check/testdata/class/basic.carbon index c911eaede186..2a003dac3c3a 100644 --- a/toolchain/check/testdata/class/basic.carbon +++ b/toolchain/check/testdata/class/basic.carbon @@ -30,7 +30,7 @@ fn Run() -> i32 { return Class.F(4); } -// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: --- basic.carbon = $basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/complete_in_member_fn.carbon b/toolchain/check/testdata/class/complete_in_member_fn.carbon index 19c71060ce64..4cb67dce7e82 100644 --- a/toolchain/check/testdata/class/complete_in_member_fn.carbon +++ b/toolchain/check/testdata/class/complete_in_member_fn.carbon @@ -18,7 +18,7 @@ class C { var a: i32; } -// CHECK:STDOUT: --- complete_in_member_fn.carbon +// CHECK:STDOUT: --- complete_in_member_fn.carbon = $complete_in_member_fn // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/cross_package_import.carbon b/toolchain/check/testdata/class/cross_package_import.carbon index 023fa8a5c309..e34c18ace685 100644 --- a/toolchain/check/testdata/class/cross_package_import.carbon +++ b/toolchain/check/testdata/class/cross_package_import.carbon @@ -122,7 +122,7 @@ import Other library "other_conflict"; var c: Other.C = {}; -// CHECK:STDOUT: --- other_define.carbon +// CHECK:STDOUT: --- other_define.carbon = $other_define // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -155,7 +155,7 @@ var c: Other.C = {}; // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- other_extern.carbon +// CHECK:STDOUT: --- other_extern.carbon = $other_extern // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -180,7 +180,7 @@ var c: Other.C = {}; // CHECK:STDOUT: // CHECK:STDOUT: class @C; // CHECK:STDOUT: -// CHECK:STDOUT: --- other_conflict.carbon +// CHECK:STDOUT: --- other_conflict.carbon = $other_conflict // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -209,7 +209,7 @@ var c: Other.C = {}; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- define.carbon +// CHECK:STDOUT: --- define.carbon = $define // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -273,7 +273,7 @@ var c: Other.C = {}; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_extern.carbon +// CHECK:STDOUT: --- fail_extern.carbon = $fail_extern // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -323,7 +323,7 @@ var c: Other.C = {}; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_merge_define_extern.carbon +// CHECK:STDOUT: --- fail_todo_merge_define_extern.carbon = $fail_todo_merge_define_extern // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -388,7 +388,7 @@ var c: Other.C = {}; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_conflict.carbon +// CHECK:STDOUT: --- fail_conflict.carbon = $fail_conflict // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/destroy_calls.carbon b/toolchain/check/testdata/class/destroy_calls.carbon index c40c491d7ddb..d73aefc2a22e 100644 --- a/toolchain/check/testdata/class/destroy_calls.carbon +++ b/toolchain/check/testdata/class/destroy_calls.carbon @@ -99,7 +99,7 @@ fn F(template T: type) { fn G() { F({}); } -// CHECK:STDOUT: --- implicit_return.carbon +// CHECK:STDOUT: --- implicit_return.carbon = $implicit_return // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -221,7 +221,7 @@ fn G() { F({}); } // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc10(%self.param: ref %A) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- nested_scope.carbon +// CHECK:STDOUT: --- nested_scope.carbon = $nested_scope // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -351,7 +351,7 @@ fn G() { F({}); } // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc10(%self.param: ref %A) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- temp.carbon +// CHECK:STDOUT: --- temp.carbon = $temp // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -448,7 +448,7 @@ fn G() { F({}); } // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc12(%self.param: ref %C) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- generic_class.carbon +// CHECK:STDOUT: --- generic_class.carbon = $generic_class // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -517,7 +517,7 @@ fn G() { F({}); } // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc9_3.2(%self.param: ref %D.89e) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- generic_use_inside_generic.carbon +// CHECK:STDOUT: --- generic_use_inside_generic.carbon = $generic_use_inside_generic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -649,7 +649,7 @@ fn G() { F({}); } // CHECK:STDOUT: %SelfDestruct.specific_fn.2 => constants.%SelfDestruct.specific_fn.055 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- generic_use_inside_template.carbon +// CHECK:STDOUT: --- generic_use_inside_template.carbon = $generic_use_inside_template // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/export_name.carbon b/toolchain/check/testdata/class/export_name.carbon index 1d62b9530935..a9981a7987f3 100644 --- a/toolchain/check/testdata/class/export_name.carbon +++ b/toolchain/check/testdata/class/export_name.carbon @@ -42,7 +42,7 @@ import library "export"; var c: C = {}; -// CHECK:STDOUT: --- base.carbon +// CHECK:STDOUT: --- base.carbon = $base // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -66,7 +66,7 @@ var c: C = {}; // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- export.carbon +// CHECK:STDOUT: --- export.carbon = $export // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -96,7 +96,7 @@ var c: C = {}; // CHECK:STDOUT: .Self = imports.%Main.import_ref.e47 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_export.carbon +// CHECK:STDOUT: --- use_export.carbon = $use_export // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/extern.carbon b/toolchain/check/testdata/class/extern.carbon index e77766e821af..7e7f92cc52e0 100644 --- a/toolchain/check/testdata/class/extern.carbon +++ b/toolchain/check/testdata/class/extern.carbon @@ -345,7 +345,7 @@ import library "def"; // CHECK:STDERR: extern class C; -// CHECK:STDOUT: --- decl.carbon +// CHECK:STDOUT: --- decl.carbon = $decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -361,7 +361,7 @@ extern class C; // CHECK:STDOUT: // CHECK:STDOUT: class @C; // CHECK:STDOUT: -// CHECK:STDOUT: --- extern_decl.carbon +// CHECK:STDOUT: --- extern_decl.carbon = $extern_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -377,7 +377,7 @@ extern class C; // CHECK:STDOUT: // CHECK:STDOUT: class @C; // CHECK:STDOUT: -// CHECK:STDOUT: --- extern_decl_copy.carbon +// CHECK:STDOUT: --- extern_decl_copy.carbon = $extern_decl_copy // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -393,7 +393,7 @@ extern class C; // CHECK:STDOUT: // CHECK:STDOUT: class @C; // CHECK:STDOUT: -// CHECK:STDOUT: --- def.carbon +// CHECK:STDOUT: --- def.carbon = $def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -417,7 +417,7 @@ extern class C; // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_decl_fn_in_extern.carbon +// CHECK:STDOUT: --- fail_decl_fn_in_extern.carbon = $fail_decl_fn_in_extern // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -438,7 +438,7 @@ extern class C; // CHECK:STDOUT: // CHECK:STDOUT: fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: --- extern_def.carbon +// CHECK:STDOUT: --- extern_def.carbon = $extern_def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -462,7 +462,7 @@ extern class C; // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_extern_decl_after_extern_decl.carbon +// CHECK:STDOUT: --- fail_extern_decl_after_extern_decl.carbon = $fail_extern_decl_after_extern_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -479,7 +479,7 @@ extern class C; // CHECK:STDOUT: // CHECK:STDOUT: class @C; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_decl_after_extern_decl.carbon +// CHECK:STDOUT: --- fail_decl_after_extern_decl.carbon = $fail_decl_after_extern_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -496,7 +496,7 @@ extern class C; // CHECK:STDOUT: // CHECK:STDOUT: class @C; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_extern_member_class.carbon +// CHECK:STDOUT: --- fail_extern_member_class.carbon = $fail_extern_member_class // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -525,7 +525,7 @@ extern class C; // CHECK:STDOUT: // CHECK:STDOUT: class @D; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_def_after_extern_decl.carbon +// CHECK:STDOUT: --- fail_def_after_extern_decl.carbon = $fail_def_after_extern_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -550,7 +550,7 @@ extern class C; // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_extern_decl_after_decl.carbon +// CHECK:STDOUT: --- fail_extern_decl_after_decl.carbon = $fail_extern_decl_after_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -567,7 +567,7 @@ extern class C; // CHECK:STDOUT: // CHECK:STDOUT: class @C; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_import_extern_decl_then_decl.carbon +// CHECK:STDOUT: --- fail_import_extern_decl_then_decl.carbon = $fail_import_extern_decl_then_decl // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Main.C = import_ref Main//extern_decl, C, unloaded @@ -580,7 +580,7 @@ extern class C; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_import_decl_then_extern_decl.carbon +// CHECK:STDOUT: --- fail_import_decl_then_extern_decl.carbon = $fail_import_decl_then_extern_decl // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Main.C = import_ref Main//decl, C, unloaded @@ -593,7 +593,7 @@ extern class C; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_import_extern_decl_then_def.carbon +// CHECK:STDOUT: --- fail_import_extern_decl_then_def.carbon = $fail_import_extern_decl_then_def // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Main.C = import_ref Main//extern_decl, C, unloaded @@ -606,7 +606,7 @@ extern class C; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_import_ownership_conflict.carbon +// CHECK:STDOUT: --- fail_import_ownership_conflict.carbon = $fail_import_ownership_conflict // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Main.C = import_ref Main//extern_decl, C, unloaded @@ -619,7 +619,7 @@ extern class C; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_import_extern_decl_copy.carbon +// CHECK:STDOUT: --- fail_todo_import_extern_decl_copy.carbon = $fail_todo_import_extern_decl_copy // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Main.C = import_ref Main//extern_decl, C, unloaded @@ -632,7 +632,7 @@ extern class C; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_extern_decl_after_import_extern_decl.carbon +// CHECK:STDOUT: --- fail_extern_decl_after_import_extern_decl.carbon = $fail_extern_decl_after_import_extern_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -649,7 +649,7 @@ extern class C; // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "extern_decl.carbon"]; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_decl_after_import_extern_decl.carbon +// CHECK:STDOUT: --- fail_decl_after_import_extern_decl.carbon = $fail_decl_after_import_extern_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -666,7 +666,7 @@ extern class C; // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "decl.carbon"]; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_def_after_import_extern_decl.carbon +// CHECK:STDOUT: --- fail_def_after_import_extern_decl.carbon = $fail_def_after_import_extern_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -695,7 +695,7 @@ extern class C; // CHECK:STDOUT: .Self = imports.%Main.import_ref.e47 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_extern_decl_after_import_def.carbon +// CHECK:STDOUT: --- fail_extern_decl_after_import_def.carbon = $fail_extern_decl_after_import_def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/extern_library.carbon b/toolchain/check/testdata/class/extern_library.carbon index 7a15e8bc5748..16bc855d8ef6 100644 --- a/toolchain/check/testdata/class/extern_library.carbon +++ b/toolchain/check/testdata/class/extern_library.carbon @@ -22,7 +22,7 @@ // CHECK:STDERR: extern library "foo" class C; -// CHECK:STDOUT: --- fail_todo.carbon +// CHECK:STDOUT: --- fail_todo.carbon = $fail_todo // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/field/comp_time_field.carbon b/toolchain/check/testdata/class/field/comp_time_field.carbon index 5e10d49af95e..48ad79f7e161 100644 --- a/toolchain/check/testdata/class/field/comp_time_field.carbon +++ b/toolchain/check/testdata/class/field/comp_time_field.carbon @@ -73,7 +73,7 @@ class Class { var x: Class = {}; -// CHECK:STDOUT: --- fail_let.carbon +// CHECK:STDOUT: --- fail_let.carbon = $fail_let // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -127,7 +127,7 @@ var x: Class = {}; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_var.carbon +// CHECK:STDOUT: --- fail_var.carbon = $fail_var // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/field/compound_field.carbon b/toolchain/check/testdata/class/field/compound_field.carbon index c52b9d0bd00a..fe45f8e267c9 100644 --- a/toolchain/check/testdata/class/field/compound_field.carbon +++ b/toolchain/check/testdata/class/field/compound_field.carbon @@ -41,7 +41,7 @@ fn AccessBaseIndirect(p: Derived*) -> i32* { return &p->(Base.b); } -// CHECK:STDOUT: --- compound_field.carbon +// CHECK:STDOUT: --- compound_field.carbon = $compound_field // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/field/field_access.carbon b/toolchain/check/testdata/class/field/field_access.carbon index 18f7fc402f3d..df4b6507703b 100644 --- a/toolchain/check/testdata/class/field/field_access.carbon +++ b/toolchain/check/testdata/class/field/field_access.carbon @@ -25,7 +25,7 @@ fn Run() { var unused ck: i32 = c.k; } -// CHECK:STDOUT: --- field_access.carbon +// CHECK:STDOUT: --- field_access.carbon = $field_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 46edcf0af6aa..0d7f624c871f 100644 --- a/toolchain/check/testdata/class/field/field_access_in_value.carbon +++ b/toolchain/check/testdata/class/field/field_access_in_value.carbon @@ -26,7 +26,7 @@ fn Test() { var unused ck: i32 = c.k; } -// CHECK:STDOUT: --- field_access_in_value.carbon +// CHECK:STDOUT: --- field_access_in_value.carbon = $field_access_in_value // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/field/field_initializer.carbon b/toolchain/check/testdata/class/field/field_initializer.carbon index bc6c090b1a1f..3254a3b4d1c2 100644 --- a/toolchain/check/testdata/class/field/field_initializer.carbon +++ b/toolchain/check/testdata/class/field/field_initializer.carbon @@ -95,7 +95,7 @@ class Class { var C: Class = {}; -// CHECK:STDOUT: --- field_initializer.carbon +// CHECK:STDOUT: --- field_initializer.carbon = $field_initializer // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/field/static.carbon b/toolchain/check/testdata/class/field/static.carbon index 700e3e6b8b41..2b261ee6f76c 100644 --- a/toolchain/check/testdata/class/field/static.carbon +++ b/toolchain/check/testdata/class/field/static.carbon @@ -57,7 +57,7 @@ fn F() { C.static_field = 123; } -// CHECK:STDOUT: --- static_field.carbon +// CHECK:STDOUT: --- static_field.carbon = $static_field // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/forward_declared.carbon b/toolchain/check/testdata/class/forward_declared.carbon index d086e534eb9e..84567c7bb5c4 100644 --- a/toolchain/check/testdata/class/forward_declared.carbon +++ b/toolchain/check/testdata/class/forward_declared.carbon @@ -16,7 +16,7 @@ class Class; fn F(p: Class*) -> Class* { return p; } -// CHECK:STDOUT: --- forward_declared.carbon +// CHECK:STDOUT: --- forward_declared.carbon = $forward_declared // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/generic/adapt.carbon b/toolchain/check/testdata/class/generic/adapt.carbon index 761c58d985a7..7ec60a8c821d 100644 --- a/toolchain/check/testdata/class/generic/adapt.carbon +++ b/toolchain/check/testdata/class/generic/adapt.carbon @@ -133,7 +133,7 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { return (a as C).n; } -// CHECK:STDOUT: --- adapt_specific_type.carbon +// CHECK:STDOUT: --- adapt_specific_type.carbon = $adapt_specific_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -302,7 +302,7 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: %complete_type.loc6_1.2 => constants.%complete_type.c49 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_adapt_specific_type.carbon +// CHECK:STDOUT: --- import_adapt_specific_type.carbon = $import_adapt_specific_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -462,7 +462,7 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: %complete_type => constants.%complete_type.c49 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_extend_adapt_specific_type.carbon +// CHECK:STDOUT: --- fail_todo_extend_adapt_specific_type.carbon = $fail_todo_extend_adapt_specific_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -612,7 +612,7 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: %complete_type.loc6_1.2 => constants.%complete_type.c49 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- extend_adapt_specific_type_library.carbon +// CHECK:STDOUT: --- extend_adapt_specific_type_library.carbon = $extend_adapt_specific_type_library // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -724,7 +724,7 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: %complete_type.loc9_1.2 => constants.%complete_type.c49 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_import_extend_adapt_specific_type.carbon +// CHECK:STDOUT: --- fail_todo_import_extend_adapt_specific_type.carbon = $fail_todo_import_extend_adapt_specific_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -862,7 +862,7 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: %complete_type => constants.%complete_type.c49 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- adapt_generic_type.carbon +// CHECK:STDOUT: --- adapt_generic_type.carbon = $adapt_generic_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1002,7 +1002,7 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: %complete_type.loc6_1.2 => constants.%complete_type.d6c // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_adapt_generic_type.carbon +// CHECK:STDOUT: --- import_adapt_generic_type.carbon = $import_adapt_generic_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/generic/base_is_generic.carbon b/toolchain/check/testdata/class/generic/base_is_generic.carbon index 92c05b864809..3544baa6216a 100644 --- a/toolchain/check/testdata/class/generic/base_is_generic.carbon +++ b/toolchain/check/testdata/class/generic/base_is_generic.carbon @@ -93,7 +93,7 @@ fn H() { let unused j: i32 = C(i32).G(); } -// CHECK:STDOUT: --- extend_generic_base.carbon +// CHECK:STDOUT: --- extend_generic_base.carbon = $extend_generic_base // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -284,7 +284,7 @@ fn H() { // CHECK:STDOUT: %complete_type.loc6_1.2 => constants.%complete_type.38f // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import.carbon +// CHECK:STDOUT: --- import.carbon = $import // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -465,7 +465,7 @@ fn H() { // CHECK:STDOUT: %complete_type => constants.%complete_type.38f // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_extend_symbolic_base.carbon +// CHECK:STDOUT: --- fail_todo_extend_symbolic_base.carbon = $fail_todo_extend_symbolic_base // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -574,7 +574,7 @@ fn H() { // CHECK:STDOUT: %require_complete => constants.%complete_type // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- extend_generic_symbolic_base.carbon +// CHECK:STDOUT: --- extend_generic_symbolic_base.carbon = $extend_generic_symbolic_base // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -843,7 +843,7 @@ fn H() { // CHECK:STDOUT: %X.G.specific_fn.loc5_24.2 => constants.%X.G.specific_fn.180 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_extend_generic_symbolic_base.carbon +// CHECK:STDOUT: --- import_extend_generic_symbolic_base.carbon = $import_extend_generic_symbolic_base // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/generic/basic.carbon b/toolchain/check/testdata/class/generic/basic.carbon index 11a924eab1c2..0c78df2aa62d 100644 --- a/toolchain/check/testdata/class/generic/basic.carbon +++ b/toolchain/check/testdata/class/generic/basic.carbon @@ -31,7 +31,7 @@ class Declaration(T: type); //@dump-sem-ir-end -// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: --- basic.carbon = $basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/generic/call.carbon b/toolchain/check/testdata/class/generic/call.carbon index afddabb189d3..c94d304ef523 100644 --- a/toolchain/check/testdata/class/generic/call.carbon +++ b/toolchain/check/testdata/class/generic/call.carbon @@ -104,7 +104,7 @@ class Outer(T: type) { } } -// CHECK:STDOUT: --- call.carbon +// CHECK:STDOUT: --- call.carbon = $call // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -316,7 +316,7 @@ class Outer(T: type) { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_too_few.carbon +// CHECK:STDOUT: --- fail_too_few.carbon = $fail_too_few // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -413,7 +413,7 @@ class Outer(T: type) { // CHECK:STDOUT: %N.loc4_23.1 => constants.%N.55f // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_too_many.carbon +// CHECK:STDOUT: --- fail_too_many.carbon = $fail_too_many // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -514,7 +514,7 @@ class Outer(T: type) { // CHECK:STDOUT: %N.loc4_23.1 => constants.%N.55f // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_no_conversion.carbon +// CHECK:STDOUT: --- fail_no_conversion.carbon = $fail_no_conversion // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -618,7 +618,7 @@ class Outer(T: type) { // CHECK:STDOUT: %N.loc4_23.1 => constants.%N.55f // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- call_in_nested_return_type.carbon +// CHECK:STDOUT: --- call_in_nested_return_type.carbon = $call_in_nested_return_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/generic/complete_in_conversion.carbon b/toolchain/check/testdata/class/generic/complete_in_conversion.carbon index e53600ab0795..5951673cc7fe 100644 --- a/toolchain/check/testdata/class/generic/complete_in_conversion.carbon +++ b/toolchain/check/testdata/class/generic/complete_in_conversion.carbon @@ -39,7 +39,7 @@ fn F(a: A(0)*) { let unused b: B* = a; } -// CHECK:STDOUT: --- fail_derived_to_base.carbon +// CHECK:STDOUT: --- fail_derived_to_base.carbon = $fail_derived_to_base // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/generic/empty_params.carbon b/toolchain/check/testdata/class/generic/empty_params.carbon index 3c483f58a0af..63c0b8bbc2f3 100644 --- a/toolchain/check/testdata/class/generic/empty_params.carbon +++ b/toolchain/check/testdata/class/generic/empty_params.carbon @@ -14,7 +14,7 @@ class C[](); -// CHECK:STDOUT: --- empty_params.carbon +// CHECK:STDOUT: --- empty_params.carbon = $empty_params // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/generic/field.carbon b/toolchain/check/testdata/class/generic/field.carbon index fa450884e8a2..d2b1a81f0797 100644 --- a/toolchain/check/testdata/class/generic/field.carbon +++ b/toolchain/check/testdata/class/generic/field.carbon @@ -33,7 +33,7 @@ fn H(generic U: Core.Copy, c: Class(U)) -> U { //@dump-sem-ir-end -// CHECK:STDOUT: --- field.carbon +// CHECK:STDOUT: --- field.carbon = $field // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/generic/generic_vs_params.carbon b/toolchain/check/testdata/class/generic/generic_vs_params.carbon index 9af2d8aeb92d..42f2a930f45c 100644 --- a/toolchain/check/testdata/class/generic/generic_vs_params.carbon +++ b/toolchain/check/testdata/class/generic/generic_vs_params.carbon @@ -90,7 +90,7 @@ library "[[@TEST_NAME]]"; // CHECK:STDERR: class Foo[T: type]; -// CHECK:STDOUT: --- params.carbon +// CHECK:STDOUT: --- params.carbon = $params // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -404,7 +404,7 @@ class Foo[T: type]; // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_non_generic_implicit_params.carbon +// CHECK:STDOUT: --- fail_non_generic_implicit_params.carbon = $fail_non_generic_implicit_params // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -430,7 +430,7 @@ class Foo[T: type]; // CHECK:STDOUT: .Self = constants.%A // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_non_generic_params.carbon +// CHECK:STDOUT: --- fail_non_generic_params.carbon = $fail_non_generic_params // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -492,7 +492,7 @@ class Foo[T: type]; // CHECK:STDOUT: %T.loc14_15.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_implicit_params_only_empty.carbon +// CHECK:STDOUT: --- fail_implicit_params_only_empty.carbon = $fail_implicit_params_only_empty // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -509,7 +509,7 @@ class Foo[T: type]; // CHECK:STDOUT: // CHECK:STDOUT: class @Foo; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_implicit_params_only.carbon +// CHECK:STDOUT: --- fail_implicit_params_only.carbon = $fail_implicit_params_only // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/generic/import.carbon b/toolchain/check/testdata/class/generic/import.carbon index 2d746f24e01c..8188a108b078 100644 --- a/toolchain/check/testdata/class/generic/import.carbon +++ b/toolchain/check/testdata/class/generic/import.carbon @@ -99,7 +99,7 @@ class Class(U: type) { var x: T; } -// CHECK:STDOUT: --- foo.carbon +// CHECK:STDOUT: --- foo.carbon = $foo // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -284,7 +284,7 @@ class Class(U: type) { // CHECK:STDOUT: %T.loc6_22.1 => constants.%i32 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- foo.impl.carbon +// CHECK:STDOUT: --- foo.impl.carbon = $foo.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -493,7 +493,7 @@ class Class(U: type) { // CHECK:STDOUT: %CompleteClass.F => constants.%CompleteClass.F.0d9 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_foo.carbon +// CHECK:STDOUT: --- use_foo.carbon = $use_foo // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -773,7 +773,7 @@ class Class(U: type) { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_generic_arg_mismatch.carbon +// CHECK:STDOUT: --- fail_generic_arg_mismatch.carbon = $fail_generic_arg_mismatch // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -991,7 +991,7 @@ class Class(U: type) { // CHECK:STDOUT: %CompleteClass.F => constants.%CompleteClass.F.0d9 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_foo.impl.carbon +// CHECK:STDOUT: --- fail_foo.impl.carbon = $fail_foo.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/generic/init.carbon b/toolchain/check/testdata/class/generic/init.carbon index b6ee60d9940e..cda5f14b3205 100644 --- a/toolchain/check/testdata/class/generic/init.carbon +++ b/toolchain/check/testdata/class/generic/init.carbon @@ -49,7 +49,7 @@ fn InitFromAdaptedSpecific(x: i32) -> i32 { //@dump-sem-ir-end -// CHECK:STDOUT: --- from_struct.carbon +// CHECK:STDOUT: --- from_struct.carbon = $from_struct // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -398,7 +398,7 @@ fn InitFromAdaptedSpecific(x: i32) -> i32 { // CHECK:STDOUT: %return.patt.loc9_69.2 => constants.%return.patt.f44 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- adapt.carbon +// CHECK:STDOUT: --- adapt.carbon = $adapt // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/generic/member_access.carbon b/toolchain/check/testdata/class/generic/member_access.carbon index c3015a7e89cf..1cf6706789ad 100644 --- a/toolchain/check/testdata/class/generic/member_access.carbon +++ b/toolchain/check/testdata/class/generic/member_access.carbon @@ -85,7 +85,7 @@ class C { } } -// CHECK:STDOUT: --- member_access.carbon +// CHECK:STDOUT: --- member_access.carbon = $member_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -426,7 +426,7 @@ class C { // CHECK:STDOUT: %specific_impl_fn.loc15_12.2 => constants.%ptr.as.Copy.impl.Op.specific_fn // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- static_member_fn_call.carbon +// CHECK:STDOUT: --- static_member_fn_call.carbon = $static_member_fn_call // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/generic/member_inline.carbon b/toolchain/check/testdata/class/generic/member_inline.carbon index 1c5c10565859..0fce7edcdb67 100644 --- a/toolchain/check/testdata/class/generic/member_inline.carbon +++ b/toolchain/check/testdata/class/generic/member_inline.carbon @@ -48,7 +48,7 @@ class C(T: Core.Copy) { //@dump-sem-ir-end -// CHECK:STDOUT: --- member_inline.carbon +// CHECK:STDOUT: --- member_inline.carbon = $member_inline // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -298,7 +298,7 @@ class C(T: Core.Copy) { // CHECK:STDOUT: %return.patt.loc10_14.2 => constants.%return.patt.f44 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_member_inline_missing_self_dot.carbon +// CHECK:STDOUT: --- fail_member_inline_missing_self_dot.carbon = $fail_member_inline_missing_self_dot // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/generic/member_lookup.carbon b/toolchain/check/testdata/class/generic/member_lookup.carbon index 9bfe507c34b9..a15236df5a54 100644 --- a/toolchain/check/testdata/class/generic/member_lookup.carbon +++ b/toolchain/check/testdata/class/generic/member_lookup.carbon @@ -86,7 +86,7 @@ fn AccessMissingConcrete(x: Derived(i32)) -> i32 { } -// CHECK:STDOUT: --- member_access.carbon +// CHECK:STDOUT: --- member_access.carbon = $member_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 1af13a1f85f7..d7a67e079143 100644 --- a/toolchain/check/testdata/class/generic/member_out_of_line.carbon +++ b/toolchain/check/testdata/class/generic/member_out_of_line.carbon @@ -135,7 +135,7 @@ class Generic(unused T: type) { fn Generic(unused T: ()).WrongType() {} -// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: --- basic.carbon = $basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -439,7 +439,7 @@ fn Generic(unused T: ()).WrongType() {} // CHECK:STDOUT: %return.patt.loc7 => constants.%return.patt.f44 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- nested.carbon +// CHECK:STDOUT: --- nested.carbon = $nested // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/generic/member_type.carbon b/toolchain/check/testdata/class/generic/member_type.carbon index d9499387b065..ecef8b7fbad3 100644 --- a/toolchain/check/testdata/class/generic/member_type.carbon +++ b/toolchain/check/testdata/class/generic/member_type.carbon @@ -57,7 +57,7 @@ fn Test() -> i32 { } -// CHECK:STDOUT: --- class.carbon +// CHECK:STDOUT: --- class.carbon = $class // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -497,7 +497,7 @@ fn Test() -> i32 { // CHECK:STDOUT: %specific_impl_fn.loc9_38.2 => constants.%Int.as.Copy.impl.Op.specific_fn // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- interface.carbon +// CHECK:STDOUT: --- interface.carbon = $interface // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/generic/method_deduce.carbon b/toolchain/check/testdata/class/generic/method_deduce.carbon index ffb3b24bc779..dd319bc773df 100644 --- a/toolchain/check/testdata/class/generic/method_deduce.carbon +++ b/toolchain/check/testdata/class/generic/method_deduce.carbon @@ -34,7 +34,7 @@ fn CallMethodSelfDeduce(c: Class(A)) -> A { } -// CHECK:STDOUT: --- method_deduce.carbon +// CHECK:STDOUT: --- method_deduce.carbon = $method_deduce // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/generic/redeclare.carbon b/toolchain/check/testdata/class/generic/redeclare.carbon index e09578064567..87c67675ac2d 100644 --- a/toolchain/check/testdata/class/generic/redeclare.carbon +++ b/toolchain/check/testdata/class/generic/redeclare.carbon @@ -121,7 +121,7 @@ class E(T: type); // CHECK:STDERR: class E(U: type) {} -// CHECK:STDOUT: --- valid.carbon +// CHECK:STDOUT: --- valid.carbon = $valid // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -189,7 +189,7 @@ class E(U: type) {} // CHECK:STDOUT: %T.loc4_16.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_mismatch_param_list.carbon +// CHECK:STDOUT: --- fail_mismatch_param_list.carbon = $fail_mismatch_param_list // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -252,7 +252,7 @@ class E(U: type) {} // CHECK:STDOUT: %T.loc16_10.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_mismatch_implicit_param_list.carbon +// CHECK:STDOUT: --- fail_mismatch_implicit_param_list.carbon = $fail_mismatch_implicit_param_list // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -363,7 +363,7 @@ class E(U: type) {} // CHECK:STDOUT: %N.loc19_19.1 => constants.%N.bd9 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_mismatch_param_count.carbon +// CHECK:STDOUT: --- fail_mismatch_param_count.carbon = $fail_mismatch_param_count // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -469,7 +469,7 @@ class E(U: type) {} // CHECK:STDOUT: %U.loc19_19.1 => constants.%U // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_mismatch_param_type.carbon +// CHECK:STDOUT: --- fail_mismatch_param_type.carbon = $fail_mismatch_param_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -565,7 +565,7 @@ class E(U: type) {} // CHECK:STDOUT: %T.loc20_10.1 => constants.%T.37f // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_mismatch_param_name.carbon +// CHECK:STDOUT: --- fail_mismatch_param_name.carbon = $fail_mismatch_param_name // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/generic/self.carbon b/toolchain/check/testdata/class/generic/self.carbon index d4a8028e8f68..6a218f18bb2e 100644 --- a/toolchain/check/testdata/class/generic/self.carbon +++ b/toolchain/check/testdata/class/generic/self.carbon @@ -24,7 +24,7 @@ class Class(T: type) { } -// CHECK:STDOUT: --- self.carbon +// CHECK:STDOUT: --- self.carbon = $self // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/generic/stringify.carbon b/toolchain/check/testdata/class/generic/stringify.carbon index 217212ae4cc2..5a171f8bc2e8 100644 --- a/toolchain/check/testdata/class/generic/stringify.carbon +++ b/toolchain/check/testdata/class/generic/stringify.carbon @@ -99,7 +99,7 @@ class E(F: D) {} // CHECK:STDERR: var g: E({.a = 1, .b = 2}) = {} as E({.a = 3, .b = 4} as D); -// CHECK:STDOUT: --- fail_empty_params.carbon +// CHECK:STDOUT: --- fail_empty_params.carbon = $fail_empty_params // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -203,7 +203,7 @@ var g: E({.a = 1, .b = 2}) = {} as E({.a = 3, .b = 4} as D); // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_nested.carbon +// CHECK:STDOUT: --- fail_nested.carbon = $fail_nested // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -401,7 +401,7 @@ var g: E({.a = 1, .b = 2}) = {} as E({.a = 3, .b = 4} as D); // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_int_value.carbon +// CHECK:STDOUT: --- fail_int_value.carbon = $fail_int_value // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -527,7 +527,7 @@ var g: E({.a = 1, .b = 2}) = {} as E({.a = 3, .b = 4} as D); // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_class_param.carbon +// CHECK:STDOUT: --- fail_class_param.carbon = $fail_class_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/implicit_import.carbon b/toolchain/check/testdata/class/implicit_import.carbon index 17c680487021..1342e8ed1eb3 100644 --- a/toolchain/check/testdata/class/implicit_import.carbon +++ b/toolchain/check/testdata/class/implicit_import.carbon @@ -95,7 +95,7 @@ impl library "[[@TEST_NAME]]"; // CHECK:STDERR: class B {} -// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: --- basic.carbon = $basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -111,7 +111,7 @@ class B {} // CHECK:STDOUT: // CHECK:STDOUT: class @C; // CHECK:STDOUT: -// CHECK:STDOUT: --- basic.impl.carbon +// CHECK:STDOUT: --- basic.impl.carbon = $basic.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -137,7 +137,7 @@ class B {} // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- redecl_after_def.carbon +// CHECK:STDOUT: --- redecl_after_def.carbon = $redecl_after_def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -161,7 +161,7 @@ class B {} // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_redecl_after_def.impl.carbon +// CHECK:STDOUT: --- fail_redecl_after_def.impl.carbon = $fail_redecl_after_def.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -191,7 +191,7 @@ class B {} // CHECK:STDOUT: .Self = imports.%Main.import_ref.e47 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- redef_after_def.carbon +// CHECK:STDOUT: --- redef_after_def.carbon = $redef_after_def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -215,7 +215,7 @@ class B {} // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_redef_after_def.impl.carbon +// CHECK:STDOUT: --- fail_redef_after_def.impl.carbon = $fail_redef_after_def.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -255,7 +255,7 @@ class B {} // CHECK:STDOUT: .Self = constants.%C.08d9e3.2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- def_alias.carbon +// CHECK:STDOUT: --- def_alias.carbon = $def_alias // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -274,7 +274,7 @@ class B {} // CHECK:STDOUT: // CHECK:STDOUT: class @C; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_def_alias.impl.carbon +// CHECK:STDOUT: --- fail_def_alias.impl.carbon = $fail_def_alias.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/import.carbon b/toolchain/check/testdata/class/import.carbon index 2be7d1ae3c0d..e8c55e73d6e2 100644 --- a/toolchain/check/testdata/class/import.carbon +++ b/toolchain/check/testdata/class/import.carbon @@ -54,7 +54,7 @@ fn Run() { } -// CHECK:STDOUT: --- a.carbon +// CHECK:STDOUT: --- a.carbon = $a // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -159,7 +159,7 @@ fn Run() { // CHECK:STDOUT: // CHECK:STDOUT: fn @ForwardDeclared.G(%self.param: ref %ForwardDeclared); // CHECK:STDOUT: -// CHECK:STDOUT: --- b.carbon +// CHECK:STDOUT: --- b.carbon = $b // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/import_forward_decl.carbon b/toolchain/check/testdata/class/import_forward_decl.carbon index 60741c4a0d94..879d01a2ccc5 100644 --- a/toolchain/check/testdata/class/import_forward_decl.carbon +++ b/toolchain/check/testdata/class/import_forward_decl.carbon @@ -25,7 +25,7 @@ impl library "[[@TEST_NAME]]"; class ForwardDecl { } -// CHECK:STDOUT: --- a.carbon +// CHECK:STDOUT: --- a.carbon = $a // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -50,7 +50,7 @@ class ForwardDecl { // CHECK:STDOUT: // CHECK:STDOUT: class @ForwardDecl; // CHECK:STDOUT: -// CHECK:STDOUT: --- a.impl.carbon +// CHECK:STDOUT: --- a.impl.carbon = $a.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/import_indirect.carbon b/toolchain/check/testdata/class/import_indirect.carbon index 42f74ddf7ccb..3ebad94ae73e 100644 --- a/toolchain/check/testdata/class/import_indirect.carbon +++ b/toolchain/check/testdata/class/import_indirect.carbon @@ -104,7 +104,7 @@ import library "b"; var value: D = {}; var ptr: E* = &value; -// CHECK:STDOUT: --- a.carbon +// CHECK:STDOUT: --- a.carbon = $a // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -137,7 +137,7 @@ var ptr: E* = &value; // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- b.carbon +// CHECK:STDOUT: --- b.carbon = $b // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -238,7 +238,7 @@ var ptr: E* = &value; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- c.carbon +// CHECK:STDOUT: --- c.carbon = $c // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -339,7 +339,7 @@ var ptr: E* = &value; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- triangle.carbon +// CHECK:STDOUT: --- triangle.carbon = $triangle // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -443,7 +443,7 @@ var ptr: E* = &value; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- triangle_reverse.carbon +// CHECK:STDOUT: --- triangle_reverse.carbon = $triangle_reverse // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -547,7 +547,7 @@ var ptr: E* = &value; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- diamond.carbon +// CHECK:STDOUT: --- diamond.carbon = $diamond // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -655,7 +655,7 @@ var ptr: E* = &value; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- diamond_reverse.carbon +// CHECK:STDOUT: --- diamond_reverse.carbon = $diamond_reverse // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/import_member_cycle.carbon b/toolchain/check/testdata/class/import_member_cycle.carbon index 0e70a6aafb6d..670b8aef427a 100644 --- a/toolchain/check/testdata/class/import_member_cycle.carbon +++ b/toolchain/check/testdata/class/import_member_cycle.carbon @@ -30,7 +30,7 @@ fn Run() { var unused a: Cycle*; } -// CHECK:STDOUT: --- a.carbon +// CHECK:STDOUT: --- a.carbon = $a // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -71,7 +71,7 @@ fn Run() { // CHECK:STDOUT: .a = %field_decl // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- b.carbon +// CHECK:STDOUT: --- b.carbon = $b // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/import_struct_cycle.carbon b/toolchain/check/testdata/class/import_struct_cycle.carbon index 923c8a039e4f..0c132a95f110 100644 --- a/toolchain/check/testdata/class/import_struct_cycle.carbon +++ b/toolchain/check/testdata/class/import_struct_cycle.carbon @@ -35,7 +35,7 @@ fn Run() { a.b = (*a.b).c.b; } -// CHECK:STDOUT: --- a.carbon +// CHECK:STDOUT: --- a.carbon = $a // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -119,7 +119,7 @@ fn Run() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- b.carbon +// CHECK:STDOUT: --- b.carbon = $b // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/indirect_import_member.carbon b/toolchain/check/testdata/class/indirect_import_member.carbon index ef762e706c13..0969aeddcb29 100644 --- a/toolchain/check/testdata/class/indirect_import_member.carbon +++ b/toolchain/check/testdata/class/indirect_import_member.carbon @@ -104,7 +104,7 @@ import library "f"; var x: () = D.C.F(); -// CHECK:STDOUT: --- a.carbon +// CHECK:STDOUT: --- a.carbon = $a // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -137,7 +137,7 @@ var x: () = D.C.F(); // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- b.carbon +// CHECK:STDOUT: --- b.carbon = $b // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Main.C = import_ref Main//a, C, unloaded @@ -150,7 +150,7 @@ var x: () = D.C.F(); // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- c.carbon +// CHECK:STDOUT: --- c.carbon = $c // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -182,7 +182,7 @@ var x: () = D.C.F(); // CHECK:STDOUT: .F = imports.%Main.import_ref.439 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- d.carbon +// CHECK:STDOUT: --- d.carbon = $d // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Main.C = import_ref Main//c, C, unloaded @@ -195,7 +195,7 @@ var x: () = D.C.F(); // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- e.carbon +// CHECK:STDOUT: --- e.carbon = $e // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -241,7 +241,7 @@ var x: () = D.C.F(); // CHECK:STDOUT: .F = imports.%Main.import_ref.be7 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- f.carbon +// CHECK:STDOUT: --- f.carbon = $f // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Main.D = import_ref Main//e, D, unloaded @@ -254,7 +254,7 @@ var x: () = D.C.F(); // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_b.carbon +// CHECK:STDOUT: --- use_b.carbon = $use_b // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -314,7 +314,7 @@ var x: () = D.C.F(); // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_c.carbon +// CHECK:STDOUT: --- use_c.carbon = $use_c // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -374,7 +374,7 @@ var x: () = D.C.F(); // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_d.carbon +// CHECK:STDOUT: --- use_d.carbon = $use_d // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -434,7 +434,7 @@ var x: () = D.C.F(); // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_e.carbon +// CHECK:STDOUT: --- use_e.carbon = $use_e // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -507,7 +507,7 @@ var x: () = D.C.F(); // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_f.carbon +// CHECK:STDOUT: --- use_f.carbon = $use_f // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/inheritance/base.carbon b/toolchain/check/testdata/class/inheritance/base.carbon index 151f183c33ed..a5aae40fd7ce 100644 --- a/toolchain/check/testdata/class/inheritance/base.carbon +++ b/toolchain/check/testdata/class/inheritance/base.carbon @@ -52,7 +52,7 @@ class Derived { extend base: Base; } -// CHECK:STDOUT: --- base.carbon +// CHECK:STDOUT: --- base.carbon = $base // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -277,7 +277,7 @@ class Derived { // CHECK:STDOUT: return %.loc18_25 to %return.param // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_base_after_field.carbon +// CHECK:STDOUT: --- fail_base_after_field.carbon = $fail_base_after_field // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/inheritance/base_field.carbon b/toolchain/check/testdata/class/inheritance/base_field.carbon index 303404ae472f..48c6eb4534fd 100644 --- a/toolchain/check/testdata/class/inheritance/base_field.carbon +++ b/toolchain/check/testdata/class/inheritance/base_field.carbon @@ -29,7 +29,7 @@ fn Access(p: Derived*) -> i32* { return &(*p).c; } -// CHECK:STDOUT: --- base_field.carbon +// CHECK:STDOUT: --- base_field.carbon = $base_field // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/inheritance/base_function_unqualified.carbon b/toolchain/check/testdata/class/inheritance/base_function_unqualified.carbon index ad5324ef0942..198582530fde 100644 --- a/toolchain/check/testdata/class/inheritance/base_function_unqualified.carbon +++ b/toolchain/check/testdata/class/inheritance/base_function_unqualified.carbon @@ -27,7 +27,7 @@ fn Derived.H() { F(); } -// CHECK:STDOUT: --- base_function_unqualified.carbon +// CHECK:STDOUT: --- base_function_unqualified.carbon = $base_function_unqualified // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/inheritance/base_method.carbon b/toolchain/check/testdata/class/inheritance/base_method.carbon index 225abddac77b..0aadf0f803ad 100644 --- a/toolchain/check/testdata/class/inheritance/base_method.carbon +++ b/toolchain/check/testdata/class/inheritance/base_method.carbon @@ -30,7 +30,7 @@ fn Call(p: Derived*) { (*p).F(); } -// CHECK:STDOUT: --- base_method.carbon +// CHECK:STDOUT: --- base_method.carbon = $base_method // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/inheritance/base_method_qualified.carbon b/toolchain/check/testdata/class/inheritance/base_method_qualified.carbon index 731f7421ee09..00f3240dcd0f 100644 --- a/toolchain/check/testdata/class/inheritance/base_method_qualified.carbon +++ b/toolchain/check/testdata/class/inheritance/base_method_qualified.carbon @@ -42,7 +42,7 @@ fn PassDerivedToBaseIndirect(p: Derived*) -> i32 { return p->(Base.G)(); } -// CHECK:STDOUT: --- base_method_qualified.carbon +// CHECK:STDOUT: --- base_method_qualified.carbon = $base_method_qualified // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/inheritance/base_method_shadow.carbon b/toolchain/check/testdata/class/inheritance/base_method_shadow.carbon index 8f471f7511d7..d63133d8422b 100644 --- a/toolchain/check/testdata/class/inheritance/base_method_shadow.carbon +++ b/toolchain/check/testdata/class/inheritance/base_method_shadow.carbon @@ -37,7 +37,7 @@ fn Call(a: A*, b: B*, c: C*, d: D*) { (*d).F(); } -// CHECK:STDOUT: --- base_method_shadow.carbon +// CHECK:STDOUT: --- base_method_shadow.carbon = $base_method_shadow // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/inheritance/derived_to_base.carbon b/toolchain/check/testdata/class/inheritance/derived_to_base.carbon index 8c7fc60c3d38..238ae12e8fe8 100644 --- a/toolchain/check/testdata/class/inheritance/derived_to_base.carbon +++ b/toolchain/check/testdata/class/inheritance/derived_to_base.carbon @@ -121,7 +121,7 @@ fn PassPartialB(b: partial B) { //@dump-sem-ir-end } -// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: --- basic.carbon = $basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -604,7 +604,7 @@ fn PassPartialB(b: partial B) { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- qualified.carbon +// CHECK:STDOUT: --- qualified.carbon = $qualified // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -645,7 +645,7 @@ fn PassPartialB(b: partial B) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- const_qualified_non_ptr.carbon +// CHECK:STDOUT: --- const_qualified_non_ptr.carbon = $const_qualified_non_ptr // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -681,7 +681,7 @@ fn PassPartialB(b: partial B) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- partial_qualified_non_ptr.carbon +// CHECK:STDOUT: --- partial_qualified_non_ptr.carbon = $partial_qualified_non_ptr // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/inheritance/import_base.carbon b/toolchain/check/testdata/class/inheritance/import_base.carbon index 06007d6a1621..0b360423adc3 100644 --- a/toolchain/check/testdata/class/inheritance/import_base.carbon +++ b/toolchain/check/testdata/class/inheritance/import_base.carbon @@ -41,7 +41,7 @@ fn Run() { } -// CHECK:STDOUT: --- a.carbon +// CHECK:STDOUT: --- a.carbon = $a // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -137,7 +137,7 @@ fn Run() { // CHECK:STDOUT: // CHECK:STDOUT: fn @Base.Unused(%self.param: %Base); // CHECK:STDOUT: -// CHECK:STDOUT: --- b.carbon +// CHECK:STDOUT: --- b.carbon = $b // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/inheritance/self_conversion.carbon b/toolchain/check/testdata/class/inheritance/self_conversion.carbon index 97cfb53e520a..3dfe7b04251d 100644 --- a/toolchain/check/testdata/class/inheritance/self_conversion.carbon +++ b/toolchain/check/testdata/class/inheritance/self_conversion.carbon @@ -36,7 +36,7 @@ fn Call(p: Derived*) -> i32 { return (*p).SelfBase(); } -// CHECK:STDOUT: --- self_conversion.carbon +// CHECK:STDOUT: --- self_conversion.carbon = $self_conversion // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/init.carbon b/toolchain/check/testdata/class/init.carbon index d2fe7aed1a0b..ddf0d98289ec 100644 --- a/toolchain/check/testdata/class/init.carbon +++ b/toolchain/check/testdata/class/init.carbon @@ -25,7 +25,7 @@ fn MakeReorder(n: i32, next: Class*) -> Class { return {.next = next, .n = n}; } -// CHECK:STDOUT: --- init.carbon +// CHECK:STDOUT: --- init.carbon = $init // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/init_as.carbon b/toolchain/check/testdata/class/init_as.carbon index f63f7cd3df8e..79869d4e1215 100644 --- a/toolchain/check/testdata/class/init_as.carbon +++ b/toolchain/check/testdata/class/init_as.carbon @@ -28,7 +28,7 @@ fn G() -> i32 { return v.a; } -// CHECK:STDOUT: --- init_as.carbon +// CHECK:STDOUT: --- init_as.carbon = $init_as // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/init_nested.carbon b/toolchain/check/testdata/class/init_nested.carbon index 4366cf9623b3..583612103e97 100644 --- a/toolchain/check/testdata/class/init_nested.carbon +++ b/toolchain/check/testdata/class/init_nested.carbon @@ -28,7 +28,7 @@ fn MakeOuter() -> Outer { return {.c = MakeInner(), .d = MakeInner()}; } -// CHECK:STDOUT: --- init_nested.carbon +// CHECK:STDOUT: --- init_nested.carbon = $init_nested // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/local.carbon b/toolchain/check/testdata/class/local.carbon index 46962409901d..6ef053aeedff 100644 --- a/toolchain/check/testdata/class/local.carbon +++ b/toolchain/check/testdata/class/local.carbon @@ -27,7 +27,7 @@ class A { } } -// CHECK:STDOUT: --- local.carbon +// CHECK:STDOUT: --- local.carbon = $local // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 bbc1a6279a48..c23c25ae2cc4 100644 --- a/toolchain/check/testdata/class/method/call_without_method_syntax.carbon +++ b/toolchain/check/testdata/class/method/call_without_method_syntax.carbon @@ -40,7 +40,7 @@ fn CallViaAlias(p: Point) -> i32 { return A(p); } -// CHECK:STDOUT: --- call_without_method_syntax.carbon +// CHECK:STDOUT: --- call_without_method_syntax.carbon = $call_without_method_syntax // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/method/generic_method.carbon b/toolchain/check/testdata/class/method/generic_method.carbon index 10b67eb1875a..bbf234771c28 100644 --- a/toolchain/check/testdata/class/method/generic_method.carbon +++ b/toolchain/check/testdata/class/method/generic_method.carbon @@ -20,7 +20,7 @@ class Class(T: type) { fn Class(T: type).F(unused self, unused n: T) {} -// CHECK:STDOUT: --- generic_method.carbon +// CHECK:STDOUT: --- generic_method.carbon = $generic_method // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/method/method.carbon b/toolchain/check/testdata/class/method/method.carbon index 284549ba3f86..6a12310991dd 100644 --- a/toolchain/check/testdata/class/method/method.carbon +++ b/toolchain/check/testdata/class/method/method.carbon @@ -62,7 +62,7 @@ fn CallGOnInitializingExpr() -> i32 { return Make().G(); } -// CHECK:STDOUT: --- method.carbon +// CHECK:STDOUT: --- method.carbon = $method // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/method/static_method.carbon b/toolchain/check/testdata/class/method/static_method.carbon index 9b96581670f4..7537f88116a8 100644 --- a/toolchain/check/testdata/class/method/static_method.carbon +++ b/toolchain/check/testdata/class/method/static_method.carbon @@ -21,7 +21,7 @@ fn Run() -> i32 { return c.F(); } -// CHECK:STDOUT: --- static_method.carbon +// CHECK:STDOUT: --- static_method.carbon = $static_method // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/method/virtual.carbon b/toolchain/check/testdata/class/method/virtual.carbon index c7e7d305d660..5dbad4abe65f 100644 --- a/toolchain/check/testdata/class/method/virtual.carbon +++ b/toolchain/check/testdata/class/method/virtual.carbon @@ -589,7 +589,7 @@ class T2(G2: type) { } -// CHECK:STDOUT: --- modifiers.carbon +// CHECK:STDOUT: --- modifiers.carbon = $modifiers // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -681,7 +681,7 @@ class T2(G2: type) { // CHECK:STDOUT: // CHECK:STDOUT: virtual fn @Abstract.K(%self.param: %Abstract); // CHECK:STDOUT: -// CHECK:STDOUT: --- override_import.carbon +// CHECK:STDOUT: --- override_import.carbon = $override_import // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -885,7 +885,7 @@ class T2(G2: type) { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- init.carbon +// CHECK:STDOUT: --- init.carbon = $init // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -982,7 +982,7 @@ class T2(G2: type) { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- init_members.carbon +// CHECK:STDOUT: --- init_members.carbon = $init_members // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1205,7 +1205,7 @@ class T2(G2: type) { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- abstract_impl.carbon +// CHECK:STDOUT: --- abstract_impl.carbon = $abstract_impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1277,7 +1277,7 @@ class T2(G2: type) { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- virtual_impl.carbon +// CHECK:STDOUT: --- virtual_impl.carbon = $virtual_impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1349,7 +1349,7 @@ class T2(G2: type) { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- impl_conversion.carbon +// CHECK:STDOUT: --- impl_conversion.carbon = $impl_conversion // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1458,7 +1458,7 @@ class T2(G2: type) { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc23_28.2(%self.param: ref %T2) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- generic_with_virtual.carbon +// CHECK:STDOUT: --- generic_with_virtual.carbon = $generic_with_virtual // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1546,7 +1546,7 @@ class T2(G2: type) { // CHECK:STDOUT: %require_complete => constants.%require_complete // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- with_dependent_arg.carbon +// CHECK:STDOUT: --- with_dependent_arg.carbon = $with_dependent_arg // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1655,7 +1655,7 @@ class T2(G2: type) { // CHECK:STDOUT: %require_complete.loc6_37 => constants.%require_complete.944 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- impl_generic_specifically.carbon +// CHECK:STDOUT: --- impl_generic_specifically.carbon = $impl_generic_specifically // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1740,7 +1740,7 @@ class T2(G2: type) { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- impl_generic_generic.carbon +// CHECK:STDOUT: --- impl_generic_generic.carbon = $impl_generic_generic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/nested.carbon b/toolchain/check/testdata/class/nested.carbon index 5aad7574f35c..e2492aa4d88a 100644 --- a/toolchain/check/testdata/class/nested.carbon +++ b/toolchain/check/testdata/class/nested.carbon @@ -53,7 +53,7 @@ fn F(a: Outer*) { b->qi = a->pi; } -// CHECK:STDOUT: --- nested.carbon +// CHECK:STDOUT: --- nested.carbon = $nested // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/nested_name.carbon b/toolchain/check/testdata/class/nested_name.carbon index 1698fd651996..9fe24e6b935f 100644 --- a/toolchain/check/testdata/class/nested_name.carbon +++ b/toolchain/check/testdata/class/nested_name.carbon @@ -26,7 +26,7 @@ fn G(o: Outer) { var unused i: o.Inner; } -// CHECK:STDOUT: --- nested_name.carbon +// CHECK:STDOUT: --- nested_name.carbon = $nested_name // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/partial/init.carbon b/toolchain/check/testdata/class/partial/init.carbon index 65c811ef59a2..8253e650a409 100644 --- a/toolchain/check/testdata/class/partial/init.carbon +++ b/toolchain/check/testdata/class/partial/init.carbon @@ -29,7 +29,7 @@ class Derived { } } -// CHECK:STDOUT: --- base.carbon +// CHECK:STDOUT: --- base.carbon = $base // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/partial/qualifier.carbon b/toolchain/check/testdata/class/partial/qualifier.carbon index 1ba683eef4fa..07f8aad5ad22 100644 --- a/toolchain/check/testdata/class/partial/qualifier.carbon +++ b/toolchain/check/testdata/class/partial/qualifier.carbon @@ -203,7 +203,7 @@ library "[[@TEST_NAME]]"; // CHECK:STDERR: fn F[T: type](p: partial T*); -// CHECK:STDOUT: --- base.carbon +// CHECK:STDOUT: --- base.carbon = $base // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -232,7 +232,7 @@ fn F[T: type](p: partial T*); // CHECK:STDOUT: // CHECK:STDOUT: fn @A(%p.param: %.331); // CHECK:STDOUT: -// CHECK:STDOUT: --- abstract.carbon +// CHECK:STDOUT: --- abstract.carbon = $abstract // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -261,7 +261,7 @@ fn F[T: type](p: partial T*); // CHECK:STDOUT: // CHECK:STDOUT: fn @A(%p.param: %.331); // CHECK:STDOUT: -// CHECK:STDOUT: --- abstract_var.carbon +// CHECK:STDOUT: --- abstract_var.carbon = $abstract_var // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -290,7 +290,7 @@ fn F[T: type](p: partial T*); // CHECK:STDOUT: // CHECK:STDOUT: fn @A(%p.param: ref %.331); // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_partial_nondynamic.carbon +// CHECK:STDOUT: --- fail_partial_nondynamic.carbon = $fail_partial_nondynamic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -319,7 +319,7 @@ fn F[T: type](p: partial T*); // CHECK:STDOUT: // CHECK:STDOUT: fn @G(%p.param: %.331); // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_partial_final.carbon +// CHECK:STDOUT: --- fail_partial_final.carbon = $fail_partial_final // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -348,7 +348,7 @@ fn F[T: type](p: partial T*); // CHECK:STDOUT: // CHECK:STDOUT: fn @G(%p.param: %.546); // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_partial_decl.carbon +// CHECK:STDOUT: --- fail_partial_decl.carbon = $fail_partial_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -377,7 +377,7 @@ fn F[T: type](p: partial T*); // CHECK:STDOUT: // CHECK:STDOUT: fn @G(%p.param: %.331); // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_partial_tuple.carbon +// CHECK:STDOUT: --- fail_partial_tuple.carbon = $fail_partial_tuple // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -412,7 +412,7 @@ fn F[T: type](p: partial T*); // CHECK:STDOUT: // CHECK:STDOUT: fn @G(%p.param: %.8dc); // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_partial_struct.carbon +// CHECK:STDOUT: --- fail_partial_struct.carbon = $fail_partial_struct // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -443,7 +443,7 @@ fn F[T: type](p: partial T*); // CHECK:STDOUT: // CHECK:STDOUT: fn @G(%p.param: %.91f); // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_duplicate.carbon +// CHECK:STDOUT: --- fail_duplicate.carbon = $fail_duplicate // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/redeclaration.carbon b/toolchain/check/testdata/class/redeclaration.carbon index 15b1b0be7ca7..e21cd8c725c7 100644 --- a/toolchain/check/testdata/class/redeclaration.carbon +++ b/toolchain/check/testdata/class/redeclaration.carbon @@ -20,7 +20,7 @@ class Class { fn Class.F(unused self, unused b: ()) {} -// CHECK:STDOUT: --- redeclaration.carbon +// CHECK:STDOUT: --- redeclaration.carbon = $redeclaration // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/redeclaration_introducer.carbon b/toolchain/check/testdata/class/redeclaration_introducer.carbon index 044c4afeb2b0..7544e0902907 100644 --- a/toolchain/check/testdata/class/redeclaration_introducer.carbon +++ b/toolchain/check/testdata/class/redeclaration_introducer.carbon @@ -20,7 +20,7 @@ class A {} base class B {} abstract class C {} -// CHECK:STDOUT: --- redeclaration_introducer.carbon +// CHECK:STDOUT: --- redeclaration_introducer.carbon = $redeclaration_introducer // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/reenter_scope.carbon b/toolchain/check/testdata/class/reenter_scope.carbon index 81ae5afd8f61..4bf610ddd3a1 100644 --- a/toolchain/check/testdata/class/reenter_scope.carbon +++ b/toolchain/check/testdata/class/reenter_scope.carbon @@ -22,7 +22,7 @@ fn Class.F() -> i32 { return G(); } -// CHECK:STDOUT: --- reenter_scope.carbon +// CHECK:STDOUT: --- reenter_scope.carbon = $reenter_scope // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/reorder.carbon b/toolchain/check/testdata/class/reorder.carbon index 55c5af80ddb7..172910bcb781 100644 --- a/toolchain/check/testdata/class/reorder.carbon +++ b/toolchain/check/testdata/class/reorder.carbon @@ -22,7 +22,7 @@ class Class { } } -// CHECK:STDOUT: --- reorder.carbon +// CHECK:STDOUT: --- reorder.carbon = $reorder // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/reorder_qualified.carbon b/toolchain/check/testdata/class/reorder_qualified.carbon index a71ce19484eb..35d3af657ce9 100644 --- a/toolchain/check/testdata/class/reorder_qualified.carbon +++ b/toolchain/check/testdata/class/reorder_qualified.carbon @@ -50,7 +50,7 @@ class A { var a: i32; } -// CHECK:STDOUT: --- reorder_qualified.carbon +// CHECK:STDOUT: --- reorder_qualified.carbon = $reorder_qualified // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/scope.carbon b/toolchain/check/testdata/class/scope.carbon index 4d5075cc8dc7..03517c42d10f 100644 --- a/toolchain/check/testdata/class/scope.carbon +++ b/toolchain/check/testdata/class/scope.carbon @@ -31,7 +31,7 @@ fn Run() { var unused b: i32 = Class.F(); } -// CHECK:STDOUT: --- scope.carbon +// CHECK:STDOUT: --- scope.carbon = $scope // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/self/fail_ref_self.carbon b/toolchain/check/testdata/class/self/fail_ref_self.carbon index e61f5269b681..0272a33de8c0 100644 --- a/toolchain/check/testdata/class/self/fail_ref_self.carbon +++ b/toolchain/check/testdata/class/self/fail_ref_self.carbon @@ -38,7 +38,7 @@ fn F(c: Class, p: Class*) { Make().F(); } -// CHECK:STDOUT: --- fail_ref_self.carbon +// CHECK:STDOUT: --- fail_ref_self.carbon = $fail_ref_self // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/self/raw_self.carbon b/toolchain/check/testdata/class/self/raw_self.carbon index 456767f17560..7901720134f8 100644 --- a/toolchain/check/testdata/class/self/raw_self.carbon +++ b/toolchain/check/testdata/class/self/raw_self.carbon @@ -27,7 +27,7 @@ fn Class.G(self, r#self: i32) -> (i32, i32) { } -// CHECK:STDOUT: --- raw_self.carbon +// CHECK:STDOUT: --- raw_self.carbon = $raw_self // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/self/raw_self_type.carbon b/toolchain/check/testdata/class/self/raw_self_type.carbon index 9856fdd3f504..c34ddf42eebb 100644 --- a/toolchain/check/testdata/class/self/raw_self_type.carbon +++ b/toolchain/check/testdata/class/self/raw_self_type.carbon @@ -27,7 +27,7 @@ class MemberNamedSelf { fn MemberNamedSelf.F(unused x: Self, unused y: r#Self) {} -// CHECK:STDOUT: --- raw_self_type.carbon +// CHECK:STDOUT: --- raw_self_type.carbon = $raw_self_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/self/self.carbon b/toolchain/check/testdata/class/self/self.carbon index bb915a4f045e..fdebe1a18d4e 100644 --- a/toolchain/check/testdata/class/self/self.carbon +++ b/toolchain/check/testdata/class/self/self.carbon @@ -112,7 +112,7 @@ class Class { } -// CHECK:STDOUT: --- self.carbon +// CHECK:STDOUT: --- self.carbon = $self // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -270,7 +270,7 @@ class Class { // CHECK:STDOUT: return %Int.as.Copy.impl.Op.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_self_syntax_mismatch.carbon +// CHECK:STDOUT: --- fail_self_syntax_mismatch.carbon = $fail_self_syntax_mismatch // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -362,7 +362,7 @@ class Class { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_self_type_mismatch.carbon +// CHECK:STDOUT: --- fail_self_type_mismatch.carbon = $fail_self_type_mismatch // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -427,7 +427,7 @@ class Class { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_return_self_value.carbon +// CHECK:STDOUT: --- fail_return_self_value.carbon = $fail_return_self_value // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/self/self_type.carbon b/toolchain/check/testdata/class/self/self_type.carbon index cda06e1830bc..bd8ed9b7f19f 100644 --- a/toolchain/check/testdata/class/self/self_type.carbon +++ b/toolchain/check/testdata/class/self/self_type.carbon @@ -26,7 +26,7 @@ fn Class.F(self) -> i32 { return (*self.p).F(); } -// CHECK:STDOUT: --- self_type.carbon +// CHECK:STDOUT: --- self_type.carbon = $self_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/syntactic_merge.carbon b/toolchain/check/testdata/class/syntactic_merge.carbon index 87c627b73ec8..4531b2af3ffc 100644 --- a/toolchain/check/testdata/class/syntactic_merge.carbon +++ b/toolchain/check/testdata/class/syntactic_merge.carbon @@ -230,7 +230,7 @@ fn Base.F(ref self: Base) { self.a = (); } -// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: --- basic.carbon = $basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -345,7 +345,7 @@ fn Base.F(ref self: Base) { // CHECK:STDOUT: %a.loc10_12.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- spacing.carbon +// CHECK:STDOUT: --- spacing.carbon = $spacing // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -415,7 +415,7 @@ fn Base.F(ref self: Base) { // CHECK:STDOUT: %a.loc6_19.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_parens.carbon +// CHECK:STDOUT: --- fail_parens.carbon = $fail_parens // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -499,7 +499,7 @@ fn Base.F(ref self: Base) { // CHECK:STDOUT: %a.loc19_12.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_raw_identifier.carbon +// CHECK:STDOUT: --- fail_raw_identifier.carbon = $fail_raw_identifier // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -583,7 +583,7 @@ fn Base.F(ref self: Base) { // CHECK:STDOUT: %a.loc19_12.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- two_file.carbon +// CHECK:STDOUT: --- two_file.carbon = $two_file // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -662,7 +662,7 @@ fn Base.F(ref self: Base) { // CHECK:STDOUT: %a.loc8_12.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- two_file.impl.carbon +// CHECK:STDOUT: --- two_file.impl.carbon = $two_file.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -766,7 +766,7 @@ fn Base.F(ref self: Base) { // CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_name_mismatch.carbon +// CHECK:STDOUT: --- fail_name_mismatch.carbon = $fail_name_mismatch // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -855,7 +855,7 @@ fn Base.F(ref self: Base) { // CHECK:STDOUT: %b.loc20_12.1 => constants.%b // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_alias.carbon +// CHECK:STDOUT: --- fail_alias.carbon = $fail_alias // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -942,7 +942,7 @@ fn Base.F(ref self: Base) { // CHECK:STDOUT: %a.loc20_12.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_deduced_alias.carbon +// CHECK:STDOUT: --- fail_deduced_alias.carbon = $fail_deduced_alias // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1029,7 +1029,7 @@ fn Base.F(ref self: Base) { // CHECK:STDOUT: %a.loc20_12.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- alias_two_file.carbon +// CHECK:STDOUT: --- alias_two_file.carbon = $alias_two_file // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1081,7 +1081,7 @@ fn Base.F(ref self: Base) { // CHECK:STDOUT: %a.loc6_12.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- todo_fail_alias_two_file.impl.carbon +// CHECK:STDOUT: --- todo_fail_alias_two_file.impl.carbon = $todo_fail_alias_two_file.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1152,7 +1152,7 @@ fn Base.F(ref self: Base) { // CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_repeat_const.carbon +// CHECK:STDOUT: --- fail_repeat_const.carbon = $fail_repeat_const // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1240,7 +1240,7 @@ fn Base.F(ref self: Base) { // CHECK:STDOUT: %a.loc27_12.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_self_type.carbon +// CHECK:STDOUT: --- fail_self_type.carbon = $fail_self_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/class/syntactic_merge_literal.carbon b/toolchain/check/testdata/class/syntactic_merge_literal.carbon index 201a5c035d91..af702638e09e 100644 --- a/toolchain/check/testdata/class/syntactic_merge_literal.carbon +++ b/toolchain/check/testdata/class/syntactic_merge_literal.carbon @@ -40,7 +40,7 @@ class D(b: C(1000)); // CHECK:STDERR: class D(b: C(1_000)) {} -// CHECK:STDOUT: --- int_match.carbon +// CHECK:STDOUT: --- int_match.carbon = $int_match // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -195,7 +195,7 @@ class D(b: C(1_000)) {} // CHECK:STDOUT: %b.loc5_10.1 => constants.%b // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_int_mismatch.carbon +// CHECK:STDOUT: --- fail_int_mismatch.carbon = $fail_int_mismatch // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/const/basics.carbon b/toolchain/check/testdata/const/basics.carbon index 2d95be05343b..aaf5df059271 100644 --- a/toolchain/check/testdata/const/basics.carbon +++ b/toolchain/check/testdata/const/basics.carbon @@ -195,7 +195,7 @@ fn H() -> const I; // CHECK:STDERR: fn H() -> {}; -// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: --- basic.carbon = $basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -324,7 +324,7 @@ fn H() -> {}; // CHECK:STDOUT: return %const.as.Copy.impl.Op.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- collapse.carbon +// CHECK:STDOUT: --- collapse.carbon = $collapse // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/const/import.carbon b/toolchain/check/testdata/const/import.carbon index b78faaecb629..edb8aa587ab4 100644 --- a/toolchain/check/testdata/const/import.carbon +++ b/toolchain/check/testdata/const/import.carbon @@ -30,7 +30,7 @@ var a: const C* = &a_ref; var a_ptr: const C* = a_ptr_ref; //@dump-sem-ir-end -// CHECK:STDOUT: --- implicit.impl.carbon +// CHECK:STDOUT: --- implicit.impl.carbon = $implicit.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/deduce/array.carbon b/toolchain/check/testdata/deduce/array.carbon index 7531f5227d68..bc8246988276 100644 --- a/toolchain/check/testdata/deduce/array.carbon +++ b/toolchain/check/testdata/deduce/array.carbon @@ -167,7 +167,7 @@ fn G() { F(({}, {}, {})); } -// CHECK:STDOUT: --- type_only.carbon +// CHECK:STDOUT: --- type_only.carbon = $type_only // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -446,7 +446,7 @@ fn G() { // CHECK:STDOUT: %F.specific_fn.loc6_45.2 => constants.%F.specific_fn.c73 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- bound_only.carbon +// CHECK:STDOUT: --- bound_only.carbon = $bound_only // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -741,7 +741,7 @@ fn G() { // CHECK:STDOUT: %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc6_66.2 => constants.%int_3.9f3 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- type_and_bound.carbon +// CHECK:STDOUT: --- type_and_bound.carbon = $type_and_bound // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -991,7 +991,7 @@ fn G() { // CHECK:STDOUT: %require_complete => constants.%complete_type.1a4 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_bound_mismatch.carbon +// CHECK:STDOUT: --- fail_bound_mismatch.carbon = $fail_bound_mismatch // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1276,7 +1276,7 @@ fn G() { // CHECK:STDOUT: %F.specific_fn.loc6_45.2 => constants.%F.specific_fn.c73 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_type_mismatch.carbon +// CHECK:STDOUT: --- fail_type_mismatch.carbon = $fail_type_mismatch // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1584,7 +1584,7 @@ fn G() { // CHECK:STDOUT: %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc7_66.2 => constants.%int_3.9f3 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_bound_type_mismatch.carbon +// CHECK:STDOUT: --- fail_bound_type_mismatch.carbon = $fail_bound_type_mismatch // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1877,7 +1877,7 @@ fn G() { // CHECK:STDOUT: %a.patt.loc6_22.2 => constants.%a.patt.781 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_array_length_from_tuple.carbon +// CHECK:STDOUT: --- fail_todo_array_length_from_tuple.carbon = $fail_todo_array_length_from_tuple // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/deduce/conversion.carbon b/toolchain/check/testdata/deduce/conversion.carbon index 3e3b994acd7a..7932d8aee32b 100644 --- a/toolchain/check/testdata/deduce/conversion.carbon +++ b/toolchain/check/testdata/deduce/conversion.carbon @@ -67,7 +67,7 @@ fn G(a: A) { } -// CHECK:STDOUT: --- need_conversion.carbon +// CHECK:STDOUT: --- need_conversion.carbon = $need_conversion // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -94,7 +94,7 @@ fn G(a: A) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- need_user_conversion.carbon +// CHECK:STDOUT: --- need_user_conversion.carbon = $need_user_conversion // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -169,7 +169,7 @@ fn G(a: A) { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc16_8.2(%self.param: ref %A) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- no_conversion_during_deduction.carbon +// CHECK:STDOUT: --- no_conversion_during_deduction.carbon = $no_conversion_during_deduction // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/deduce/generic_type.carbon b/toolchain/check/testdata/deduce/generic_type.carbon index 1f8deafdb29c..b06d26873468 100644 --- a/toolchain/check/testdata/deduce/generic_type.carbon +++ b/toolchain/check/testdata/deduce/generic_type.carbon @@ -69,7 +69,7 @@ fn G() -> i32 { return F({} as WithNontype(0)); } -// CHECK:STDOUT: --- class.carbon +// CHECK:STDOUT: --- class.carbon = $class // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -289,7 +289,7 @@ fn G() -> i32 { // CHECK:STDOUT: %F.specific_fn.loc7_38.2 => constants.%F.specific_fn.8e2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- interface.carbon +// CHECK:STDOUT: --- interface.carbon = $interface // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -489,7 +489,7 @@ fn G() -> i32 { // CHECK:STDOUT: %F.specific_fn.loc7_38.2 => constants.%F.specific_fn.c73 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- nested.carbon +// CHECK:STDOUT: --- nested.carbon = $nested // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -824,7 +824,7 @@ fn G() -> i32 { // CHECK:STDOUT: %F.specific_fn.loc13_65.2 => constants.%F.specific_fn.ed6 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- nontype.carbon +// CHECK:STDOUT: --- nontype.carbon = $nontype // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/deduce/int_float.carbon b/toolchain/check/testdata/deduce/int_float.carbon index b737c69e1879..a2c82d02618f 100644 --- a/toolchain/check/testdata/deduce/int_float.carbon +++ b/toolchain/check/testdata/deduce/int_float.carbon @@ -36,7 +36,7 @@ fn G(a: f64) -> Core.IntLiteral { return F(a); } -// CHECK:STDOUT: --- int.carbon +// CHECK:STDOUT: --- int.carbon = $int.2 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -198,7 +198,7 @@ fn G(a: f64) -> Core.IntLiteral { // CHECK:STDOUT: %Core.IntLiteral.as.Copy.impl.Op.bound => constants.%Core.IntLiteral.as.Copy.impl.Op.bound.03c // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- float.carbon +// CHECK:STDOUT: --- float.carbon = $float.2 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/deduce/tuple.carbon b/toolchain/check/testdata/deduce/tuple.carbon index ea67497e3fc2..d068b007f866 100644 --- a/toolchain/check/testdata/deduce/tuple.carbon +++ b/toolchain/check/testdata/deduce/tuple.carbon @@ -62,7 +62,7 @@ fn G(pair: (C, D)) -> D { return F(pair); } -// CHECK:STDOUT: --- tuple_type.carbon +// CHECK:STDOUT: --- tuple_type.carbon = $tuple_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -271,7 +271,7 @@ fn G(pair: (C, D)) -> D { // CHECK:STDOUT: %F.specific_fn.loc7_52.2 => constants.%F.specific_fn.ed6 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- tuple_value.carbon +// CHECK:STDOUT: --- tuple_value.carbon = $tuple_value // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -565,7 +565,7 @@ fn G(pair: (C, D)) -> D { // CHECK:STDOUT: %bound_method.loc6_65.3 => constants.%bound_method.3ba // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_inconsistent.carbon +// CHECK:STDOUT: --- fail_inconsistent.carbon = $fail_inconsistent // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/deduce/type_operator.carbon b/toolchain/check/testdata/deduce/type_operator.carbon index d5e8b397844e..5e72880faaba 100644 --- a/toolchain/check/testdata/deduce/type_operator.carbon +++ b/toolchain/check/testdata/deduce/type_operator.carbon @@ -72,7 +72,7 @@ fn G(p: C*) -> const C { return F(p); } -// CHECK:STDOUT: --- pointer.carbon +// CHECK:STDOUT: --- pointer.carbon = $pointer // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -250,7 +250,7 @@ fn G(p: C*) -> const C { // CHECK:STDOUT: %F.specific_fn.loc6_36.2 => constants.%F.specific_fn.c73 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- const.carbon +// CHECK:STDOUT: --- const.carbon = $const // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -435,7 +435,7 @@ fn G(p: C*) -> const C { // CHECK:STDOUT: %F.specific_fn.loc6_42.2 => constants.%F.specific_fn.c73 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- nonconst_from_const.carbon +// CHECK:STDOUT: --- nonconst_from_const.carbon = $nonconst_from_const // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -616,7 +616,7 @@ fn G(p: C*) -> const C { // CHECK:STDOUT: %F.specific_fn.loc6_36.2 => constants.%F.specific_fn.016 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_const_from_nonconst.carbon +// CHECK:STDOUT: --- fail_const_from_nonconst.carbon = $fail_const_from_nonconst // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 3b0b8ae962fe..580de3ee4021 100644 --- a/toolchain/check/testdata/deduce/value_with_type_through_access.carbon +++ b/toolchain/check/testdata/deduce/value_with_type_through_access.carbon @@ -109,7 +109,7 @@ fn G() { -// CHECK:STDOUT: --- tuple_access.carbon +// CHECK:STDOUT: --- tuple_access.carbon = $tuple_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -374,7 +374,7 @@ fn G() { // CHECK:STDOUT: %require_complete.loc8_51 => constants.%complete_type // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- struct_access.carbon +// CHECK:STDOUT: --- struct_access.carbon = $struct_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -634,7 +634,7 @@ fn G() { // CHECK:STDOUT: %require_complete.loc8_53 => constants.%complete_type // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_class_access.carbon +// CHECK:STDOUT: --- fail_todo_class_access.carbon = $fail_todo_class_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -960,7 +960,7 @@ fn G() { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_array_index.carbon +// CHECK:STDOUT: --- fail_todo_array_index.carbon = $fail_todo_array_index // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/eval/aggregates.carbon b/toolchain/check/testdata/eval/aggregates.carbon index 1eb590f39a4c..f1104ac2b0c6 100644 --- a/toolchain/check/testdata/eval/aggregates.carbon +++ b/toolchain/check/testdata/eval/aggregates.carbon @@ -58,7 +58,7 @@ fn G(generic N: i32) { } -// CHECK:STDOUT: --- basics.carbon +// CHECK:STDOUT: --- basics.carbon = $basics // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -359,7 +359,7 @@ fn G(generic N: i32) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_array_temporary.carbon +// CHECK:STDOUT: --- fail_todo_array_temporary.carbon = $fail_todo_array_temporary // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -498,7 +498,7 @@ fn G(generic N: i32) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- symbolic.carbon +// CHECK:STDOUT: --- symbolic.carbon = $symbolic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/eval/binding.carbon b/toolchain/check/testdata/eval/binding.carbon index 2ce983701114..91557083443d 100644 --- a/toolchain/check/testdata/eval/binding.carbon +++ b/toolchain/check/testdata/eval/binding.carbon @@ -74,7 +74,7 @@ eval fn G() -> i32 { let n: array(i32, G()) = (1, 2, 3); -// CHECK:STDOUT: --- local.carbon +// CHECK:STDOUT: --- local.carbon = $local // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/eval/branch.carbon b/toolchain/check/testdata/eval/branch.carbon index f072a14b48aa..53ba4e61d295 100644 --- a/toolchain/check/testdata/eval/branch.carbon +++ b/toolchain/check/testdata/eval/branch.carbon @@ -69,7 +69,7 @@ import library "types"; var a: if true then A else B = MakeA(); var b: if false then A else B = MakeB(); -// CHECK:STDOUT: --- if_statement.carbon +// CHECK:STDOUT: --- if_statement.carbon = $if_statement // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -138,7 +138,7 @@ var b: if false then A else B = MakeB(); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- if_expression_in_eval_fn.carbon +// CHECK:STDOUT: --- if_expression_in_eval_fn.carbon = $if_expression_in_eval_fn // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/eval/call.carbon b/toolchain/check/testdata/eval/call.carbon index c392db226568..be0b697e367b 100644 --- a/toolchain/check/testdata/eval/call.carbon +++ b/toolchain/check/testdata/eval/call.carbon @@ -169,7 +169,7 @@ fn H() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- dependent_call_type.carbon +// CHECK:STDOUT: --- dependent_call_type.carbon = $dependent_call_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -320,7 +320,7 @@ fn H() { // CHECK:STDOUT: %.loc11_3.8 => // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- return_in_place_discarded.carbon +// CHECK:STDOUT: --- return_in_place_discarded.carbon = $return_in_place_discarded // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -408,7 +408,7 @@ fn H() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- return_in_place_init.carbon +// CHECK:STDOUT: --- return_in_place_init.carbon = $return_in_place_init // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -513,7 +513,7 @@ fn H() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_return_in_place_tuple.carbon +// CHECK:STDOUT: --- fail_todo_return_in_place_tuple.carbon = $fail_todo_return_in_place_tuple // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -688,7 +688,7 @@ fn H() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- return_in_place_class.carbon +// CHECK:STDOUT: --- return_in_place_class.carbon = $return_in_place_class // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/eval/symbolic.carbon b/toolchain/check/testdata/eval/symbolic.carbon index e2e9792717f6..77e1d2287d58 100644 --- a/toolchain/check/testdata/eval/symbolic.carbon +++ b/toolchain/check/testdata/eval/symbolic.carbon @@ -214,7 +214,7 @@ fn UseN(generic T: type, x: (const T).(J.N)()); // CHECK:STDERR: fn UseN(generic T: type, x: bool); -// CHECK:STDOUT: --- dependent_symbolic_instruction.carbon +// CHECK:STDOUT: --- dependent_symbolic_instruction.carbon = $dependent_symbolic_instruction // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/facet/access.carbon b/toolchain/check/testdata/facet/access.carbon index b2377a5144c4..f8622f01c706 100644 --- a/toolchain/check/testdata/facet/access.carbon +++ b/toolchain/check/testdata/facet/access.carbon @@ -493,7 +493,7 @@ fn F(generic T: Z where C impls NY(.Self)) -> C.(Y(T).Y1) { return {}; } -// CHECK:STDOUT: --- access_assoc_fn.carbon +// CHECK:STDOUT: --- access_assoc_fn.carbon = $access_assoc_fn // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -541,7 +541,7 @@ fn F(generic T: Z where C impls NY(.Self)) -> C.(Y(T).Y1) { // CHECK:STDOUT: %T.loc8_17.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- assoc_fn_using_self.carbon +// CHECK:STDOUT: --- assoc_fn_using_self.carbon = $assoc_fn_using_self // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -598,7 +598,7 @@ fn F(generic T: Z where C impls NY(.Self)) -> C.(Y(T).Y1) { // CHECK:STDOUT: %return.patt.loc8_22.2 => constants.%return.patt.2e6 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- access_assoc_method.carbon +// CHECK:STDOUT: --- access_assoc_method.carbon = $access_assoc_method // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -702,7 +702,7 @@ fn F(generic T: Z where C impls NY(.Self)) -> C.(Y(T).Y1) { // CHECK:STDOUT: %return.patt.loc9_20.2 => constants.%return.patt.2e6 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- access_selfless_method.carbon +// CHECK:STDOUT: --- access_selfless_method.carbon = $access_selfless_method // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -755,7 +755,7 @@ fn F(generic T: Z where C impls NY(.Self)) -> C.(Y(T).Y1) { // CHECK:STDOUT: %x.patt.loc8_15.2 => constants.%x.patt // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- access_assoc_method_indirect.carbon +// CHECK:STDOUT: --- access_assoc_method_indirect.carbon = $access_assoc_method_indirect // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/facet/call_combined_impl_witness.carbon b/toolchain/check/testdata/facet/call_combined_impl_witness.carbon index b71b0486c2de..8bd66fbae02b 100644 --- a/toolchain/check/testdata/facet/call_combined_impl_witness.carbon +++ b/toolchain/check/testdata/facet/call_combined_impl_witness.carbon @@ -45,7 +45,7 @@ fn F() { G({} as C); } -// CHECK:STDOUT: --- call_combined_impl_witness.carbon +// CHECK:STDOUT: --- call_combined_impl_witness.carbon = $call_combined_impl_witness // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/facet/convert_class_type_to_facet_type.carbon b/toolchain/check/testdata/facet/convert_class_type_to_facet_type.carbon index 312421ac638c..04c18d06a64f 100644 --- a/toolchain/check/testdata/facet/convert_class_type_to_facet_type.carbon +++ b/toolchain/check/testdata/facet/convert_class_type_to_facet_type.carbon @@ -23,7 +23,7 @@ fn F() { WalkAnimal(Goat); } -// CHECK:STDOUT: --- convert_class_type_to_facet_type.carbon +// CHECK:STDOUT: --- convert_class_type_to_facet_type.carbon = $convert_class_type_to_facet_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 160d8d428042..95f9b955b780 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 @@ -62,7 +62,7 @@ fn G() { CallGenericMethod(ImplsGeneric, {} as GenericParam); } -// CHECK:STDOUT: --- generic_facet_type.carbon +// CHECK:STDOUT: --- generic_facet_type.carbon = $generic_facet_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -417,7 +417,7 @@ fn G() { // CHECK:STDOUT: %CallGenericMethod.specific_fn.loc22_3.2 => constants.%CallGenericMethod.specific_fn.c3c // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- generic_facet_type_from_implicit_param.carbon +// CHECK:STDOUT: --- generic_facet_type_from_implicit_param.carbon = $generic_facet_type_from_implicit_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 92c66cbf203f..21c446cf0681 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 @@ -23,7 +23,7 @@ fn F() { WalkAnimal({} as Goat); } -// CHECK:STDOUT: --- convert_class_value_to_facet_value_value.carbon +// CHECK:STDOUT: --- convert_class_value_to_facet_value_value.carbon = $convert_class_value_to_facet_value_value // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [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 b18fc36abe47..a26a89b93b8e 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 @@ -104,7 +104,7 @@ fn B() { A({} as C({}, {})); } -// CHECK:STDOUT: --- convert_class_value_to_generic_facet_value_value.carbon +// CHECK:STDOUT: --- convert_class_value_to_generic_facet_value_value.carbon = $convert_class_value_to_generic_facet_value_value // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -544,7 +544,7 @@ fn B() { // CHECK:STDOUT: %specific_impl_fn.loc16_4.2 => constants.%ImplsGeneric.as.Generic.impl.F // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- multiple_generic_params_one_fixed_one_deduced.carbon +// CHECK:STDOUT: --- multiple_generic_params_one_fixed_one_deduced.carbon = $multiple_generic_params_one_fixed_one_deduced // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -856,7 +856,7 @@ fn B() { // CHECK:STDOUT: %require_complete => constants.%complete_type // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_mismatch_impl_constraint_with_fixed_specific.carbon +// CHECK:STDOUT: --- fail_mismatch_impl_constraint_with_fixed_specific.carbon = $fail_mismatch_impl_constraint_with_fixed_specific // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1104,7 +1104,7 @@ fn B() { // CHECK:STDOUT: %t.patt.loc9_28.2 => constants.%t.patt // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_mismatch_impl_self_with_fixed_specific.carbon +// CHECK:STDOUT: --- fail_mismatch_impl_self_with_fixed_specific.carbon = $fail_mismatch_impl_self_with_fixed_specific // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 4d2d6b6c0e2e..9e901baee270 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 @@ -91,7 +91,7 @@ fn F[A: J, B: A](x: C(A, B)) { //@dump-sem-ir-end } -// CHECK:STDOUT: --- explicit_as_type.carbon +// CHECK:STDOUT: --- explicit_as_type.carbon = $explicit_as_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -125,7 +125,7 @@ fn F[A: J, B: A](x: C(A, B)) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- facet_type_in_type_position.carbon +// CHECK:STDOUT: --- facet_type_in_type_position.carbon = $facet_type_in_type_position // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -251,7 +251,7 @@ fn F[A: J, B: A](x: C(A, B)) { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc26_8.2(%self.param: ref %Goat) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- facet_access_type_converts_back_to_original_facet_value.carbon +// CHECK:STDOUT: --- facet_access_type_converts_back_to_original_facet_value.carbon = $facet_access_type_converts_back_to_original_facet_value // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/facet/convert_facet_value_to_itself.carbon b/toolchain/check/testdata/facet/convert_facet_value_to_itself.carbon index 197315cf8a89..244e5b317192 100644 --- a/toolchain/check/testdata/facet/convert_facet_value_to_itself.carbon +++ b/toolchain/check/testdata/facet/convert_facet_value_to_itself.carbon @@ -25,7 +25,7 @@ fn F() { HandleAnimal(Goat); } -// CHECK:STDOUT: --- convert_facet_value_to_itself.carbon +// CHECK:STDOUT: --- convert_facet_value_to_itself.carbon = $convert_facet_value_to_itself // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 ae073eb7ce92..7b6b65728f59 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 @@ -89,7 +89,7 @@ fn CallsWithTypeExplicit(generic U: type) { TakesExtraWhereExplicit(U); } -// CHECK:STDOUT: --- convert_to_narrowed_facet_type.carbon +// CHECK:STDOUT: --- convert_to_narrowed_facet_type.carbon = $convert_to_narrowed_facet_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -304,7 +304,7 @@ fn CallsWithTypeExplicit(generic U: type) { // CHECK:STDOUT: %require_complete => constants.%require_complete.ad2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- bigger.carbon +// CHECK:STDOUT: --- bigger.carbon = $bigger // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -554,7 +554,7 @@ fn CallsWithTypeExplicit(generic U: type) { // CHECK:STDOUT: %require_complete => constants.%require_complete.ec1 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- with_blanket.carbon +// CHECK:STDOUT: --- with_blanket.carbon = $with_blanket // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -862,7 +862,7 @@ fn CallsWithTypeExplicit(generic U: type) { // CHECK:STDOUT: %require_complete => constants.%require_complete.837 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- equivalent.carbon +// CHECK:STDOUT: --- equivalent.carbon = $equivalent // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1052,7 +1052,7 @@ fn CallsWithTypeExplicit(generic U: type) { // CHECK:STDOUT: %require_complete => constants.%require_complete.94f9a3.2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- no_interfaces_success.carbon +// CHECK:STDOUT: --- no_interfaces_success.carbon = $no_interfaces_success // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1288,7 +1288,7 @@ fn CallsWithTypeExplicit(generic U: type) { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- no_interfaces.carbon +// CHECK:STDOUT: --- no_interfaces.carbon = $no_interfaces // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 88dc4e85e300..297a1395e305 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 @@ -21,7 +21,7 @@ fn Feed[T: Eats](unused e: T) {} fn HandleAnimal[T: Animal](a: T) { Feed(a); } -// CHECK:STDOUT: --- convert_facet_value_value_to_blanket_impl.carbon +// CHECK:STDOUT: --- convert_facet_value_value_to_blanket_impl.carbon = $convert_facet_value_value_to_blanket_impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 2c75cc9c1cbe..d3d6d5f25408 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 @@ -35,7 +35,7 @@ fn F() { HandleAnimal({} as Goat, {} as Grass); } -// CHECK:STDOUT: --- convert_facet_value_value_to_generic_facet_value_value.carbon +// CHECK:STDOUT: --- convert_facet_value_value_to_generic_facet_value_value.carbon = $convert_facet_value_value_to_generic_facet_value_value // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 d1ff529cdc64..1d53421dafe2 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 @@ -25,7 +25,7 @@ fn F() { HandleAnimal({} as Goat); } -// CHECK:STDOUT: --- convert_facet_value_value_to_itself.carbon +// CHECK:STDOUT: --- convert_facet_value_value_to_itself.carbon = $convert_facet_value_value_to_itself // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/facet/convert_interface.carbon b/toolchain/check/testdata/facet/convert_interface.carbon index e77c04b71b2f..4d82c1036a44 100644 --- a/toolchain/check/testdata/facet/convert_interface.carbon +++ b/toolchain/check/testdata/facet/convert_interface.carbon @@ -22,7 +22,7 @@ impl Animal as Eats {} fn F(unused e: Eats) {} fn G() { F(Animal); } -// CHECK:STDOUT: --- convert_interface.carbon +// CHECK:STDOUT: --- convert_interface.carbon = $convert_interface // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/facet/facet_assoc_const.carbon b/toolchain/check/testdata/facet/facet_assoc_const.carbon index bbf00d54223f..2ac360825b75 100644 --- a/toolchain/check/testdata/facet/facet_assoc_const.carbon +++ b/toolchain/check/testdata/facet/facet_assoc_const.carbon @@ -739,7 +739,7 @@ interface J { // that it does not resolve further. fn F(unused generic T: I & J where .I1 = .J1.I2) {} -// CHECK:STDOUT: --- fail_cycle.carbon +// CHECK:STDOUT: --- fail_cycle.carbon = $fail_cycle // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/facet/fail_convert_class_type_to_generic_facet_value.carbon b/toolchain/check/testdata/facet/fail_convert_class_type_to_generic_facet_value.carbon index 07687d6a4a4c..8da1c863683c 100644 --- a/toolchain/check/testdata/facet/fail_convert_class_type_to_generic_facet_value.carbon +++ b/toolchain/check/testdata/facet/fail_convert_class_type_to_generic_facet_value.carbon @@ -43,7 +43,7 @@ fn G() { CallGenericMethod(WrongGenericParam, ImplsGeneric); } -// CHECK:STDOUT: --- fail_convert_class_type_to_generic_facet_value.carbon +// CHECK:STDOUT: --- fail_convert_class_type_to_generic_facet_value.carbon = $fail_convert_class_type_to_generic_facet_value // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 8674438d4240..a30f9ec69e0f 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 @@ -33,7 +33,7 @@ fn Feed[T: Eats](unused e: T) {} // CHECK:STDERR: fn HandleAnimal[T: Animal](a: T) { Feed(a); } -// CHECK:STDOUT: --- fail_convert_facet_value_to_missing_impl.carbon +// CHECK:STDOUT: --- fail_convert_facet_value_to_missing_impl.carbon = $fail_convert_facet_value_to_missing_impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/facet/fail_convert_type_erased_type_to_facet.carbon b/toolchain/check/testdata/facet/fail_convert_type_erased_type_to_facet.carbon index 173a34883718..89b8de0dd928 100644 --- a/toolchain/check/testdata/facet/fail_convert_type_erased_type_to_facet.carbon +++ b/toolchain/check/testdata/facet/fail_convert_type_erased_type_to_facet.carbon @@ -33,7 +33,7 @@ fn F() { WalkAnimal(x); } -// CHECK:STDOUT: --- fail_convert_type_erased_type_to_facet.carbon +// CHECK:STDOUT: --- fail_convert_type_erased_type_to_facet.carbon = $fail_convert_type_erased_type_to_facet // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 067e13cb7a18..66fb90d9555a 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 @@ -46,7 +46,7 @@ fn G(holds_to: HoldsType((RuntimeConvertTo, )), generic from: RuntimeConvertFrom } -// CHECK:STDOUT: --- fail_deduction_uses_runtime_type_conversion.carbon +// CHECK:STDOUT: --- fail_deduction_uses_runtime_type_conversion.carbon = $fail_deduction_uses_runtime_type_conversion // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/facet/period_self.carbon b/toolchain/check/testdata/facet/period_self.carbon index b37443d324d9..2c230ee7ec33 100644 --- a/toolchain/check/testdata/facet/period_self.carbon +++ b/toolchain/check/testdata/facet/period_self.carbon @@ -1019,7 +1019,7 @@ fn F() { () as (Z where .Z1 = ()); } -// CHECK:STDOUT: --- period_self_param.carbon +// CHECK:STDOUT: --- period_self_param.carbon = $period_self_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1319,7 +1319,7 @@ fn F() { // CHECK:STDOUT: %T.as_type.loc12_54.1 => constants.%T.as_type // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- period_self_in_function_generic_argument.carbon +// CHECK:STDOUT: --- period_self_in_function_generic_argument.carbon = $period_self_in_function_generic_argument // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/facet/require_import.carbon b/toolchain/check/testdata/facet/require_import.carbon index af457791fd25..f01d2c4b59a7 100644 --- a/toolchain/check/testdata/facet/require_import.carbon +++ b/toolchain/check/testdata/facet/require_import.carbon @@ -54,7 +54,7 @@ fn F(generic B: Y) { B.F(); } -// CHECK:STDOUT: --- a.impl.carbon +// CHECK:STDOUT: --- a.impl.carbon = $a.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/facet/runtime_value.carbon b/toolchain/check/testdata/facet/runtime_value.carbon index f5aa8f845302..4993f766bb91 100644 --- a/toolchain/check/testdata/facet/runtime_value.carbon +++ b/toolchain/check/testdata/facet/runtime_value.carbon @@ -187,7 +187,7 @@ fn F(T: type) { T.G(); } -// CHECK:STDOUT: --- facet_value_copy_from_reference.carbon +// CHECK:STDOUT: --- facet_value_copy_from_reference.carbon = $facet_value_copy_from_reference // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -212,7 +212,7 @@ fn F(T: type) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_facet_copy_narrowing_from_reference.carbon +// CHECK:STDOUT: --- fail_todo_facet_copy_narrowing_from_reference.carbon = $fail_todo_facet_copy_narrowing_from_reference // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/facet/self_in_interface_param.carbon b/toolchain/check/testdata/facet/self_in_interface_param.carbon index 99603e890c5c..d389fcee32a2 100644 --- a/toolchain/check/testdata/facet/self_in_interface_param.carbon +++ b/toolchain/check/testdata/facet/self_in_interface_param.carbon @@ -22,7 +22,7 @@ fn F(generic T: I(.Self) where .I1 = ()) -> T.I1 { fn G(generic _: I(.Self) where .I1 = ()) {} -// CHECK:STDOUT: --- self_in_interface_param.carbon +// CHECK:STDOUT: --- self_in_interface_param.carbon = $self_in_interface_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/facet/validate_rewrite_constraints.carbon b/toolchain/check/testdata/facet/validate_rewrite_constraints.carbon index 8fca023b6df7..18a081536166 100644 --- a/toolchain/check/testdata/facet/validate_rewrite_constraints.carbon +++ b/toolchain/check/testdata/facet/validate_rewrite_constraints.carbon @@ -1621,7 +1621,7 @@ fn G(generic T: N) { F(T); } -// CHECK:STDOUT: --- rewrite_provided_by_facet_type.carbon +// CHECK:STDOUT: --- rewrite_provided_by_facet_type.carbon = $rewrite_provided_by_facet_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/for/actual.carbon b/toolchain/check/testdata/for/actual.carbon index 80d175eac562..ad39e1f13e9f 100644 --- a/toolchain/check/testdata/for/actual.carbon +++ b/toolchain/check/testdata/for/actual.carbon @@ -50,7 +50,7 @@ fn Read(generic y: Core.IntLiteral) { } -// CHECK:STDOUT: --- lib.carbon +// CHECK:STDOUT: --- lib.carbon = $lib // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -929,7 +929,7 @@ fn Read(generic y: Core.IntLiteral) { // CHECK:STDOUT: %specific_impl_fn.loc6_22.2 => constants.%Int.as.Copy.impl.Op.specific_fn // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- trivial.carbon +// CHECK:STDOUT: --- trivial.carbon = $trivial // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/for/basic.carbon b/toolchain/check/testdata/for/basic.carbon index a36e0ab4a151..75061f30716b 100644 --- a/toolchain/check/testdata/for/basic.carbon +++ b/toolchain/check/testdata/for/basic.carbon @@ -54,7 +54,7 @@ fn Run() { } -// CHECK:STDOUT: --- trivial.carbon +// CHECK:STDOUT: --- trivial.carbon = $trivial // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/for/pattern.carbon b/toolchain/check/testdata/for/pattern.carbon index 30a3899b4d25..5adae6989ace 100644 --- a/toolchain/check/testdata/for/pattern.carbon +++ b/toolchain/check/testdata/for/pattern.carbon @@ -120,7 +120,7 @@ fn Run() { } -// CHECK:STDOUT: --- value.carbon +// CHECK:STDOUT: --- value.carbon = $value // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -386,7 +386,7 @@ fn Run() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc10_35(%self.param: ref %EmptyRange.c31) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- var.carbon +// CHECK:STDOUT: --- var.carbon = $var // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -662,7 +662,7 @@ fn Run() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc10_39(%self.param: ref %EmptyRange.c31) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- tuple.carbon +// CHECK:STDOUT: --- tuple.carbon = $tuple // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -970,7 +970,7 @@ fn Run() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc10_60(%self.param: ref %EmptyRange.7d6) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- tuple_class.carbon +// CHECK:STDOUT: --- tuple_class.carbon = $tuple_class // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/builtin/adapted_type.carbon b/toolchain/check/testdata/function/builtin/adapted_type.carbon index 38afb711d237..ca36e12635e1 100644 --- a/toolchain/check/testdata/function/builtin/adapted_type.carbon +++ b/toolchain/check/testdata/function/builtin/adapted_type.carbon @@ -54,7 +54,7 @@ class MyIntLiteral { // CHECK:STDERR: fn Int(N: MyIntLiteral) -> type = "int.make_type_signed"; -// CHECK:STDOUT: --- adapt.carbon +// CHECK:STDOUT: --- adapt.carbon = $adapt // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -263,7 +263,7 @@ fn Int(N: MyIntLiteral) -> type = "int.make_type_signed"; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_bad_adapt.carbon +// CHECK:STDOUT: --- fail_bad_adapt.carbon = $fail_bad_adapt // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/builtin/call.carbon b/toolchain/check/testdata/function/builtin/call.carbon index d88707bbaa1c..cfeebd49b554 100644 --- a/toolchain/check/testdata/function/builtin/call.carbon +++ b/toolchain/check/testdata/function/builtin/call.carbon @@ -20,7 +20,7 @@ fn RuntimeCall(a: i32, b: i32) -> i32 { return Add(a, b); } -// CHECK:STDOUT: --- call.carbon +// CHECK:STDOUT: --- call.carbon = $call // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/builtin/call_from_operator.carbon b/toolchain/check/testdata/function/builtin/call_from_operator.carbon index d17183d054a3..0ac2b0b0a936 100644 --- a/toolchain/check/testdata/function/builtin/call_from_operator.carbon +++ b/toolchain/check/testdata/function/builtin/call_from_operator.carbon @@ -56,7 +56,7 @@ import Core; var arr: array(i32, (1 as i32) + (2 as i32)) = (3, 4, (3 as i32) + (4 as i32)); -// CHECK:STDOUT: --- core.carbon +// CHECK:STDOUT: --- core.carbon = $core // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -865,7 +865,7 @@ var arr: array(i32, (1 as i32) + (2 as i32)) = (3, 4, (3 as i32) + (4 as i32)); // CHECK:STDOUT: %return.patt.loc18_20.2 => constants.%return.patt.cd4 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- user.carbon +// CHECK:STDOUT: --- user.carbon = $user // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/builtin/definition.carbon b/toolchain/check/testdata/function/builtin/definition.carbon index c7a282e7f13c..74746afb3a2c 100644 --- a/toolchain/check/testdata/function/builtin/definition.carbon +++ b/toolchain/check/testdata/function/builtin/definition.carbon @@ -14,7 +14,7 @@ fn Add(a: i32, b: i32) -> i32 = "int.sadd"; -// CHECK:STDOUT: --- definition.carbon +// CHECK:STDOUT: --- definition.carbon = $definition // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/builtin/fail_redefined.carbon b/toolchain/check/testdata/function/builtin/fail_redefined.carbon index 78546e760010..833287830118 100644 --- a/toolchain/check/testdata/function/builtin/fail_redefined.carbon +++ b/toolchain/check/testdata/function/builtin/fail_redefined.carbon @@ -51,7 +51,7 @@ fn C(n: i32, m: i32) -> i32 = "int.sadd"; // CHECK:STDERR: fn C(n: i32, m: i32) -> i32 = "int.sadd"; -// CHECK:STDOUT: --- fail_redefined.carbon +// CHECK:STDOUT: --- fail_redefined.carbon = $fail_redefined // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/builtin/fail_unknown.carbon b/toolchain/check/testdata/function/builtin/fail_unknown.carbon index 876fdeebca22..5d63effc29a5 100644 --- a/toolchain/check/testdata/function/builtin/fail_unknown.carbon +++ b/toolchain/check/testdata/function/builtin/fail_unknown.carbon @@ -22,7 +22,7 @@ // CHECK:STDERR: fn UnknownBuiltin() = "unknown.builtin.name"; -// CHECK:STDOUT: --- fail_unknown.carbon +// CHECK:STDOUT: --- fail_unknown.carbon = $fail_unknown // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/builtin/import.carbon b/toolchain/check/testdata/function/builtin/import.carbon index 1f261290991a..f179ac509371 100644 --- a/toolchain/check/testdata/function/builtin/import.carbon +++ b/toolchain/check/testdata/function/builtin/import.carbon @@ -33,7 +33,7 @@ import Core library "core"; var arr: array(i32, Core.AsIntLiteral(Core.TestAdd(Core.AsI32(1), Core.AsI32(2)))) = (Core.AsI32(1), Core.AsI32(2), Core.AsI32(3)); -// CHECK:STDOUT: --- core.carbon +// CHECK:STDOUT: --- core.carbon = $core // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -193,7 +193,7 @@ var arr: array(i32, Core.AsIntLiteral(Core.TestAdd(Core.AsI32(1), Core.AsI32(2)) // CHECK:STDOUT: // CHECK:STDOUT: fn @TestAdd(%a.param: %i32.builtin, %b.param: %i32.builtin) -> out %return.param: %i32.builtin = "int.sadd"; // CHECK:STDOUT: -// CHECK:STDOUT: --- use.carbon +// CHECK:STDOUT: --- use.carbon = $use // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/builtin/method.carbon b/toolchain/check/testdata/function/builtin/method.carbon index 60b62d6a4785..cc67bf36ca9f 100644 --- a/toolchain/check/testdata/function/builtin/method.carbon +++ b/toolchain/check/testdata/function/builtin/method.carbon @@ -23,7 +23,7 @@ impl i32 as I { var arr: array(i32, (1 as i32).(I.F)(2)); -// CHECK:STDOUT: --- method.carbon +// CHECK:STDOUT: --- method.carbon = $method // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/builtin/positional.carbon b/toolchain/check/testdata/function/builtin/positional.carbon index 69716b11f154..1f23bbde168c 100644 --- a/toolchain/check/testdata/function/builtin/positional.carbon +++ b/toolchain/check/testdata/function/builtin/positional.carbon @@ -46,7 +46,7 @@ fn Add -> i32 = "int.sadd"; // CHECK:STDERR: fn Mul = "int.smul"; -// CHECK:STDOUT: --- fail_positional.carbon +// CHECK:STDOUT: --- fail_positional.carbon = $fail_positional // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/call/alias.carbon b/toolchain/check/testdata/function/call/alias.carbon index 773ae0c7b648..bfddf4098b0e 100644 --- a/toolchain/check/testdata/function/call/alias.carbon +++ b/toolchain/check/testdata/function/call/alias.carbon @@ -20,7 +20,7 @@ fn Main() { var unused b: () = B(); } -// CHECK:STDOUT: --- alias.carbon +// CHECK:STDOUT: --- alias.carbon = $alias // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/call/default_values.carbon b/toolchain/check/testdata/function/call/default_values.carbon index 02c43a87a126..d2837b9b3d54 100644 --- a/toolchain/check/testdata/function/call/default_values.carbon +++ b/toolchain/check/testdata/function/call/default_values.carbon @@ -108,7 +108,7 @@ fn G() { //@dump-sem-ir-end -// CHECK:STDOUT: --- imported_callee.impl.carbon +// CHECK:STDOUT: --- imported_callee.impl.carbon = $imported_callee.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -167,7 +167,7 @@ fn G() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc7_6.2(%self.param: ref %C) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- tuple_defaults_fully_specified.carbon +// CHECK:STDOUT: --- tuple_defaults_fully_specified.carbon = $tuple_defaults_fully_specified // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -297,7 +297,7 @@ fn G() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8_6.2(%self.param: ref %C) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- single_argument.carbon +// CHECK:STDOUT: --- single_argument.carbon = $single_argument // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/call/empty_struct.carbon b/toolchain/check/testdata/function/call/empty_struct.carbon index 52cde4804e67..c843d0241d6d 100644 --- a/toolchain/check/testdata/function/call/empty_struct.carbon +++ b/toolchain/check/testdata/function/call/empty_struct.carbon @@ -20,7 +20,7 @@ fn Main() { Echo({}); } -// CHECK:STDOUT: --- empty_struct.carbon +// CHECK:STDOUT: --- empty_struct.carbon = $empty_struct // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/call/empty_tuple.carbon b/toolchain/check/testdata/function/call/empty_tuple.carbon index 590d31118ed6..8f015ad24254 100644 --- a/toolchain/check/testdata/function/call/empty_tuple.carbon +++ b/toolchain/check/testdata/function/call/empty_tuple.carbon @@ -20,7 +20,7 @@ fn Main() { Echo(()); } -// CHECK:STDOUT: --- empty_tuple.carbon +// CHECK:STDOUT: --- empty_tuple.carbon = $empty_tuple // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/call/fail_param_count.carbon b/toolchain/check/testdata/function/call/fail_param_count.carbon index d58b441601ca..b5f57efdfdb8 100644 --- a/toolchain/check/testdata/function/call/fail_param_count.carbon +++ b/toolchain/check/testdata/function/call/fail_param_count.carbon @@ -93,7 +93,7 @@ fn Main() { Run2(0); } -// CHECK:STDOUT: --- fail_param_count.carbon +// CHECK:STDOUT: --- fail_param_count.carbon = $fail_param_count // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/call/fail_param_type.carbon b/toolchain/check/testdata/function/call/fail_param_type.carbon index 2a9829690959..3449eec6eefb 100644 --- a/toolchain/check/testdata/function/call/fail_param_type.carbon +++ b/toolchain/check/testdata/function/call/fail_param_type.carbon @@ -33,7 +33,7 @@ fn F() { G(1.0); } -// CHECK:STDOUT: --- fail_param_type.carbon +// CHECK:STDOUT: --- fail_param_type.carbon = $fail_param_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 b11d26eef549..a14224119dc0 100644 --- a/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon +++ b/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon @@ -27,7 +27,7 @@ fn Run() { var unused x: i32 = Foo(); } -// CHECK:STDOUT: --- fail_return_type_mismatch.carbon +// CHECK:STDOUT: --- fail_return_type_mismatch.carbon = $fail_return_type_mismatch // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/call/fail_runtime_implicit_param.carbon b/toolchain/check/testdata/function/call/fail_runtime_implicit_param.carbon index f445f660aa6d..e81fa14e2a21 100644 --- a/toolchain/check/testdata/function/call/fail_runtime_implicit_param.carbon +++ b/toolchain/check/testdata/function/call/fail_runtime_implicit_param.carbon @@ -25,7 +25,7 @@ fn Run() { F(); } -// CHECK:STDOUT: --- fail_runtime_implicit_param.carbon +// CHECK:STDOUT: --- fail_runtime_implicit_param.carbon = $fail_runtime_implicit_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/call/form.carbon b/toolchain/check/testdata/function/call/form.carbon index 2144c5b89475..69524ac2e6e3 100644 --- a/toolchain/check/testdata/function/call/form.carbon +++ b/toolchain/check/testdata/function/call/form.carbon @@ -417,7 +417,7 @@ fn G() { let unused z: i32 = F(form(val i32), v); } -// CHECK:STDOUT: --- ref_form_param.carbon +// CHECK:STDOUT: --- ref_form_param.carbon = $ref_form_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -459,7 +459,7 @@ fn G() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- var_form_param.carbon +// CHECK:STDOUT: --- var_form_param.carbon = $var_form_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -550,7 +550,7 @@ fn G() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc4(%self.param: ref %i32) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- val_form_param.carbon +// CHECK:STDOUT: --- val_form_param.carbon = $val_form_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -617,7 +617,7 @@ fn G() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- type_component_needs_conversion.carbon +// CHECK:STDOUT: --- type_component_needs_conversion.carbon = $type_component_needs_conversion // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -649,7 +649,7 @@ fn G() { // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%x.param: ref %empty_tuple.type); // CHECK:STDOUT: -// CHECK:STDOUT: --- ref_return_form.carbon +// CHECK:STDOUT: --- ref_return_form.carbon = $ref_return_form // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -691,7 +691,7 @@ fn G() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- var_return_form.carbon +// CHECK:STDOUT: --- var_return_form.carbon = $var_return_form // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -762,7 +762,7 @@ fn G() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc9(%self.param: ref %i32) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- val_return_form.carbon +// CHECK:STDOUT: --- val_return_form.carbon = $val_return_form // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -804,7 +804,7 @@ fn G() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- val_return_form_definition.carbon +// CHECK:STDOUT: --- val_return_form_definition.carbon = $val_return_form_definition // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -864,7 +864,7 @@ fn G() { // CHECK:STDOUT: return %.loc5_11.2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- ref_return_class.carbon +// CHECK:STDOUT: --- ref_return_class.carbon = $ref_return_class // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -899,7 +899,7 @@ fn G() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- val_return_class.carbon +// CHECK:STDOUT: --- val_return_class.carbon = $val_return_class // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -934,7 +934,7 @@ fn G() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- ref_return_class_generic.carbon +// CHECK:STDOUT: --- ref_return_class_generic.carbon = $ref_return_class_generic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -991,7 +991,7 @@ fn G() { // CHECK:STDOUT: %x.patt.loc9_13.2 => constants.%x.patt // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- form_generic_return.carbon +// CHECK:STDOUT: --- form_generic_return.carbon = $form_generic_return // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/call/i32.carbon b/toolchain/check/testdata/function/call/i32.carbon index 11dff53c3f9c..f9925e4607a0 100644 --- a/toolchain/check/testdata/function/call/i32.carbon +++ b/toolchain/check/testdata/function/call/i32.carbon @@ -20,7 +20,7 @@ fn Main() { var unused b: i32 = Echo(1); } -// CHECK:STDOUT: --- i32.carbon +// CHECK:STDOUT: --- i32.carbon = $i32 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/call/more_param_ir.carbon b/toolchain/check/testdata/function/call/more_param_ir.carbon index acf7f68119e9..f466cdba38ed 100644 --- a/toolchain/check/testdata/function/call/more_param_ir.carbon +++ b/toolchain/check/testdata/function/call/more_param_ir.carbon @@ -20,7 +20,7 @@ fn Main() { Foo(x.0, 6); } -// CHECK:STDOUT: --- more_param_ir.carbon +// CHECK:STDOUT: --- more_param_ir.carbon = $more_param_ir // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/call/params_one.carbon b/toolchain/check/testdata/function/call/params_one.carbon index 1abbcf9f8278..750fd07bb1ca 100644 --- a/toolchain/check/testdata/function/call/params_one.carbon +++ b/toolchain/check/testdata/function/call/params_one.carbon @@ -18,7 +18,7 @@ fn Main() { Foo(1); } -// CHECK:STDOUT: --- params_one.carbon +// CHECK:STDOUT: --- params_one.carbon = $params_one // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/call/params_one_comma.carbon b/toolchain/check/testdata/function/call/params_one_comma.carbon index 0864db5758c8..b8aa02af284d 100644 --- a/toolchain/check/testdata/function/call/params_one_comma.carbon +++ b/toolchain/check/testdata/function/call/params_one_comma.carbon @@ -19,7 +19,7 @@ fn Main() { Foo(1,); } -// CHECK:STDOUT: --- params_one_comma.carbon +// CHECK:STDOUT: --- params_one_comma.carbon = $params_one_comma // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/call/params_two.carbon b/toolchain/check/testdata/function/call/params_two.carbon index ecc4577b8cd9..11acdee58372 100644 --- a/toolchain/check/testdata/function/call/params_two.carbon +++ b/toolchain/check/testdata/function/call/params_two.carbon @@ -18,7 +18,7 @@ fn Main() { Foo(1, 2); } -// CHECK:STDOUT: --- params_two.carbon +// CHECK:STDOUT: --- params_two.carbon = $params_two // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/call/params_two_comma.carbon b/toolchain/check/testdata/function/call/params_two_comma.carbon index fea6388313f8..1fd8836fc9b5 100644 --- a/toolchain/check/testdata/function/call/params_two_comma.carbon +++ b/toolchain/check/testdata/function/call/params_two_comma.carbon @@ -19,7 +19,7 @@ fn Main() { Foo(1, 2,); } -// CHECK:STDOUT: --- params_two_comma.carbon +// CHECK:STDOUT: --- params_two_comma.carbon = $params_two_comma // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/call/params_zero.carbon b/toolchain/check/testdata/function/call/params_zero.carbon index f012e3a60add..703b69f2f88a 100644 --- a/toolchain/check/testdata/function/call/params_zero.carbon +++ b/toolchain/check/testdata/function/call/params_zero.carbon @@ -18,7 +18,7 @@ fn Main() { Foo(); } -// CHECK:STDOUT: --- params_zero.carbon +// CHECK:STDOUT: --- params_zero.carbon = $params_zero // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/call/prefer_unqualified_lookup.carbon b/toolchain/check/testdata/function/call/prefer_unqualified_lookup.carbon index 06e337819f2e..5e7e8d4dbc30 100644 --- a/toolchain/check/testdata/function/call/prefer_unqualified_lookup.carbon +++ b/toolchain/check/testdata/function/call/prefer_unqualified_lookup.carbon @@ -27,7 +27,7 @@ class Class(F: type) { fn Class(F: type).Inner.G() -> i32 { return F(); } -// CHECK:STDOUT: --- prefer_unqualified_lookup.carbon +// CHECK:STDOUT: --- prefer_unqualified_lookup.carbon = $prefer_unqualified_lookup // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/call/ref.carbon b/toolchain/check/testdata/function/call/ref.carbon index 6711af9c32ac..b1f4dd8449a9 100644 --- a/toolchain/check/testdata/function/call/ref.carbon +++ b/toolchain/check/testdata/function/call/ref.carbon @@ -127,7 +127,7 @@ class D { extend base: C; } fn F(ref c: C); fn G(ref d: D) { F(ref d); } -// CHECK:STDOUT: --- basics.carbon +// CHECK:STDOUT: --- basics.carbon = $basics // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -224,7 +224,7 @@ fn G(ref d: D) { F(ref d); } // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8(%self.param: ref %i32) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- class.carbon +// CHECK:STDOUT: --- class.carbon = $class // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/call/return_implicit.carbon b/toolchain/check/testdata/function/call/return_implicit.carbon index c09e10a18f94..0869f70ac9a5 100644 --- a/toolchain/check/testdata/function/call/return_implicit.carbon +++ b/toolchain/check/testdata/function/call/return_implicit.carbon @@ -19,7 +19,7 @@ fn Main() { var unused b: () = MakeImplicitEmptyTuple(); } -// CHECK:STDOUT: --- return_implicit.carbon +// CHECK:STDOUT: --- return_implicit.carbon = $return_implicit // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/capture/uncaptured_locals.carbon b/toolchain/check/testdata/function/capture/uncaptured_locals.carbon index ee6945536c6b..3948531f7c58 100644 --- a/toolchain/check/testdata/function/capture/uncaptured_locals.carbon +++ b/toolchain/check/testdata/function/capture/uncaptured_locals.carbon @@ -342,7 +342,7 @@ fn Outer(generic T: type, p: i32) -> i32 { return Nested(); } -// CHECK:STDOUT: --- allowed_scopes.carbon +// CHECK:STDOUT: --- allowed_scopes.carbon = $allowed_scopes // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/declaration/default_values.carbon b/toolchain/check/testdata/function/declaration/default_values.carbon index 8d4620bf16c8..326bab6844cd 100644 --- a/toolchain/check/testdata/function/declaration/default_values.carbon +++ b/toolchain/check/testdata/function/declaration/default_values.carbon @@ -179,7 +179,7 @@ class C {} fn F(x: C = {}); //@dump-sem-ir-end -// CHECK:STDOUT: --- implicit.carbon +// CHECK:STDOUT: --- implicit.carbon = $implicit // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -232,7 +232,7 @@ fn F(x: C = {}); // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%a.param: %D); // CHECK:STDOUT: -// CHECK:STDOUT: --- nested.carbon +// CHECK:STDOUT: --- nested.carbon = $nested // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -345,7 +345,7 @@ fn F(x: C = {}); // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%a.param: %C, %b.param: %C, %c.param: %C, %d.param: %C, %e.param: %C); // CHECK:STDOUT: -// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: --- basic.carbon = $basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/declaration/export_name.carbon b/toolchain/check/testdata/function/declaration/export_name.carbon index b6760ca3cc52..ca0a1cf7794b 100644 --- a/toolchain/check/testdata/function/declaration/export_name.carbon +++ b/toolchain/check/testdata/function/declaration/export_name.carbon @@ -42,7 +42,7 @@ import library "export"; var f: () = F(); -// CHECK:STDOUT: --- base.carbon +// CHECK:STDOUT: --- base.carbon = $base // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -59,7 +59,7 @@ var f: () = F(); // CHECK:STDOUT: // CHECK:STDOUT: fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: --- export.carbon +// CHECK:STDOUT: --- export.carbon = $export // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -81,7 +81,7 @@ var f: () = F(); // CHECK:STDOUT: // CHECK:STDOUT: fn @F [from "base.carbon"]; // CHECK:STDOUT: -// CHECK:STDOUT: --- use_export.carbon +// CHECK:STDOUT: --- use_export.carbon = $use_export // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/declaration/extern.carbon b/toolchain/check/testdata/function/declaration/extern.carbon index 8516c19e6da3..683851ce2876 100644 --- a/toolchain/check/testdata/function/declaration/extern.carbon +++ b/toolchain/check/testdata/function/declaration/extern.carbon @@ -101,7 +101,7 @@ import library "basic"; // CHECK:STDERR: extern library "basic" fn F(); -// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: --- basic.carbon = $basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -118,7 +118,7 @@ extern library "basic" fn F(); // CHECK:STDOUT: // CHECK:STDOUT: extern fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: --- basic_use.carbon +// CHECK:STDOUT: --- basic_use.carbon = $basic_use // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -163,7 +163,7 @@ extern library "basic" fn F(); // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_redecl.carbon +// CHECK:STDOUT: --- fail_redecl.carbon = $fail_redecl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -181,7 +181,7 @@ extern library "basic" fn F(); // CHECK:STDOUT: // CHECK:STDOUT: extern fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_redecl_extern.carbon +// CHECK:STDOUT: --- fail_redecl_extern.carbon = $fail_redecl_extern // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -199,7 +199,7 @@ extern library "basic" fn F(); // CHECK:STDOUT: // CHECK:STDOUT: extern fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_member_extern.carbon +// CHECK:STDOUT: --- fail_member_extern.carbon = $fail_member_extern // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -245,7 +245,7 @@ extern library "basic" fn F(); // CHECK:STDOUT: // CHECK:STDOUT: fn @C.G(%self.param: %C); // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_extern_library_in_importer.carbon +// CHECK:STDOUT: --- fail_extern_library_in_importer.carbon = $fail_extern_library_in_importer // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/declaration/extern_library.carbon b/toolchain/check/testdata/function/declaration/extern_library.carbon index 13cb7c366ac1..dc2b245b87c2 100644 --- a/toolchain/check/testdata/function/declaration/extern_library.carbon +++ b/toolchain/check/testdata/function/declaration/extern_library.carbon @@ -198,7 +198,7 @@ library "[[@TEST_NAME]]"; // CHECK:STDERR: extern library "extern_library_owner" fn F() {} -// CHECK:STDOUT: --- extern_library.carbon +// CHECK:STDOUT: --- extern_library.carbon = $extern_library // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -215,7 +215,7 @@ extern library "extern_library_owner" fn F() {} // CHECK:STDOUT: // CHECK:STDOUT: extern fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: --- extern_library_owner.carbon +// CHECK:STDOUT: --- extern_library_owner.carbon = $extern_library_owner // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -233,7 +233,7 @@ extern library "extern_library_owner" fn F() {} // CHECK:STDOUT: // CHECK:STDOUT: extern fn @F; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_extern_library_nonowner.carbon +// CHECK:STDOUT: --- fail_extern_library_nonowner.carbon = $fail_extern_library_nonowner // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -251,7 +251,7 @@ extern library "extern_library_owner" fn F() {} // CHECK:STDOUT: // CHECK:STDOUT: extern fn @F; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_extern_library_nonextern.carbon +// CHECK:STDOUT: --- fail_extern_library_nonextern.carbon = $fail_extern_library_nonextern // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -269,7 +269,7 @@ extern library "extern_library_owner" fn F() {} // CHECK:STDOUT: // CHECK:STDOUT: extern fn @F; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_extern_library_redecl.carbon +// CHECK:STDOUT: --- fail_extern_library_redecl.carbon = $fail_extern_library_redecl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -287,7 +287,7 @@ extern library "extern_library_owner" fn F() {} // CHECK:STDOUT: // CHECK:STDOUT: extern fn @F; // CHECK:STDOUT: -// CHECK:STDOUT: --- extern_library_copy.carbon +// CHECK:STDOUT: --- extern_library_copy.carbon = $extern_library_copy // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -304,7 +304,7 @@ extern library "extern_library_owner" fn F() {} // CHECK:STDOUT: // CHECK:STDOUT: extern fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_extern_library_collision.carbon +// CHECK:STDOUT: --- fail_extern_library_collision.carbon = $fail_extern_library_collision // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Main.F = import_ref Main//extern_library, F, unloaded @@ -317,7 +317,7 @@ extern library "extern_library_owner" fn F() {} // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- extern_library_mismatch.carbon +// CHECK:STDOUT: --- extern_library_mismatch.carbon = $extern_library_mismatch // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -334,9 +334,9 @@ extern library "extern_library_owner" fn F() {} // CHECK:STDOUT: // CHECK:STDOUT: extern fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_extern_library_mismatch_owner.carbon +// CHECK:STDOUT: --- fail_extern_library_mismatch_owner.carbon = $fail_extern_library_mismatch_owner // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_extern_self_library.carbon +// CHECK:STDOUT: --- fail_extern_self_library.carbon = $fail_extern_self_library // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -353,7 +353,7 @@ extern library "extern_library_owner" fn F() {} // CHECK:STDOUT: // CHECK:STDOUT: extern fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: --- extern_of_import.carbon +// CHECK:STDOUT: --- extern_of_import.carbon = $extern_of_import // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -370,7 +370,7 @@ extern library "extern_library_owner" fn F() {} // CHECK:STDOUT: // CHECK:STDOUT: fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_extern_of_import_redecl.carbon +// CHECK:STDOUT: --- fail_extern_of_import_redecl.carbon = $fail_extern_of_import_redecl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -388,7 +388,7 @@ extern library "extern_library_owner" fn F() {} // CHECK:STDOUT: // CHECK:STDOUT: fn @F [from "extern_of_import.carbon"]; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_extern_library_on_definition.carbon +// CHECK:STDOUT: --- fail_extern_library_on_definition.carbon = $fail_extern_library_on_definition // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/declaration/extern_library_for_default.carbon b/toolchain/check/testdata/function/declaration/extern_library_for_default.carbon index b1fe217d422e..1f4168b389c4 100644 --- a/toolchain/check/testdata/function/declaration/extern_library_for_default.carbon +++ b/toolchain/check/testdata/function/declaration/extern_library_for_default.carbon @@ -48,7 +48,7 @@ import library default; // CHECK:STDERR: extern fn F(); -// CHECK:STDOUT: --- default.carbon +// CHECK:STDOUT: --- default.carbon = $default // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -65,7 +65,7 @@ extern fn F(); // CHECK:STDOUT: // CHECK:STDOUT: extern fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: --- expected.carbon +// CHECK:STDOUT: --- expected.carbon = $expected // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -83,7 +83,7 @@ extern fn F(); // CHECK:STDOUT: // CHECK:STDOUT: extern fn @F; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_wrong_library.carbon +// CHECK:STDOUT: --- fail_wrong_library.carbon = $fail_wrong_library // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/declaration/extern_library_from_default.carbon b/toolchain/check/testdata/function/declaration/extern_library_from_default.carbon index ea48d5f6b287..4773fa15d5e7 100644 --- a/toolchain/check/testdata/function/declaration/extern_library_from_default.carbon +++ b/toolchain/check/testdata/function/declaration/extern_library_from_default.carbon @@ -46,7 +46,7 @@ import library "extern_library"; // CHECK:STDERR: extern fn F(); -// CHECK:STDOUT: --- extern_library.carbon +// CHECK:STDOUT: --- extern_library.carbon = $extern_library // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -63,7 +63,7 @@ extern fn F(); // CHECK:STDOUT: // CHECK:STDOUT: extern fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: --- default.carbon +// CHECK:STDOUT: --- default.carbon = $default // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -81,7 +81,7 @@ extern fn F(); // CHECK:STDOUT: // CHECK:STDOUT: extern fn @F; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_wrong_library.carbon +// CHECK:STDOUT: --- fail_wrong_library.carbon = $fail_wrong_library // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/declaration/fail_import_incomplete_return.carbon b/toolchain/check/testdata/function/declaration/fail_import_incomplete_return.carbon index 6b44a65a311f..4735d475dd61 100644 --- a/toolchain/check/testdata/function/declaration/fail_import_incomplete_return.carbon +++ b/toolchain/check/testdata/function/declaration/fail_import_incomplete_return.carbon @@ -108,7 +108,7 @@ fn CallFAndGIncomplete() { ReturnDUsed(); } -// CHECK:STDOUT: --- fail_incomplete_return.carbon +// CHECK:STDOUT: --- fail_incomplete_return.carbon = $fail_incomplete_return // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -224,7 +224,7 @@ fn CallFAndGIncomplete() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_use_imported.carbon +// CHECK:STDOUT: --- fail_use_imported.carbon = $fail_use_imported // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/declaration/fail_modifiers.carbon b/toolchain/check/testdata/function/declaration/fail_modifiers.carbon index b3e786286517..f798f8bf1050 100644 --- a/toolchain/check/testdata/function/declaration/fail_modifiers.carbon +++ b/toolchain/check/testdata/function/declaration/fail_modifiers.carbon @@ -116,7 +116,7 @@ default final virtual fn ModifiersConflict2() {} // CHECK:STDERR: extern private fn ExternOrderAndConflict() {} -// CHECK:STDOUT: --- fail_modifiers.carbon +// CHECK:STDOUT: --- fail_modifiers.carbon = $fail_modifiers // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 bc72ce562ebe..e520182937d6 100644 --- a/toolchain/check/testdata/function/declaration/fail_param_in_type.carbon +++ b/toolchain/check/testdata/function/declaration/fail_param_in_type.carbon @@ -21,7 +21,7 @@ // CHECK:STDERR: fn F(n: i32, a: array(i32, n)*); -// CHECK:STDOUT: --- fail_param_in_type.carbon +// CHECK:STDOUT: --- fail_param_in_type.carbon = $fail_param_in_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/declaration/fail_param_redecl.carbon b/toolchain/check/testdata/function/declaration/fail_param_redecl.carbon index f17c17d0cd81..ab58d955a500 100644 --- a/toolchain/check/testdata/function/declaration/fail_param_redecl.carbon +++ b/toolchain/check/testdata/function/declaration/fail_param_redecl.carbon @@ -22,7 +22,7 @@ // CHECK:STDERR: fn F(n: i32, n: i32); -// CHECK:STDOUT: --- fail_param_redecl.carbon +// CHECK:STDOUT: --- fail_param_redecl.carbon = $fail_param_redecl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/declaration/fail_redecl.carbon b/toolchain/check/testdata/function/declaration/fail_redecl.carbon index 6bb3e5cd54bf..f5f6d1bcd169 100644 --- a/toolchain/check/testdata/function/declaration/fail_redecl.carbon +++ b/toolchain/check/testdata/function/declaration/fail_redecl.carbon @@ -78,7 +78,7 @@ fn E() {} // CHECK:STDERR: fn E() {} -// CHECK:STDOUT: --- fail_redecl.carbon +// CHECK:STDOUT: --- fail_redecl.carbon = $fail_redecl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/declaration/implicit_import.carbon b/toolchain/check/testdata/function/declaration/implicit_import.carbon index 08146da25c84..c7cddb207abe 100644 --- a/toolchain/check/testdata/function/declaration/implicit_import.carbon +++ b/toolchain/check/testdata/function/declaration/implicit_import.carbon @@ -79,7 +79,7 @@ impl library "[[@TEST_NAME]]"; // CHECK:STDERR: extern fn A(); -// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: --- basic.carbon = $basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -96,7 +96,7 @@ extern fn A(); // CHECK:STDOUT: // CHECK:STDOUT: fn @A(); // CHECK:STDOUT: -// CHECK:STDOUT: --- basic.impl.carbon +// CHECK:STDOUT: --- basic.impl.carbon = $basic.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -118,7 +118,7 @@ extern fn A(); // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- extern_api.carbon +// CHECK:STDOUT: --- extern_api.carbon = $extern_api // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -135,7 +135,7 @@ extern fn A(); // CHECK:STDOUT: // CHECK:STDOUT: extern fn @A(); // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_extern_api.impl.carbon +// CHECK:STDOUT: --- fail_extern_api.impl.carbon = $fail_extern_api.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -154,7 +154,7 @@ extern fn A(); // CHECK:STDOUT: // CHECK:STDOUT: extern fn @A [from "extern_api.carbon"]; // CHECK:STDOUT: -// CHECK:STDOUT: --- extern_impl.carbon +// CHECK:STDOUT: --- extern_impl.carbon = $extern_impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -171,7 +171,7 @@ extern fn A(); // CHECK:STDOUT: // CHECK:STDOUT: fn @A(); // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_extern_impl.impl.carbon +// CHECK:STDOUT: --- fail_extern_impl.impl.carbon = $fail_extern_impl.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/declaration/import.carbon b/toolchain/check/testdata/function/declaration/import.carbon index 6b3a4c5c6b6c..ca10d98fdeb4 100644 --- a/toolchain/check/testdata/function/declaration/import.carbon +++ b/toolchain/check/testdata/function/declaration/import.carbon @@ -321,7 +321,7 @@ library "[[@TEST_NAME]]"; import library "extern_api"; -// CHECK:STDOUT: --- api.carbon +// CHECK:STDOUT: --- api.carbon = $api // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -428,7 +428,7 @@ import library "extern_api"; // CHECK:STDOUT: // CHECK:STDOUT: fn @E(); // CHECK:STDOUT: -// CHECK:STDOUT: --- extern_api.carbon +// CHECK:STDOUT: --- extern_api.carbon = $extern_api // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -535,7 +535,7 @@ import library "extern_api"; // CHECK:STDOUT: // CHECK:STDOUT: extern fn @E(); // CHECK:STDOUT: -// CHECK:STDOUT: --- basics.carbon +// CHECK:STDOUT: --- basics.carbon = $basics // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -729,7 +729,7 @@ import library "extern_api"; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_redecl_api.carbon +// CHECK:STDOUT: --- fail_redecl_api.carbon = $fail_redecl_api // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -948,7 +948,7 @@ import library "extern_api"; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- redecl_extern_api.carbon +// CHECK:STDOUT: --- redecl_extern_api.carbon = $redecl_extern_api // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1167,7 +1167,7 @@ import library "extern_api"; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_merge.carbon +// CHECK:STDOUT: --- fail_merge.carbon = $fail_merge // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1361,7 +1361,7 @@ import library "extern_api"; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_merge_reverse.carbon +// CHECK:STDOUT: --- fail_merge_reverse.carbon = $fail_merge_reverse // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1555,7 +1555,7 @@ import library "extern_api"; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- unloaded.carbon +// CHECK:STDOUT: --- unloaded.carbon = $unloaded // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Main.A = import_ref Main//api, A, unloaded @@ -1586,7 +1586,7 @@ import library "extern_api"; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- unloaded_extern.carbon +// CHECK:STDOUT: --- unloaded_extern.carbon = $unloaded_extern // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Main.A = import_ref Main//extern_api, A, unloaded diff --git a/toolchain/check/testdata/function/declaration/param_same_name.carbon b/toolchain/check/testdata/function/declaration/param_same_name.carbon index 0277d548e64b..4d5e44513b31 100644 --- a/toolchain/check/testdata/function/declaration/param_same_name.carbon +++ b/toolchain/check/testdata/function/declaration/param_same_name.carbon @@ -16,7 +16,7 @@ fn F(a: i32); fn G(a: i32); -// CHECK:STDOUT: --- param_same_name.carbon +// CHECK:STDOUT: --- param_same_name.carbon = $param_same_name // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/declaration/pattern_in_signature.carbon b/toolchain/check/testdata/function/declaration/pattern_in_signature.carbon index d2a7ffecea9b..21ec9bcefb35 100644 --- a/toolchain/check/testdata/function/declaration/pattern_in_signature.carbon +++ b/toolchain/check/testdata/function/declaration/pattern_in_signature.carbon @@ -20,7 +20,7 @@ fn CallF(ab: ({}, {}), c: {}) { } //@dump-sem-ir-end -// CHECK:STDOUT: --- pattern_in_signature.carbon +// CHECK:STDOUT: --- pattern_in_signature.carbon = $pattern_in_signature // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/declaration/ref.carbon b/toolchain/check/testdata/function/declaration/ref.carbon index 8f6a37ad32d4..1becd22ca851 100644 --- a/toolchain/check/testdata/function/declaration/ref.carbon +++ b/toolchain/check/testdata/function/declaration/ref.carbon @@ -62,7 +62,7 @@ fn G() { let unused ref x: i32 = F(); } -// CHECK:STDOUT: --- ref_return.carbon +// CHECK:STDOUT: --- ref_return.carbon = $ref_return // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -124,7 +124,7 @@ fn G() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_ref_return.carbon +// CHECK:STDOUT: --- import_ref_return.carbon = $import_ref_return // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/declaration/simple.carbon b/toolchain/check/testdata/function/declaration/simple.carbon index da50e4a69fb5..43ffaa90c6c4 100644 --- a/toolchain/check/testdata/function/declaration/simple.carbon +++ b/toolchain/check/testdata/function/declaration/simple.carbon @@ -16,7 +16,7 @@ fn F(); fn G() { F(); } -// CHECK:STDOUT: --- simple.carbon +// CHECK:STDOUT: --- simple.carbon = $simple // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/declaration/val_var_return.carbon b/toolchain/check/testdata/function/declaration/val_var_return.carbon index c1c3670d96f0..ed27a8413967 100644 --- a/toolchain/check/testdata/function/declaration/val_var_return.carbon +++ b/toolchain/check/testdata/function/declaration/val_var_return.carbon @@ -124,7 +124,7 @@ fn G() { let unused x: i32 = F(); } -// CHECK:STDOUT: --- val_return.carbon +// CHECK:STDOUT: --- val_return.carbon = $val_return // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -186,7 +186,7 @@ fn G() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- var_return.carbon +// CHECK:STDOUT: --- var_return.carbon = $var_return // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -250,7 +250,7 @@ fn G() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- val_return_definition.carbon +// CHECK:STDOUT: --- val_return_definition.carbon = $val_return_definition // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -327,7 +327,7 @@ fn G() { // CHECK:STDOUT: return %.loc7_11.2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_val_return.carbon +// CHECK:STDOUT: --- import_val_return.carbon = $import_val_return // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/deduced_return/basic.carbon b/toolchain/check/testdata/function/deduced_return/basic.carbon index 34c819d53c03..aea79e08243e 100644 --- a/toolchain/check/testdata/function/deduced_return/basic.carbon +++ b/toolchain/check/testdata/function/deduced_return/basic.carbon @@ -138,7 +138,7 @@ fn G() -> i32 { return F(false); } -// CHECK:STDOUT: --- single_return.carbon +// CHECK:STDOUT: --- single_return.carbon = $single_return // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -238,7 +238,7 @@ fn G() -> i32 { // CHECK:STDOUT: return %F.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- in_place.carbon +// CHECK:STDOUT: --- in_place.carbon = $in_place // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -340,7 +340,7 @@ fn G() -> i32 { // CHECK:STDOUT: return %F.call to %return.param // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- lambda.carbon +// CHECK:STDOUT: --- lambda.carbon = $lambda // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/deduced_return/form.carbon b/toolchain/check/testdata/function/deduced_return/form.carbon index fbcc153a0fc3..5224731f5985 100644 --- a/toolchain/check/testdata/function/deduced_return/form.carbon +++ b/toolchain/check/testdata/function/deduced_return/form.carbon @@ -193,7 +193,7 @@ fn F() ->? form(ref auto) { return g; } -// CHECK:STDOUT: --- ref_auto.carbon +// CHECK:STDOUT: --- ref_auto.carbon = $ref_auto // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -252,7 +252,7 @@ fn F() ->? form(ref auto) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- val_auto.carbon +// CHECK:STDOUT: --- val_auto.carbon = $val_auto // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -331,7 +331,7 @@ fn F() ->? form(ref auto) { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- var_auto.carbon +// CHECK:STDOUT: --- var_auto.carbon = $var_auto // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/deduced_return/generic.carbon b/toolchain/check/testdata/function/deduced_return/generic.carbon index f0bd12e14dac..d32ff0951809 100644 --- a/toolchain/check/testdata/function/deduced_return/generic.carbon +++ b/toolchain/check/testdata/function/deduced_return/generic.carbon @@ -148,7 +148,7 @@ fn F[T: Core.Copy](x: T, b: bool) -> auto { return var; } -// CHECK:STDOUT: --- generic_definition.carbon +// CHECK:STDOUT: --- generic_definition.carbon = $generic_definition // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -256,7 +256,7 @@ fn F[T: Core.Copy](x: T, b: bool) -> auto { // CHECK:STDOUT: %x.patt.loc4_21.2 => constants.%x.patt // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- call.carbon +// CHECK:STDOUT: --- call.carbon = $call // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -334,7 +334,7 @@ fn F[T: Core.Copy](x: T, b: bool) -> auto { // CHECK:STDOUT: return %F.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- call_from_generic.carbon +// CHECK:STDOUT: --- call_from_generic.carbon = $call_from_generic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -479,7 +479,7 @@ fn F[T: Core.Copy](x: T, b: bool) -> auto { // CHECK:STDOUT: %F.specific_fn.loc6_40.2 => constants.%F.specific_fn.37a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- return_type_from_definition.carbon +// CHECK:STDOUT: --- return_type_from_definition.carbon = $return_type_from_definition // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/deduced_return/generic_form.carbon b/toolchain/check/testdata/function/deduced_return/generic_form.carbon index db61be0f1c72..49e27634e939 100644 --- a/toolchain/check/testdata/function/deduced_return/generic_form.carbon +++ b/toolchain/check/testdata/function/deduced_return/generic_form.carbon @@ -232,7 +232,7 @@ fn H() { fn I[U: type](ref u: U) -> U* { return &RefId(ref u); } -// CHECK:STDOUT: --- ref_auto.carbon +// CHECK:STDOUT: --- ref_auto.carbon = $ref_auto // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -359,7 +359,7 @@ fn I[U: type](ref u: U) -> U* { return &RefId(ref u); } // CHECK:STDOUT: %return.patt.loc4_46.2 => constants.%return.patt.2c5 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- ref_auto_call_from_generic.carbon +// CHECK:STDOUT: --- ref_auto_call_from_generic.carbon = $ref_auto_call_from_generic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -467,7 +467,7 @@ fn I[U: type](ref u: U) -> U* { return &RefId(ref u); } // CHECK:STDOUT: %F.specific_fn.loc6_43.2 => constants.%F.specific_fn.9db // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- val_auto.carbon +// CHECK:STDOUT: --- val_auto.carbon = $val_auto // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/deduced_return/import.carbon b/toolchain/check/testdata/function/deduced_return/import.carbon index 3f82f396efd2..a22648f63763 100644 --- a/toolchain/check/testdata/function/deduced_return/import.carbon +++ b/toolchain/check/testdata/function/deduced_return/import.carbon @@ -51,7 +51,7 @@ fn K[U: Core.Copy & Core.Destroy](u: U) -> (U, U) { return Pair(Id(u)); } fn L() -> (bool, bool) { return K(true); } -// CHECK:STDOUT: --- use.carbon +// CHECK:STDOUT: --- use.carbon = $use // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -114,7 +114,7 @@ fn L() -> (bool, bool) { return K(true); } // CHECK:STDOUT: return %C.G.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_generic.carbon +// CHECK:STDOUT: --- use_generic.carbon = $use_generic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/deduced_return/returned_var.carbon b/toolchain/check/testdata/function/deduced_return/returned_var.carbon index 88a0f5bedeb7..67b37e83edff 100644 --- a/toolchain/check/testdata/function/deduced_return/returned_var.carbon +++ b/toolchain/check/testdata/function/deduced_return/returned_var.carbon @@ -122,7 +122,7 @@ fn F(b: bool) -> auto { return var; } -// CHECK:STDOUT: --- returned_var.carbon +// CHECK:STDOUT: --- returned_var.carbon = $returned_var // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -213,7 +213,7 @@ fn F(b: bool) -> auto { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc5(%self.param: ref %i32) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- returned_var_after_return.carbon +// CHECK:STDOUT: --- returned_var_after_return.carbon = $returned_var_after_return // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -332,7 +332,7 @@ fn F(b: bool) -> auto { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc9(%self.param: ref %i32) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- returned_var_in_place.carbon +// CHECK:STDOUT: --- returned_var_in_place.carbon = $returned_var_in_place // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/deduced_return/template.carbon b/toolchain/check/testdata/function/deduced_return/template.carbon index dbf56cb54e19..be56f7607b4b 100644 --- a/toolchain/check/testdata/function/deduced_return/template.carbon +++ b/toolchain/check/testdata/function/deduced_return/template.carbon @@ -101,7 +101,7 @@ fn F[template T: type](x: T, b: bool) -> auto { fn G() -> i32 { return F(0 as i32, true); } -// CHECK:STDOUT: --- member_access.carbon +// CHECK:STDOUT: --- member_access.carbon = $member_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/definition/basics.carbon b/toolchain/check/testdata/function/definition/basics.carbon index 63c2e12b5ddd..ce6ed55d3889 100644 --- a/toolchain/check/testdata/function/definition/basics.carbon +++ b/toolchain/check/testdata/function/definition/basics.carbon @@ -30,7 +30,7 @@ class C; // CHECK:STDERR: fn F(unused n: C) {} -// CHECK:STDOUT: --- fail_incomplete_type.carbon +// CHECK:STDOUT: --- fail_incomplete_type.carbon = $fail_incomplete_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/definition/default_values.carbon b/toolchain/check/testdata/function/definition/default_values.carbon index 14cda2041ccc..7311e501f349 100644 --- a/toolchain/check/testdata/function/definition/default_values.carbon +++ b/toolchain/check/testdata/function/definition/default_values.carbon @@ -95,7 +95,7 @@ impl library "[[@TEST_NAME]]"; fn F(x: i32 = 0) -> i32 { return x; } //@dump-sem-ir-end -// CHECK:STDOUT: --- redecl.carbon +// CHECK:STDOUT: --- redecl.carbon = $redecl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -182,7 +182,7 @@ fn F(x: i32 = 0) -> i32 { return x; } // CHECK:STDOUT: return %Int.as.Copy.impl.Op.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- imported_repeated_defaults.impl.carbon +// CHECK:STDOUT: --- imported_repeated_defaults.impl.carbon = $imported_repeated_defaults.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/definition/extern.carbon b/toolchain/check/testdata/function/definition/extern.carbon index 684ead0d2707..f0f86278e43f 100644 --- a/toolchain/check/testdata/function/definition/extern.carbon +++ b/toolchain/check/testdata/function/definition/extern.carbon @@ -136,7 +136,7 @@ impl library "[[@TEST_NAME]]"; // CHECK:STDERR: extern fn F() {} -// CHECK:STDOUT: --- extern_def.carbon +// CHECK:STDOUT: --- extern_def.carbon = $extern_def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -156,7 +156,7 @@ extern fn F() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- def_for_extern_decl.carbon +// CHECK:STDOUT: --- def_for_extern_decl.carbon = $def_for_extern_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -177,7 +177,7 @@ extern fn F() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- split_library.carbon +// CHECK:STDOUT: --- split_library.carbon = $split_library // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -194,7 +194,7 @@ extern fn F() {} // CHECK:STDOUT: // CHECK:STDOUT: extern fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: --- split_library.impl.carbon +// CHECK:STDOUT: --- split_library.impl.carbon = $split_library.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -216,7 +216,7 @@ extern fn F() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_def_extern_mismatch.carbon +// CHECK:STDOUT: --- fail_def_extern_mismatch.carbon = $fail_def_extern_mismatch // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -237,7 +237,7 @@ extern fn F() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_def_extern_mismatch_reverse.carbon +// CHECK:STDOUT: --- fail_def_extern_mismatch_reverse.carbon = $fail_def_extern_mismatch_reverse // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -258,7 +258,7 @@ extern fn F() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_extern_diag_suppressed.carbon +// CHECK:STDOUT: --- fail_extern_diag_suppressed.carbon = $fail_extern_diag_suppressed // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -280,7 +280,7 @@ extern fn F() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_extern_decl_after_def.carbon +// CHECK:STDOUT: --- fail_extern_decl_after_def.carbon = $fail_extern_decl_after_def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -301,13 +301,13 @@ extern fn F() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- in_impl.carbon +// CHECK:STDOUT: --- in_impl.carbon = $in_impl // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_in_impl.impl.carbon +// CHECK:STDOUT: --- fail_in_impl.impl.carbon = $fail_in_impl.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/definition/extern_library.carbon b/toolchain/check/testdata/function/definition/extern_library.carbon index 61e124296664..890a063e3911 100644 --- a/toolchain/check/testdata/function/definition/extern_library.carbon +++ b/toolchain/check/testdata/function/definition/extern_library.carbon @@ -188,7 +188,7 @@ import library "unloaded_decl_extern"; extern fn ExternDecl(); -// CHECK:STDOUT: --- one_file_extern.carbon +// CHECK:STDOUT: --- one_file_extern.carbon = $one_file_extern // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -205,7 +205,7 @@ extern fn ExternDecl(); // CHECK:STDOUT: // CHECK:STDOUT: extern fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: --- one_file.carbon +// CHECK:STDOUT: --- one_file.carbon = $one_file // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -225,7 +225,7 @@ extern fn ExternDecl(); // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- two_file_extern.carbon +// CHECK:STDOUT: --- two_file_extern.carbon = $two_file_extern // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -242,7 +242,7 @@ extern fn ExternDecl(); // CHECK:STDOUT: // CHECK:STDOUT: extern fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: --- two_file.carbon +// CHECK:STDOUT: --- two_file.carbon = $two_file // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -259,7 +259,7 @@ extern fn ExternDecl(); // CHECK:STDOUT: // CHECK:STDOUT: extern fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: --- two_file.impl.carbon +// CHECK:STDOUT: --- two_file.impl.carbon = $two_file.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -281,7 +281,7 @@ extern fn ExternDecl(); // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- two_file_impl_mismatch_extern.carbon +// CHECK:STDOUT: --- two_file_impl_mismatch_extern.carbon = $two_file_impl_mismatch_extern // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -298,7 +298,7 @@ extern fn ExternDecl(); // CHECK:STDOUT: // CHECK:STDOUT: extern fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: --- two_file_impl_mismatch.carbon +// CHECK:STDOUT: --- two_file_impl_mismatch.carbon = $two_file_impl_mismatch // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -315,7 +315,7 @@ extern fn ExternDecl(); // CHECK:STDOUT: // CHECK:STDOUT: extern fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_two_file_impl_mismatch.impl.carbon +// CHECK:STDOUT: --- fail_two_file_impl_mismatch.impl.carbon = $fail_two_file_impl_mismatch.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -337,7 +337,7 @@ extern fn ExternDecl(); // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- no_decl_extern.carbon +// CHECK:STDOUT: --- no_decl_extern.carbon = $no_decl_extern // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -354,7 +354,7 @@ extern fn ExternDecl(); // CHECK:STDOUT: // CHECK:STDOUT: extern fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: --- no_decl_extern.impl.carbon +// CHECK:STDOUT: --- no_decl_extern.impl.carbon = $no_decl_extern.impl // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Main.F = import_ref Main//no_decl_extern, F, unloaded @@ -368,7 +368,7 @@ extern fn ExternDecl(); // CHECK:STDOUT: %default.import.loc2_30.2 = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_no_decl.carbon +// CHECK:STDOUT: --- fail_no_decl.carbon = $fail_no_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -389,7 +389,7 @@ extern fn ExternDecl(); // CHECK:STDOUT: // CHECK:STDOUT: extern fn @F; // CHECK:STDOUT: -// CHECK:STDOUT: --- indirect_two_file_extern.carbon +// CHECK:STDOUT: --- indirect_two_file_extern.carbon = $indirect_two_file_extern // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -406,7 +406,7 @@ extern fn ExternDecl(); // CHECK:STDOUT: // CHECK:STDOUT: extern fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_indirect_two_file.carbon +// CHECK:STDOUT: --- fail_indirect_two_file.carbon = $fail_indirect_two_file // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -427,7 +427,7 @@ extern fn ExternDecl(); // CHECK:STDOUT: // CHECK:STDOUT: extern fn @F; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_indirect_two_file.impl.carbon +// CHECK:STDOUT: --- fail_indirect_two_file.impl.carbon = $fail_indirect_two_file.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -449,7 +449,7 @@ extern fn ExternDecl(); // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- in_impl_extern.carbon +// CHECK:STDOUT: --- in_impl_extern.carbon = $in_impl_extern // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -466,13 +466,13 @@ extern fn ExternDecl(); // CHECK:STDOUT: // CHECK:STDOUT: extern fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: --- in_impl.carbon +// CHECK:STDOUT: --- in_impl.carbon = $in_impl // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_in_impl.impl.carbon +// CHECK:STDOUT: --- fail_in_impl.impl.carbon = $fail_in_impl.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -494,7 +494,7 @@ extern fn ExternDecl(); // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- cross_package_extern.carbon +// CHECK:STDOUT: --- cross_package_extern.carbon = $cross_package_extern // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -511,7 +511,7 @@ extern fn ExternDecl(); // CHECK:STDOUT: // CHECK:STDOUT: extern fn @Extern(); // CHECK:STDOUT: -// CHECK:STDOUT: --- cross_package.carbon +// CHECK:STDOUT: --- cross_package.carbon = $cross_package // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -549,7 +549,7 @@ extern fn ExternDecl(); // CHECK:STDOUT: // CHECK:STDOUT: extern fn @Extern; // CHECK:STDOUT: -// CHECK:STDOUT: --- unloaded_decl_extern.carbon +// CHECK:STDOUT: --- unloaded_decl_extern.carbon = $unloaded_decl_extern // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -572,7 +572,7 @@ extern fn ExternDecl(); // CHECK:STDOUT: // CHECK:STDOUT: fn @NonExternDecl(); // CHECK:STDOUT: -// CHECK:STDOUT: --- unloaded_decl.carbon +// CHECK:STDOUT: --- unloaded_decl.carbon = $unloaded_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 f6c44e72c91f..087ebc3167b1 100644 --- a/toolchain/check/testdata/function/definition/fail_decl_param_mismatch.carbon +++ b/toolchain/check/testdata/function/definition/fail_decl_param_mismatch.carbon @@ -97,7 +97,7 @@ fn K() -> (); // CHECK:STDERR: fn K() -> {} { return {}; } -// CHECK:STDOUT: --- fail_decl_param_mismatch.carbon +// CHECK:STDOUT: --- fail_decl_param_mismatch.carbon = $fail_decl_param_mismatch // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/definition/fail_redef.carbon b/toolchain/check/testdata/function/definition/fail_redef.carbon index d076438cc574..8d914c83742b 100644 --- a/toolchain/check/testdata/function/definition/fail_redef.carbon +++ b/toolchain/check/testdata/function/definition/fail_redef.carbon @@ -25,7 +25,7 @@ fn F() {} // CHECK:STDERR: fn F() {} -// CHECK:STDOUT: --- fail_redef.carbon +// CHECK:STDOUT: --- fail_redef.carbon = $fail_redef // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/definition/forward_decl.carbon b/toolchain/check/testdata/function/definition/forward_decl.carbon index 475ebff58693..3c200aac860f 100644 --- a/toolchain/check/testdata/function/definition/forward_decl.carbon +++ b/toolchain/check/testdata/function/definition/forward_decl.carbon @@ -16,7 +16,7 @@ fn Foo(); fn Foo() {} -// CHECK:STDOUT: --- forward_decl.carbon +// CHECK:STDOUT: --- forward_decl.carbon = $forward_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/definition/implicit_import.carbon b/toolchain/check/testdata/function/definition/implicit_import.carbon index 00d772624909..6a10ff7bdace 100644 --- a/toolchain/check/testdata/function/definition/implicit_import.carbon +++ b/toolchain/check/testdata/function/definition/implicit_import.carbon @@ -143,7 +143,7 @@ impl library "[[@TEST_NAME]]"; // CHECK:STDERR: fn B() {} -// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: --- basic.carbon = $basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -160,7 +160,7 @@ fn B() {} // CHECK:STDOUT: // CHECK:STDOUT: fn @A(); // CHECK:STDOUT: -// CHECK:STDOUT: --- basic.impl.carbon +// CHECK:STDOUT: --- basic.impl.carbon = $basic.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -182,7 +182,7 @@ fn B() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- extern_api.carbon +// CHECK:STDOUT: --- extern_api.carbon = $extern_api // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -199,7 +199,7 @@ fn B() {} // CHECK:STDOUT: // CHECK:STDOUT: extern fn @A(); // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_extern_api.impl.carbon +// CHECK:STDOUT: --- fail_extern_api.impl.carbon = $fail_extern_api.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -221,7 +221,7 @@ fn B() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- extern_impl.carbon +// CHECK:STDOUT: --- extern_impl.carbon = $extern_impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -238,7 +238,7 @@ fn B() {} // CHECK:STDOUT: // CHECK:STDOUT: fn @A(); // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_extern_impl.impl.carbon +// CHECK:STDOUT: --- fail_extern_impl.impl.carbon = $fail_extern_impl.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -260,7 +260,7 @@ fn B() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- redecl_after_def.carbon +// CHECK:STDOUT: --- redecl_after_def.carbon = $redecl_after_def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -280,7 +280,7 @@ fn B() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_redecl_after_def.impl.carbon +// CHECK:STDOUT: --- fail_redecl_after_def.impl.carbon = $fail_redecl_after_def.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -299,7 +299,7 @@ fn B() {} // CHECK:STDOUT: // CHECK:STDOUT: fn @A [from "redecl_after_def.carbon"]; // CHECK:STDOUT: -// CHECK:STDOUT: --- redef_after_def.carbon +// CHECK:STDOUT: --- redef_after_def.carbon = $redef_after_def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -319,7 +319,7 @@ fn B() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_redef_after_def.impl.carbon +// CHECK:STDOUT: --- fail_redef_after_def.impl.carbon = $fail_redef_after_def.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -349,7 +349,7 @@ fn B() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- def_alias.carbon +// CHECK:STDOUT: --- def_alias.carbon = $def_alias // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -369,7 +369,7 @@ fn B() {} // CHECK:STDOUT: // CHECK:STDOUT: fn @A(); // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_def_alias.impl.carbon +// CHECK:STDOUT: --- fail_def_alias.impl.carbon = $fail_def_alias.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/definition/import.carbon b/toolchain/check/testdata/function/definition/import.carbon index a3ac63298f61..9909828a9c73 100644 --- a/toolchain/check/testdata/function/definition/import.carbon +++ b/toolchain/check/testdata/function/definition/import.carbon @@ -132,7 +132,7 @@ extern fn D(); fn D() {} -// CHECK:STDOUT: --- fns.carbon +// CHECK:STDOUT: --- fns.carbon = $fns // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -272,7 +272,7 @@ fn D() {} // CHECK:STDOUT: // CHECK:STDOUT: fn @D(); // CHECK:STDOUT: -// CHECK:STDOUT: --- extern.carbon +// CHECK:STDOUT: --- extern.carbon = $extern // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -298,7 +298,7 @@ fn D() {} // CHECK:STDOUT: // CHECK:STDOUT: extern fn @A(); // CHECK:STDOUT: -// CHECK:STDOUT: --- basics.carbon +// CHECK:STDOUT: --- basics.carbon = $basics // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -445,7 +445,7 @@ fn D() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_def_ownership.carbon +// CHECK:STDOUT: --- fail_def_ownership.carbon = $fail_def_ownership // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -505,7 +505,7 @@ fn D() {} // CHECK:STDOUT: // CHECK:STDOUT: fn @B [from "fns.carbon"]; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_redecl_then_def.carbon +// CHECK:STDOUT: --- fail_redecl_then_def.carbon = $fail_redecl_then_def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -536,7 +536,7 @@ fn D() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_mix_extern_decl.carbon +// CHECK:STDOUT: --- fail_mix_extern_decl.carbon = $fail_mix_extern_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/definition/import_access.carbon b/toolchain/check/testdata/function/definition/import_access.carbon index 42433b4c576d..8f0ba87d572e 100644 --- a/toolchain/check/testdata/function/definition/import_access.carbon +++ b/toolchain/check/testdata/function/definition/import_access.carbon @@ -155,7 +155,7 @@ private fn Redecl(); private fn Redecl() {} -// CHECK:STDOUT: --- def.carbon +// CHECK:STDOUT: --- def.carbon = $def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -175,7 +175,7 @@ private fn Redecl() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- forward_with_def.carbon +// CHECK:STDOUT: --- forward_with_def.carbon = $forward_with_def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -196,7 +196,7 @@ private fn Redecl() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- forward.carbon +// CHECK:STDOUT: --- forward.carbon = $forward // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -213,7 +213,7 @@ private fn Redecl() {} // CHECK:STDOUT: // CHECK:STDOUT: fn @Forward(); // CHECK:STDOUT: -// CHECK:STDOUT: --- def.impl.carbon +// CHECK:STDOUT: --- def.impl.carbon = $def.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -259,7 +259,7 @@ private fn Redecl() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_local_def.carbon +// CHECK:STDOUT: --- fail_local_def.carbon = $fail_local_def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -295,7 +295,7 @@ private fn Redecl() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_other_def.carbon +// CHECK:STDOUT: --- fail_other_def.carbon = $fail_other_def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -339,7 +339,7 @@ private fn Redecl() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- forward_with_def.impl.carbon +// CHECK:STDOUT: --- forward_with_def.impl.carbon = $forward_with_def.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -385,7 +385,7 @@ private fn Redecl() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_local_forward_with_def.carbon +// CHECK:STDOUT: --- fail_local_forward_with_def.carbon = $fail_local_forward_with_def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -421,7 +421,7 @@ private fn Redecl() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_other_forward_with_def.carbon +// CHECK:STDOUT: --- fail_other_forward_with_def.carbon = $fail_other_forward_with_def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -465,7 +465,7 @@ private fn Redecl() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- forward.impl.carbon +// CHECK:STDOUT: --- forward.impl.carbon = $forward.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -515,7 +515,7 @@ private fn Redecl() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_local_forward.carbon +// CHECK:STDOUT: --- fail_local_forward.carbon = $fail_local_forward // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -551,7 +551,7 @@ private fn Redecl() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_other_forward.carbon +// CHECK:STDOUT: --- fail_other_forward.carbon = $fail_other_forward // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -595,7 +595,7 @@ private fn Redecl() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- todo_fail_private_on_redecl.carbon +// CHECK:STDOUT: --- todo_fail_private_on_redecl.carbon = $todo_fail_private_on_redecl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/definition/order.carbon b/toolchain/check/testdata/function/definition/order.carbon index 4d0289a15b10..04972b51f568 100644 --- a/toolchain/check/testdata/function/definition/order.carbon +++ b/toolchain/check/testdata/function/definition/order.carbon @@ -16,7 +16,7 @@ fn Foo() {} fn Bar() {} fn Baz() {} -// CHECK:STDOUT: --- order.carbon +// CHECK:STDOUT: --- order.carbon = $order // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/definition/params_one.carbon b/toolchain/check/testdata/function/definition/params_one.carbon index 2d909c74c984..d202567f4ec1 100644 --- a/toolchain/check/testdata/function/definition/params_one.carbon +++ b/toolchain/check/testdata/function/definition/params_one.carbon @@ -14,7 +14,7 @@ fn Foo(unused a: i32) {} -// CHECK:STDOUT: --- params_one.carbon +// CHECK:STDOUT: --- params_one.carbon = $params_one // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/definition/params_one_comma.carbon b/toolchain/check/testdata/function/definition/params_one_comma.carbon index 56cf8b367c42..b8cb41fb0031 100644 --- a/toolchain/check/testdata/function/definition/params_one_comma.carbon +++ b/toolchain/check/testdata/function/definition/params_one_comma.carbon @@ -14,7 +14,7 @@ fn Foo(unused a: i32,) {} -// CHECK:STDOUT: --- params_one_comma.carbon +// CHECK:STDOUT: --- params_one_comma.carbon = $params_one_comma // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/definition/params_two.carbon b/toolchain/check/testdata/function/definition/params_two.carbon index b501b7d339d2..1627a32e46c6 100644 --- a/toolchain/check/testdata/function/definition/params_two.carbon +++ b/toolchain/check/testdata/function/definition/params_two.carbon @@ -14,7 +14,7 @@ fn Foo(unused a: i32, unused b: i32) {} -// CHECK:STDOUT: --- params_two.carbon +// CHECK:STDOUT: --- params_two.carbon = $params_two // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/definition/params_two_comma.carbon b/toolchain/check/testdata/function/definition/params_two_comma.carbon index 1b2858ea64fa..f1e2959361de 100644 --- a/toolchain/check/testdata/function/definition/params_two_comma.carbon +++ b/toolchain/check/testdata/function/definition/params_two_comma.carbon @@ -14,7 +14,7 @@ fn Foo(unused a: i32, unused b: i32,) {} -// CHECK:STDOUT: --- params_two_comma.carbon +// CHECK:STDOUT: --- params_two_comma.carbon = $params_two_comma // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/definition/params_zero.carbon b/toolchain/check/testdata/function/definition/params_zero.carbon index 12a3d41152b5..cdc0df0748a8 100644 --- a/toolchain/check/testdata/function/definition/params_zero.carbon +++ b/toolchain/check/testdata/function/definition/params_zero.carbon @@ -14,7 +14,7 @@ fn Foo() {} -// CHECK:STDOUT: --- params_zero.carbon +// CHECK:STDOUT: --- params_zero.carbon = $params_zero // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/definition/syntactic_merge.carbon b/toolchain/check/testdata/function/definition/syntactic_merge.carbon index bb02b66a7556..1475cbdb9e0b 100644 --- a/toolchain/check/testdata/function/definition/syntactic_merge.carbon +++ b/toolchain/check/testdata/function/definition/syntactic_merge.carbon @@ -251,7 +251,7 @@ fn Foo(a: const C); // CHECK:STDERR: fn Foo(unused a: const (const C)) {} -// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: --- basic.carbon = $basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -329,7 +329,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- spacing.carbon +// CHECK:STDOUT: --- spacing.carbon = $spacing // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -380,7 +380,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_parens.carbon +// CHECK:STDOUT: --- fail_parens.carbon = $fail_parens // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -435,7 +435,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_only_implicit_params.carbon +// CHECK:STDOUT: --- fail_only_implicit_params.carbon = $fail_only_implicit_params // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -473,7 +473,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_raw_identifier.carbon +// CHECK:STDOUT: --- fail_raw_identifier.carbon = $fail_raw_identifier // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -528,7 +528,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- two_file.carbon +// CHECK:STDOUT: --- two_file.carbon = $two_file // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -584,7 +584,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: // CHECK:STDOUT: fn @Bar(%a.param: %C); // CHECK:STDOUT: -// CHECK:STDOUT: --- two_file.impl.carbon +// CHECK:STDOUT: --- two_file.impl.carbon = $two_file.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -652,7 +652,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_name_mismatch.carbon +// CHECK:STDOUT: --- fail_name_mismatch.carbon = $fail_name_mismatch // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -712,7 +712,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_alias.carbon +// CHECK:STDOUT: --- fail_alias.carbon = $fail_alias // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -770,7 +770,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_deduced_alias.carbon +// CHECK:STDOUT: --- fail_deduced_alias.carbon = $fail_deduced_alias // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -856,7 +856,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: %a.loc20_16.2 => constants.%a.1bf9e8.2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- todo_fail_alias_in_return.carbon +// CHECK:STDOUT: --- todo_fail_alias_in_return.carbon = $todo_fail_alias_in_return // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -918,7 +918,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: return %.loc8_26 to %return.param.loc8 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- alias_two_file.carbon +// CHECK:STDOUT: --- alias_two_file.carbon = $alias_two_file // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -958,7 +958,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(%a.param: %C); // CHECK:STDOUT: -// CHECK:STDOUT: --- todo_fail_alias_two_file.impl.carbon +// CHECK:STDOUT: --- todo_fail_alias_two_file.impl.carbon = $todo_fail_alias_two_file.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1010,7 +1010,7 @@ fn Foo(unused a: const (const C)) {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_repeat_const.carbon +// CHECK:STDOUT: --- fail_repeat_const.carbon = $fail_repeat_const // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/definition/terse.carbon b/toolchain/check/testdata/function/definition/terse.carbon index 6028b19cda20..683d33d2aae2 100644 --- a/toolchain/check/testdata/function/definition/terse.carbon +++ b/toolchain/check/testdata/function/definition/terse.carbon @@ -319,7 +319,7 @@ class C { } } -// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: --- basic.carbon = $basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/generic/call.carbon b/toolchain/check/testdata/function/generic/call.carbon index e9830fcc7b8f..089b0dfa24ba 100644 --- a/toolchain/check/testdata/function/generic/call.carbon +++ b/toolchain/check/testdata/function/generic/call.carbon @@ -71,7 +71,7 @@ fn CallSpecific(x: C*) -> C* { } -// CHECK:STDOUT: --- explicit.carbon +// CHECK:STDOUT: --- explicit.carbon = $explicit // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -359,7 +359,7 @@ fn CallSpecific(x: C*) -> C* { // CHECK:STDOUT: %specific_impl_fn.loc6_10.2 => constants.%ptr.as.Copy.impl.Op.specific_fn // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- deduced.carbon +// CHECK:STDOUT: --- deduced.carbon = $deduced // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/generic/call_method_on_generic_facet.carbon b/toolchain/check/testdata/function/generic/call_method_on_generic_facet.carbon index 8c52a8136b8d..1fcd90c18708 100644 --- a/toolchain/check/testdata/function/generic/call_method_on_generic_facet.carbon +++ b/toolchain/check/testdata/function/generic/call_method_on_generic_facet.carbon @@ -38,7 +38,7 @@ fn G() { CallGenericMethod(GenericParam, ImplsGeneric); } -// CHECK:STDOUT: --- call_method_on_generic_facet.carbon +// CHECK:STDOUT: --- call_method_on_generic_facet.carbon = $call_method_on_generic_facet // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/generic/deduce.carbon b/toolchain/check/testdata/function/generic/deduce.carbon index 098fbc3d8e15..2600ded940ee 100644 --- a/toolchain/check/testdata/function/generic/deduce.carbon +++ b/toolchain/check/testdata/function/generic/deduce.carbon @@ -248,7 +248,7 @@ fn F() { CC(DD(EE)) as Z; } -// CHECK:STDOUT: --- deduce_explicit.carbon +// CHECK:STDOUT: --- deduce_explicit.carbon = $deduce_explicit // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -462,7 +462,7 @@ fn F() { // CHECK:STDOUT: %ExplicitGenericParam.specific_fn.loc4_57.2 => constants.%ExplicitGenericParam.specific_fn.085 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_deduce_explicit_non_constant.carbon +// CHECK:STDOUT: --- fail_deduce_explicit_non_constant.carbon = $fail_deduce_explicit_non_constant // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -604,7 +604,7 @@ fn F() { // CHECK:STDOUT: %T.loc6_43.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- explicit_vs_deduced.carbon +// CHECK:STDOUT: --- explicit_vs_deduced.carbon = $explicit_vs_deduced // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -810,7 +810,7 @@ fn F() { // CHECK:STDOUT: %ExplicitAndAlsoDeduced.specific_fn.loc7_10.2 => constants.%ExplicitAndAlsoDeduced.specific_fn.fbd // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- deduce_implicit.carbon +// CHECK:STDOUT: --- deduce_implicit.carbon = $deduce_implicit // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -979,7 +979,7 @@ fn F() { // CHECK:STDOUT: %ImplicitGenericParam.specific_fn.loc4_55.2 => constants.%ImplicitGenericParam.specific_fn.056 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- deduce_nested_tuple.carbon +// CHECK:STDOUT: --- deduce_nested_tuple.carbon = $deduce_nested_tuple // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1136,7 +1136,7 @@ fn F() { // CHECK:STDOUT: %require_complete => constants.%complete_type.469 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- deduce_nested_struct.carbon +// CHECK:STDOUT: --- deduce_nested_struct.carbon = $deduce_nested_struct // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1286,7 +1286,7 @@ fn F() { // CHECK:STDOUT: %require_complete => constants.%complete_type.c76 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_deduce_bigger_struct.carbon +// CHECK:STDOUT: --- fail_deduce_bigger_struct.carbon = $fail_deduce_bigger_struct // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1386,7 +1386,7 @@ fn F() { // CHECK:STDOUT: %x.patt.loc4_36.2 => constants.%x.patt // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_deduce_smaller_struct.carbon +// CHECK:STDOUT: --- fail_deduce_smaller_struct.carbon = $fail_deduce_smaller_struct // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1487,7 +1487,7 @@ fn F() { // CHECK:STDOUT: %x.patt.loc4_38.2 => constants.%x.patt // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_deduce_struct_wrong_name.carbon +// CHECK:STDOUT: --- fail_deduce_struct_wrong_name.carbon = $fail_deduce_struct_wrong_name // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1586,7 +1586,7 @@ fn F() { // CHECK:STDOUT: %x.patt.loc4_42.2 => constants.%x.patt // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_deduce_struct_wrong_order.carbon +// CHECK:STDOUT: --- fail_todo_deduce_struct_wrong_order.carbon = $fail_todo_deduce_struct_wrong_order // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1685,7 +1685,7 @@ fn F() { // CHECK:STDOUT: %x.patt.loc4_43.2 => constants.%x.patt // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_deduce_incomplete.carbon +// CHECK:STDOUT: --- fail_deduce_incomplete.carbon = $fail_deduce_incomplete // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1789,7 +1789,7 @@ fn F() { // CHECK:STDOUT: %return.patt.loc6_49.2 => constants.%return.patt // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_deduce_inconsistent.carbon +// CHECK:STDOUT: --- fail_deduce_inconsistent.carbon = $fail_deduce_inconsistent // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1894,7 +1894,7 @@ fn F() { // CHECK:STDOUT: %return.patt.loc4_46.2 => constants.%return.patt // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- deduce_nested_generic_class.carbon +// CHECK:STDOUT: --- deduce_nested_generic_class.carbon = $deduce_nested_generic_class // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/generic/deduce_nested_facet_value.carbon b/toolchain/check/testdata/function/generic/deduce_nested_facet_value.carbon index 439758ed19c5..746fbfeaacc0 100644 --- a/toolchain/check/testdata/function/generic/deduce_nested_facet_value.carbon +++ b/toolchain/check/testdata/function/generic/deduce_nested_facet_value.carbon @@ -37,7 +37,7 @@ fn F() { (CC(DD)) as Z; } -// CHECK:STDOUT: --- deduce_nested_facet_value.carbon +// CHECK:STDOUT: --- deduce_nested_facet_value.carbon = $deduce_nested_facet_value // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/generic/default_values.carbon b/toolchain/check/testdata/function/generic/default_values.carbon index 10230d820f5b..2728fb4b1eb6 100644 --- a/toolchain/check/testdata/function/generic/default_values.carbon +++ b/toolchain/check/testdata/function/generic/default_values.carbon @@ -35,7 +35,7 @@ fn G() { //@dump-sem-ir-end -// CHECK:STDOUT: --- generic_fn_specific_param.carbon +// CHECK:STDOUT: --- generic_fn_specific_param.carbon = $generic_fn_specific_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 190185c82d87..85feedb148c9 100644 --- a/toolchain/check/testdata/function/generic/fail_deduce_imported_function.carbon +++ b/toolchain/check/testdata/function/generic/fail_deduce_imported_function.carbon @@ -55,7 +55,7 @@ fn B() { Lib.A({.b = {}}); } -// CHECK:STDOUT: --- lib.carbon +// CHECK:STDOUT: --- lib.carbon = $lib // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -143,7 +143,7 @@ fn B() { // CHECK:STDOUT: %x.patt.loc4_20.2 => constants.%x.patt // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_deduce_imported_function.carbon +// CHECK:STDOUT: --- fail_deduce_imported_function.carbon = $fail_deduce_imported_function // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/generic/forward_decl.carbon b/toolchain/check/testdata/function/generic/forward_decl.carbon index 82dc7adbd6e8..c4ee10565498 100644 --- a/toolchain/check/testdata/function/generic/forward_decl.carbon +++ b/toolchain/check/testdata/function/generic/forward_decl.carbon @@ -14,7 +14,7 @@ fn F(generic T: type); -// CHECK:STDOUT: --- forward_decl.carbon +// CHECK:STDOUT: --- forward_decl.carbon = $forward_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/generic/import_specific.carbon b/toolchain/check/testdata/function/generic/import_specific.carbon index 57530ef5b6df..76305066229b 100644 --- a/toolchain/check/testdata/function/generic/import_specific.carbon +++ b/toolchain/check/testdata/function/generic/import_specific.carbon @@ -38,7 +38,7 @@ fn H() { G(C); } -// CHECK:STDOUT: --- library.carbon +// CHECK:STDOUT: --- library.carbon = $library // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -127,7 +127,7 @@ fn H() { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- user.carbon +// CHECK:STDOUT: --- user.carbon = $user // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/generic/indirect_generic_type.carbon b/toolchain/check/testdata/function/generic/indirect_generic_type.carbon index 6e33aad30fc8..6da2a58d3273 100644 --- a/toolchain/check/testdata/function/generic/indirect_generic_type.carbon +++ b/toolchain/check/testdata/function/generic/indirect_generic_type.carbon @@ -21,7 +21,7 @@ fn F(generic T: type, p: T**) -> T* { } -// CHECK:STDOUT: --- pointer_to_pointer.carbon +// CHECK:STDOUT: --- pointer_to_pointer.carbon = $pointer_to_pointer // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/generic/param_in_type.carbon b/toolchain/check/testdata/function/generic/param_in_type.carbon index 527b3b9071a6..81750a19bacd 100644 --- a/toolchain/check/testdata/function/generic/param_in_type.carbon +++ b/toolchain/check/testdata/function/generic/param_in_type.carbon @@ -14,7 +14,7 @@ fn F(generic N: i32, a: array(i32, N)*); -// CHECK:STDOUT: --- param_in_type.carbon +// CHECK:STDOUT: --- param_in_type.carbon = $param_in_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/generic/redeclare.carbon b/toolchain/check/testdata/function/generic/redeclare.carbon index 230672b856a4..da63d73c7fe9 100644 --- a/toolchain/check/testdata/function/generic/redeclare.carbon +++ b/toolchain/check/testdata/function/generic/redeclare.carbon @@ -121,7 +121,7 @@ fn F(generic U: type, generic T: type) -> U* { return F(T); } -// CHECK:STDOUT: --- redeclare.carbon +// CHECK:STDOUT: --- redeclare.carbon = $redeclare // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -224,7 +224,7 @@ fn F(generic U: type, generic T: type) -> U* { // CHECK:STDOUT: %F.specific_fn.loc7_10.2 => constants.%F.specific_fn // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_different_return_type.carbon +// CHECK:STDOUT: --- fail_different_return_type.carbon = $fail_different_return_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -370,7 +370,7 @@ fn F(generic U: type, generic T: type) -> U* { // CHECK:STDOUT: %return.patt.loc18_40.2 => constants.%return.patt.669 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_reorder.carbon +// CHECK:STDOUT: --- fail_reorder.carbon = $fail_reorder // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -520,7 +520,7 @@ fn F(generic U: type, generic T: type) -> U* { // CHECK:STDOUT: %return.patt.loc18_47.2 => constants.%return.patt.669 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_rename.carbon +// CHECK:STDOUT: --- fail_rename.carbon = $fail_rename // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/generic/resolve_used.carbon b/toolchain/check/testdata/function/generic/resolve_used.carbon index fa3c4d3498b2..01f305c98c81 100644 --- a/toolchain/check/testdata/function/generic/resolve_used.carbon +++ b/toolchain/check/testdata/function/generic/resolve_used.carbon @@ -46,7 +46,7 @@ fn CallNegative() { } -// CHECK:STDOUT: --- fail_todo_call_monomorphization_error.carbon +// CHECK:STDOUT: --- fail_todo_call_monomorphization_error.carbon = $fail_todo_call_monomorphization_error // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/generic/return_slot.carbon b/toolchain/check/testdata/function/generic/return_slot.carbon index fffc0aa7cf16..7bf5c1d073d0 100644 --- a/toolchain/check/testdata/function/generic/return_slot.carbon +++ b/toolchain/check/testdata/function/generic/return_slot.carbon @@ -24,7 +24,7 @@ fn G() { var unused c: C = Wrap(C).Make(); } -// CHECK:STDOUT: --- return_slot.carbon +// CHECK:STDOUT: --- return_slot.carbon = $return_slot // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/generic/template_param.carbon b/toolchain/check/testdata/function/generic/template_param.carbon index 44509cd8b20e..5f7a298f413d 100644 --- a/toolchain/check/testdata/function/generic/template_param.carbon +++ b/toolchain/check/testdata/function/generic/template_param.carbon @@ -23,7 +23,7 @@ fn G() { F({}); } -// CHECK:STDOUT: --- fn.carbon +// CHECK:STDOUT: --- fn.carbon = $fn // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/generic/type_param.carbon b/toolchain/check/testdata/function/generic/type_param.carbon index a7081d8cfb8e..9d09ac0026e2 100644 --- a/toolchain/check/testdata/function/generic/type_param.carbon +++ b/toolchain/check/testdata/function/generic/type_param.carbon @@ -18,7 +18,7 @@ fn F(generic T: type) { } -// CHECK:STDOUT: --- type_param.carbon +// CHECK:STDOUT: --- type_param.carbon = $type_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/function/generic/type_param_scope.carbon b/toolchain/check/testdata/function/generic/type_param_scope.carbon index 8c13ee46bd9c..80e821368f7a 100644 --- a/toolchain/check/testdata/function/generic/type_param_scope.carbon +++ b/toolchain/check/testdata/function/generic/type_param_scope.carbon @@ -22,7 +22,7 @@ fn F(generic T: type, n: T*) -> T* { } -// CHECK:STDOUT: --- local_let.carbon +// CHECK:STDOUT: --- local_let.carbon = $local_let // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/generic/call_basic_depth.carbon b/toolchain/check/testdata/generic/call_basic_depth.carbon index b4609fcab1f3..faa44216c98a 100644 --- a/toolchain/check/testdata/generic/call_basic_depth.carbon +++ b/toolchain/check/testdata/generic/call_basic_depth.carbon @@ -46,7 +46,7 @@ fn M() { } -// CHECK:STDOUT: --- call_basic_depth.carbon +// CHECK:STDOUT: --- call_basic_depth.carbon = $call_basic_depth // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/generic/complete_type.carbon b/toolchain/check/testdata/generic/complete_type.carbon index cc20a5cba766..e29d2bccc7e1 100644 --- a/toolchain/check/testdata/generic/complete_type.carbon +++ b/toolchain/check/testdata/generic/complete_type.carbon @@ -98,7 +98,7 @@ fn F(generic T: type, p: T*) { // CHECK:STDERR: fn G(p: B*) { F(B, p); } -// CHECK:STDOUT: --- fail_incomplete_in_class.carbon +// CHECK:STDOUT: --- fail_incomplete_in_class.carbon = $fail_incomplete_in_class // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -222,7 +222,7 @@ fn G(p: B*) { F(B, p); } // CHECK:STDOUT: %complete_type.loc8_1.2 => constants.%complete_type.a68 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- incomplete_in_function.carbon +// CHECK:STDOUT: --- incomplete_in_function.carbon = $incomplete_in_function // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -358,7 +358,7 @@ fn G(p: B*) { F(B, p); } // CHECK:STDOUT: %require_complete => constants.%complete_type.85b // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_incomplete_in_function_at_eof.carbon +// CHECK:STDOUT: --- fail_incomplete_in_function_at_eof.carbon = $fail_incomplete_in_function_at_eof // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/generic/dependent_param.carbon b/toolchain/check/testdata/generic/dependent_param.carbon index 0b02a346d3fc..53f818cbc1a7 100644 --- a/toolchain/check/testdata/generic/dependent_param.carbon +++ b/toolchain/check/testdata/generic/dependent_param.carbon @@ -27,7 +27,7 @@ var n: i32 = Outer(i32).Inner(42).Get(); //@dump-sem-ir-end -// CHECK:STDOUT: --- nested_class.carbon +// CHECK:STDOUT: --- nested_class.carbon = $nested_class // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/generic/dot_self_symbolic_type.carbon b/toolchain/check/testdata/generic/dot_self_symbolic_type.carbon index 61cfd2fe4f6e..b8a02e1830c4 100644 --- a/toolchain/check/testdata/generic/dot_self_symbolic_type.carbon +++ b/toolchain/check/testdata/generic/dot_self_symbolic_type.carbon @@ -80,7 +80,7 @@ fn H(generic T: type) { D({}).G(T); } -// CHECK:STDOUT: --- fail_dot_self_symbolic_type.carbon +// CHECK:STDOUT: --- fail_dot_self_symbolic_type.carbon = $fail_dot_self_symbolic_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -314,7 +314,7 @@ fn H(generic T: type) { // CHECK:STDOUT: %C.F => constants.%C.F.0b5 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- dot_self_symbolic_in_impl_lookup.carbon +// CHECK:STDOUT: --- dot_self_symbolic_in_impl_lookup.carbon = $dot_self_symbolic_in_impl_lookup // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/generic/local.carbon b/toolchain/check/testdata/generic/local.carbon index 09907b461a27..329d89848aea 100644 --- a/toolchain/check/testdata/generic/local.carbon +++ b/toolchain/check/testdata/generic/local.carbon @@ -48,7 +48,7 @@ library "[[@TEST_NAME]]"; class C(C: type) { } -// CHECK:STDOUT: --- class.carbon +// CHECK:STDOUT: --- class.carbon = $class // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -261,7 +261,7 @@ class C(C: type) { // CHECK:STDOUT: %complete_type.loc7_3.2 => constants.%complete_type.c49 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_param_shadows_class.carbon +// CHECK:STDOUT: --- fail_param_shadows_class.carbon = $fail_param_shadows_class // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -328,7 +328,7 @@ class C(C: type) { // CHECK:STDOUT: %C.loc14_12.1 => constants.%C.67d // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- nonlocal_param_shadows_class.carbon +// CHECK:STDOUT: --- nonlocal_param_shadows_class.carbon = $nonlocal_param_shadows_class // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/generic/local_function.carbon b/toolchain/check/testdata/generic/local_function.carbon index ce6a94f3b08b..26dd827bac17 100644 --- a/toolchain/check/testdata/generic/local_function.carbon +++ b/toolchain/check/testdata/generic/local_function.carbon @@ -49,7 +49,7 @@ fn CallEnclosingTemplate() -> i32 { return EnclosingTemplate(S); } -// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: --- basic.carbon = $basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -133,7 +133,7 @@ fn CallEnclosingTemplate() -> i32 { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_enclosing_local.carbon +// CHECK:STDOUT: --- use_enclosing_local.carbon = $use_enclosing_local // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/generic/template/convert.carbon b/toolchain/check/testdata/generic/template/convert.carbon index 53a9e8ef4fb4..a1829c3cbaaf 100644 --- a/toolchain/check/testdata/generic/template/convert.carbon +++ b/toolchain/check/testdata/generic/template/convert.carbon @@ -311,7 +311,7 @@ fn Run() { } //@dump-sem-ir-end -// CHECK:STDOUT: --- convert.carbon +// CHECK:STDOUT: --- convert.carbon = $convert // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -468,7 +468,7 @@ fn Run() { // CHECK:STDOUT: %.loc6_16.3 => // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- initialize_dependent_target_from_literal.carbon +// CHECK:STDOUT: --- initialize_dependent_target_from_literal.carbon = $initialize_dependent_target_from_literal // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -622,7 +622,7 @@ fn Run() { // CHECK:STDOUT: %.loc6_3.8 => // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- initialize_primitive.carbon +// CHECK:STDOUT: --- initialize_primitive.carbon = $initialize_primitive // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -766,7 +766,7 @@ fn Run() { // CHECK:STDOUT: %.loc6_3.5 => // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- initialize_from_tuple.carbon +// CHECK:STDOUT: --- initialize_from_tuple.carbon = $initialize_from_tuple // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1154,7 +1154,7 @@ fn Run() { // CHECK:STDOUT: %.loc9_3.14 => // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- initialize_from_nested_literal.carbon +// CHECK:STDOUT: --- initialize_from_nested_literal.carbon = $initialize_from_nested_literal // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1687,7 +1687,7 @@ fn Run() { // CHECK:STDOUT: %.loc9_3.14 => // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- as.carbon +// CHECK:STDOUT: --- as.carbon = $as.2 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1859,7 +1859,7 @@ fn Run() { // CHECK:STDOUT: %.loc6_18.3 => // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- as_type.carbon +// CHECK:STDOUT: --- as_type.carbon = $as_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2028,7 +2028,7 @@ fn Run() { // CHECK:STDOUT: %.loc6_16.6 => // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- splice_inst_storage_arg.carbon +// CHECK:STDOUT: --- splice_inst_storage_arg.carbon = $splice_inst_storage_arg // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2328,7 +2328,7 @@ fn Run() { // CHECK:STDOUT: %.loc13_32.3 => // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- initialize_from_template_method_call.carbon +// CHECK:STDOUT: --- initialize_from_template_method_call.carbon = $initialize_from_template_method_call // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/generic/template/dependence.carbon b/toolchain/check/testdata/generic/template/dependence.carbon index eae5090c582d..ffb6cda82cf3 100644 --- a/toolchain/check/testdata/generic/template/dependence.carbon +++ b/toolchain/check/testdata/generic/template/dependence.carbon @@ -35,7 +35,7 @@ fn F(template T: type, generic U: type) -> (T, U) { //@dump-sem-ir-end -// CHECK:STDOUT: --- type.carbon +// CHECK:STDOUT: --- type.carbon = $type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -255,7 +255,7 @@ fn F(template T: type, generic U: type) -> (T, U) { // CHECK:STDOUT: %.loc6_12.3 => // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- mixed.carbon +// CHECK:STDOUT: --- mixed.carbon = $mixed // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/generic/template/member_access.carbon b/toolchain/check/testdata/generic/template/member_access.carbon index b8f61789a148..e8d37cb22321 100644 --- a/toolchain/check/testdata/generic/template/member_access.carbon +++ b/toolchain/check/testdata/generic/template/member_access.carbon @@ -136,7 +136,7 @@ fn G() { b.F(); } -// CHECK:STDOUT: --- simple_member_access.carbon +// CHECK:STDOUT: --- simple_member_access.carbon = $simple_member_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -309,7 +309,7 @@ fn G() { // CHECK:STDOUT: %.loc6_17.8 => // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- compound_member_access.carbon +// CHECK:STDOUT: --- compound_member_access.carbon = $compound_member_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/generic/template/member_out_of_line.carbon b/toolchain/check/testdata/generic/template/member_out_of_line.carbon index f0d3d6cf987c..4d3507396345 100644 --- a/toolchain/check/testdata/generic/template/member_out_of_line.carbon +++ b/toolchain/check/testdata/generic/template/member_out_of_line.carbon @@ -60,7 +60,7 @@ fn Class(template T: type).G(self) -> T.U { } //@dump-sem-ir-end -// CHECK:STDOUT: --- fail_todo_basic.carbon +// CHECK:STDOUT: --- fail_todo_basic.carbon = $fail_todo_basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/generic/template/operator.carbon b/toolchain/check/testdata/generic/template/operator.carbon index c27b6549f2c3..d73b91192c42 100644 --- a/toolchain/check/testdata/generic/template/operator.carbon +++ b/toolchain/check/testdata/generic/template/operator.carbon @@ -74,7 +74,7 @@ fn G() { F(B); } -// CHECK:STDOUT: --- assign.carbon +// CHECK:STDOUT: --- assign.carbon = $assign // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/generic/template/template_access_assoc_const.carbon b/toolchain/check/testdata/generic/template/template_access_assoc_const.carbon index ea9ab291adaf..1e1f68e03b5e 100644 --- a/toolchain/check/testdata/generic/template/template_access_assoc_const.carbon +++ b/toolchain/check/testdata/generic/template/template_access_assoc_const.carbon @@ -26,7 +26,7 @@ interface I(template T: type, N: T.I1) { // } // impl C as I(C, C) where .I1 = C {} -// CHECK:STDOUT: --- template_access_assoc_const.carbon +// CHECK:STDOUT: --- template_access_assoc_const.carbon = $template_access_assoc_const // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/generic/template/unimplemented.carbon b/toolchain/check/testdata/generic/template/unimplemented.carbon index 759497bd92ac..061caa91358c 100644 --- a/toolchain/check/testdata/generic/template/unimplemented.carbon +++ b/toolchain/check/testdata/generic/template/unimplemented.carbon @@ -51,7 +51,7 @@ fn F(template c: C) { *c.n; } -// CHECK:STDOUT: --- fail_todo_unimplemented_operator.carbon +// CHECK:STDOUT: --- fail_todo_unimplemented_operator.carbon = $fail_todo_unimplemented_operator // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -135,7 +135,7 @@ fn F(template c: C) { // CHECK:STDOUT: %x.patt.loc6_25.2 => constants.%x.patt // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_unimplemented_value.carbon +// CHECK:STDOUT: --- fail_todo_unimplemented_value.carbon = $fail_todo_unimplemented_value // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/generic/var_param.carbon b/toolchain/check/testdata/generic/var_param.carbon index 0ea75c4b2693..522c8ce1154c 100644 --- a/toolchain/check/testdata/generic/var_param.carbon +++ b/toolchain/check/testdata/generic/var_param.carbon @@ -28,7 +28,7 @@ fn Test(x: i32) { //@dump-sem-ir-end } -// CHECK:STDOUT: --- var_param.carbon +// CHECK:STDOUT: --- var_param.carbon = $var_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/global/basics.carbon b/toolchain/check/testdata/global/basics.carbon index df91c3ac7bcb..4d104ce69e16 100644 --- a/toolchain/check/testdata/global/basics.carbon +++ b/toolchain/check/testdata/global/basics.carbon @@ -53,7 +53,7 @@ fn Make() -> A; var a: A = Make(); //@dump-sem-ir-end -// CHECK:STDOUT: --- decl.carbon +// CHECK:STDOUT: --- decl.carbon = $decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -100,7 +100,7 @@ var a: A = Make(); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- simple_init.carbon +// CHECK:STDOUT: --- simple_init.carbon = $simple_init // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -133,7 +133,7 @@ var a: A = Make(); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- simple_init_with_fn.carbon +// CHECK:STDOUT: --- simple_init_with_fn.carbon = $simple_init_with_fn // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -167,7 +167,7 @@ var a: A = Make(); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- class_init.carbon +// CHECK:STDOUT: --- class_init.carbon = $class_init // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -199,7 +199,7 @@ var a: A = Make(); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- class_init_from_fn.carbon +// CHECK:STDOUT: --- class_init_from_fn.carbon = $class_init_from_fn // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/if/basics.carbon b/toolchain/check/testdata/if/basics.carbon index 6598aaec6b3f..b751adc294f8 100644 --- a/toolchain/check/testdata/if/basics.carbon +++ b/toolchain/check/testdata/if/basics.carbon @@ -118,7 +118,7 @@ fn VarScope(b: bool) -> bool { return n; } -// CHECK:STDOUT: --- else.carbon +// CHECK:STDOUT: --- else.carbon = $else // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -168,7 +168,7 @@ fn VarScope(b: bool) -> bool { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- no_else.carbon +// CHECK:STDOUT: --- no_else.carbon = $no_else // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -211,7 +211,7 @@ fn VarScope(b: bool) -> bool { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- unreachable_fallthrough.carbon +// CHECK:STDOUT: --- unreachable_fallthrough.carbon = $unreachable_fallthrough // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/if/lifetime.carbon b/toolchain/check/testdata/if/lifetime.carbon index a7db0da3c338..a39c0f8ec4bf 100644 --- a/toolchain/check/testdata/if/lifetime.carbon +++ b/toolchain/check/testdata/if/lifetime.carbon @@ -30,7 +30,7 @@ fn F() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- condition_lifetime.carbon +// CHECK:STDOUT: --- condition_lifetime.carbon = $condition_lifetime // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/if_expr/basic.carbon b/toolchain/check/testdata/if_expr/basic.carbon index 4233baea256a..20c11452906a 100644 --- a/toolchain/check/testdata/if_expr/basic.carbon +++ b/toolchain/check/testdata/if_expr/basic.carbon @@ -17,7 +17,7 @@ fn F(b: bool, n: i32, m: i32) -> i32 { return if b then x[m] else x[n]; } -// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: --- basic.carbon = $basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/if_expr/constant_condition.carbon b/toolchain/check/testdata/if_expr/constant_condition.carbon index 450325e64314..0e6fe0c6dedc 100644 --- a/toolchain/check/testdata/if_expr/constant_condition.carbon +++ b/toolchain/check/testdata/if_expr/constant_condition.carbon @@ -35,7 +35,7 @@ fn PartiallyConstant(t: type) -> i32 { return *w; } -// CHECK:STDOUT: --- constant_condition.carbon +// CHECK:STDOUT: --- constant_condition.carbon = $constant_condition // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/if_expr/control_flow.carbon b/toolchain/check/testdata/if_expr/control_flow.carbon index 8b427a68ce2d..169ed4053a29 100644 --- a/toolchain/check/testdata/if_expr/control_flow.carbon +++ b/toolchain/check/testdata/if_expr/control_flow.carbon @@ -19,7 +19,7 @@ fn F(b: bool) -> i32 { return if b then A() else B(); } -// CHECK:STDOUT: --- control_flow.carbon +// CHECK:STDOUT: --- control_flow.carbon = $control_flow // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/if_expr/fail_not_in_function.carbon b/toolchain/check/testdata/if_expr/fail_not_in_function.carbon index 20434e97c7e3..abecc0687fb6 100644 --- a/toolchain/check/testdata/if_expr/fail_not_in_function.carbon +++ b/toolchain/check/testdata/if_expr/fail_not_in_function.carbon @@ -113,13 +113,13 @@ fn F() { } } -// CHECK:STDOUT: --- fail_basic.carbon +// CHECK:STDOUT: --- fail_basic.carbon = $fail_basic // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_types.carbon +// CHECK:STDOUT: --- fail_types.carbon = $fail_types // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_in_param.carbon +// CHECK:STDOUT: --- fail_in_param.carbon = $fail_in_param // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_class.carbon +// CHECK:STDOUT: --- fail_class.carbon = $fail_class // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -133,7 +133,7 @@ fn F() { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_nested_class.carbon +// CHECK:STDOUT: --- fail_nested_class.carbon = $fail_nested_class // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/if_expr/fail_partial_constant.carbon b/toolchain/check/testdata/if_expr/fail_partial_constant.carbon index f4c574e9bf2c..eaf09d3b9a69 100644 --- a/toolchain/check/testdata/if_expr/fail_partial_constant.carbon +++ b/toolchain/check/testdata/if_expr/fail_partial_constant.carbon @@ -53,7 +53,7 @@ fn ChosenBranchIsNonConstant(t: type) { var unused w: if false then i32 else t = 1; } -// CHECK:STDOUT: --- fail_non_constant_condition.carbon +// CHECK:STDOUT: --- fail_non_constant_condition.carbon = $fail_non_constant_condition // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -132,7 +132,7 @@ fn ChosenBranchIsNonConstant(t: type) { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_non_constant_result.carbon +// CHECK:STDOUT: --- fail_non_constant_result.carbon = $fail_non_constant_result // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/if_expr/nested.carbon b/toolchain/check/testdata/if_expr/nested.carbon index 9daaee023308..0d7ea196d350 100644 --- a/toolchain/check/testdata/if_expr/nested.carbon +++ b/toolchain/check/testdata/if_expr/nested.carbon @@ -16,7 +16,7 @@ fn F(a: bool, b: bool, c: bool) -> i32 { return if a then if b then 1 else 2 else if c then 3 else 4; } -// CHECK:STDOUT: --- nested.carbon +// CHECK:STDOUT: --- nested.carbon = $nested // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/if_expr/struct.carbon b/toolchain/check/testdata/if_expr/struct.carbon index 60a78141e99c..2f3202a3861b 100644 --- a/toolchain/check/testdata/if_expr/struct.carbon +++ b/toolchain/check/testdata/if_expr/struct.carbon @@ -19,7 +19,7 @@ fn F(cond: bool) { G(if cond then a else a); } -// CHECK:STDOUT: --- struct.carbon +// CHECK:STDOUT: --- struct.carbon = $struct // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/assoc_const_self.carbon b/toolchain/check/testdata/impl/assoc_const_self.carbon index d379f083b6c3..4be38462a401 100644 --- a/toolchain/check/testdata/impl/assoc_const_self.carbon +++ b/toolchain/check/testdata/impl/assoc_const_self.carbon @@ -123,7 +123,7 @@ fn CallF() { } -// CHECK:STDOUT: --- assoc_const_self.carbon +// CHECK:STDOUT: --- assoc_const_self.carbon = $assoc_const_self // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -318,7 +318,7 @@ fn CallF() { // CHECK:STDOUT: %Self.as_type => constants.%i32 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_assoc_const_mismatch.carbon +// CHECK:STDOUT: --- fail_assoc_const_mismatch.carbon = $fail_assoc_const_mismatch // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -437,7 +437,7 @@ fn CallF() { // CHECK:STDOUT: %Self.as_type => constants.%empty_struct_type // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_assoc_const_not_constant_after_conversion.carbon +// CHECK:STDOUT: --- fail_assoc_const_not_constant_after_conversion.carbon = $fail_assoc_const_not_constant_after_conversion // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -638,7 +638,7 @@ fn CallF() { // CHECK:STDOUT: %Self.as_type => constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_monomorphization_failure.carbon +// CHECK:STDOUT: --- fail_monomorphization_failure.carbon = $fail_monomorphization_failure // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -830,7 +830,7 @@ fn CallF() { // CHECK:STDOUT: %assoc0 => constants.%assoc0.ace // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_constrained_fn.carbon +// CHECK:STDOUT: --- fail_todo_constrained_fn.carbon = $fail_todo_constrained_fn // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/basic.carbon b/toolchain/check/testdata/impl/basic.carbon index 8789fa5678e0..0e0e03a0baf0 100644 --- a/toolchain/check/testdata/impl/basic.carbon +++ b/toolchain/check/testdata/impl/basic.carbon @@ -132,7 +132,7 @@ final impl C(invalid) as I {} // CHECK:STDERR: final impl C(invalid) as I {} -// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: --- basic.carbon = $basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/compound.carbon b/toolchain/check/testdata/impl/compound.carbon index d562e0b25143..01ee3e16922c 100644 --- a/toolchain/check/testdata/impl/compound.carbon +++ b/toolchain/check/testdata/impl/compound.carbon @@ -133,7 +133,7 @@ fn InstanceCallFail() { } -// CHECK:STDOUT: --- core.carbon +// CHECK:STDOUT: --- core.carbon = $core // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -257,7 +257,7 @@ fn InstanceCallFail() { // CHECK:STDOUT: %return.patt.loc4_20.2 => constants.%return.patt // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- non-instance_success.carbon +// CHECK:STDOUT: --- non-instance_success.carbon = $non-instance_success // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -366,7 +366,7 @@ fn InstanceCallFail() { // CHECK:STDOUT: // CHECK:STDOUT: specific @NonInstance1.WithSelf.F1(constants.%NonInstance1.facet) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_non-instance.carbon +// CHECK:STDOUT: --- fail_non-instance.carbon = $fail_non-instance // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -601,7 +601,7 @@ fn InstanceCallFail() { // CHECK:STDOUT: %assoc0 => constants.%assoc0.b94 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_non-instance_indirect.carbon +// CHECK:STDOUT: --- fail_non-instance_indirect.carbon = $fail_non-instance_indirect // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -839,7 +839,7 @@ fn InstanceCallFail() { // CHECK:STDOUT: %assoc0 => constants.%assoc0.7ad // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- instance_success.carbon +// CHECK:STDOUT: --- instance_success.carbon = $instance_success // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1039,7 +1039,7 @@ fn InstanceCallFail() { // CHECK:STDOUT: %self.patt.loc4_9.2 => constants.%self.patt.6f9 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_instance.carbon +// CHECK:STDOUT: --- fail_instance.carbon = $fail_instance // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/declaration.carbon b/toolchain/check/testdata/impl/declaration.carbon index 9534ac3562a7..9e0f8f2d4578 100644 --- a/toolchain/check/testdata/impl/declaration.carbon +++ b/toolchain/check/testdata/impl/declaration.carbon @@ -18,7 +18,7 @@ impl i32 as I; impl i32 as I {} -// CHECK:STDOUT: --- declaration.carbon +// CHECK:STDOUT: --- declaration.carbon = $declaration // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/empty.carbon b/toolchain/check/testdata/impl/empty.carbon index 3e63d71e4b94..231e3e6b0ab0 100644 --- a/toolchain/check/testdata/impl/empty.carbon +++ b/toolchain/check/testdata/impl/empty.carbon @@ -18,7 +18,7 @@ interface Empty { impl i32 as Empty { } -// CHECK:STDOUT: --- empty.carbon +// CHECK:STDOUT: --- empty.carbon = $empty // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/error_recovery.carbon b/toolchain/check/testdata/impl/error_recovery.carbon index c2382f845259..61036c392647 100644 --- a/toolchain/check/testdata/impl/error_recovery.carbon +++ b/toolchain/check/testdata/impl/error_recovery.carbon @@ -150,7 +150,7 @@ impl C as I { } //@dump-sem-ir-end -// CHECK:STDOUT: --- fail_runtime_generic_param.carbon +// CHECK:STDOUT: --- fail_runtime_generic_param.carbon = $fail_runtime_generic_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -177,7 +177,7 @@ impl C as I { // CHECK:STDOUT: witness = %I.impl_witness // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_nonfinal_lookup_impl_witness_error_in_import.carbon +// CHECK:STDOUT: --- fail_nonfinal_lookup_impl_witness_error_in_import.carbon = $fail_nonfinal_lookup_impl_witness_error_in_import // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -234,7 +234,7 @@ impl C as I { // CHECK:STDOUT: %T.loc15_15.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_nonfinal_lookup_impl_witness_error.carbon +// CHECK:STDOUT: --- fail_nonfinal_lookup_impl_witness_error.carbon = $fail_nonfinal_lookup_impl_witness_error // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -301,7 +301,7 @@ impl C as I { // CHECK:STDOUT: %F.specific_fn.loc21_3.2 => // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_final_lookup_impl_witness_error.carbon +// CHECK:STDOUT: --- fail_final_lookup_impl_witness_error.carbon = $fail_final_lookup_impl_witness_error // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -326,7 +326,7 @@ impl C as I { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_invalid_fn_syntax_in_impl.carbon +// CHECK:STDOUT: --- fail_invalid_fn_syntax_in_impl.carbon = $fail_invalid_fn_syntax_in_impl // CHECK:STDOUT: // CHECK:STDOUT: impl @: .inst{{[0-9A-F]+}}.loc9_6 as .inst{{[0-9A-F]+}}.loc9_11; // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/extend_impl.carbon b/toolchain/check/testdata/impl/extend_impl.carbon index e8cf93868ec9..7a4da1b7ad97 100644 --- a/toolchain/check/testdata/impl/extend_impl.carbon +++ b/toolchain/check/testdata/impl/extend_impl.carbon @@ -118,7 +118,7 @@ interface I {} // CHECK:STDERR: extend impl nonexistent* as I {} -// CHECK:STDOUT: --- extend_impl.carbon +// CHECK:STDOUT: --- extend_impl.carbon = $extend_impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/extend_impl_generic.carbon b/toolchain/check/testdata/impl/extend_impl_generic.carbon index 0179baaabfb2..423537e5548e 100644 --- a/toolchain/check/testdata/impl/extend_impl_generic.carbon +++ b/toolchain/check/testdata/impl/extend_impl_generic.carbon @@ -52,7 +52,7 @@ class X(U: type) { } -// CHECK:STDOUT: --- extend_impl_generic_interface.carbon +// CHECK:STDOUT: --- extend_impl_generic_interface.carbon = $extend_impl_generic_interface // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -486,7 +486,7 @@ class X(U: type) { // CHECK:STDOUT: %assoc0.loc5_14.2 => constants.%assoc0.f78 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- extend_impl_generic_class.carbon +// CHECK:STDOUT: --- extend_impl_generic_class.carbon = $extend_impl_generic_class // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/fail_alias.carbon b/toolchain/check/testdata/impl/fail_alias.carbon index 6d7e0fe97910..ed11119d7e65 100644 --- a/toolchain/check/testdata/impl/fail_alias.carbon +++ b/toolchain/check/testdata/impl/fail_alias.carbon @@ -32,7 +32,7 @@ impl AC as AI {} // CHECK:STDERR: impl AC as AI {} -// CHECK:STDOUT: --- fail_alias.carbon +// CHECK:STDOUT: --- fail_alias.carbon = $fail_alias // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/fail_call_invalid.carbon b/toolchain/check/testdata/impl/fail_call_invalid.carbon index 5a44539e0bf0..7b986540e042 100644 --- a/toolchain/check/testdata/impl/fail_call_invalid.carbon +++ b/toolchain/check/testdata/impl/fail_call_invalid.carbon @@ -31,7 +31,7 @@ fn InstanceCall(n: i32) { } -// CHECK:STDOUT: --- fail_call_invalid.carbon +// CHECK:STDOUT: --- fail_call_invalid.carbon = $fail_call_invalid // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/fail_extend_impl_forall.carbon b/toolchain/check/testdata/impl/fail_extend_impl_forall.carbon index 88fa8b0c5134..91af3c26b226 100644 --- a/toolchain/check/testdata/impl/fail_extend_impl_forall.carbon +++ b/toolchain/check/testdata/impl/fail_extend_impl_forall.carbon @@ -28,7 +28,7 @@ class C { } } -// CHECK:STDOUT: --- fail_extend_impl_forall.carbon +// CHECK:STDOUT: --- fail_extend_impl_forall.carbon = $fail_extend_impl_forall // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/fail_extend_impl_scope.carbon b/toolchain/check/testdata/impl/fail_extend_impl_scope.carbon index 98d92251c4e4..93d3b9c33ce8 100644 --- a/toolchain/check/testdata/impl/fail_extend_impl_scope.carbon +++ b/toolchain/check/testdata/impl/fail_extend_impl_scope.carbon @@ -73,7 +73,7 @@ fn F() { ({} as Point).Zero(); } -// CHECK:STDOUT: --- fail_extend_impl_file_scope.carbon +// CHECK:STDOUT: --- fail_extend_impl_file_scope.carbon = $fail_extend_impl_file_scope // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -129,7 +129,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: specific @I.WithSelf(constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_extend_impl_function_scope.carbon +// CHECK:STDOUT: --- fail_extend_impl_function_scope.carbon = $fail_extend_impl_function_scope // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -194,7 +194,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: specific @J.WithSelf(constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_extend_impl_self_interface.carbon +// CHECK:STDOUT: --- fail_extend_impl_self_interface.carbon = $fail_extend_impl_self_interface // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/fail_extend_impl_type_as.carbon b/toolchain/check/testdata/impl/fail_extend_impl_type_as.carbon index 6b8860d7db57..b3f6636cd47a 100644 --- a/toolchain/check/testdata/impl/fail_extend_impl_type_as.carbon +++ b/toolchain/check/testdata/impl/fail_extend_impl_type_as.carbon @@ -57,7 +57,7 @@ class E { extend impl Self as I {} } -// CHECK:STDOUT: --- fail_extend_impl_type_as.carbon +// CHECK:STDOUT: --- fail_extend_impl_type_as.carbon = $fail_extend_impl_type_as // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/fail_extend_non_interface.carbon b/toolchain/check/testdata/impl/fail_extend_non_interface.carbon index 826a44f9c823..471799f2914d 100644 --- a/toolchain/check/testdata/impl/fail_extend_non_interface.carbon +++ b/toolchain/check/testdata/impl/fail_extend_non_interface.carbon @@ -22,7 +22,7 @@ class C { extend impl as i32; } -// CHECK:STDOUT: --- fail_extend_non_interface.carbon +// CHECK:STDOUT: --- fail_extend_non_interface.carbon = $fail_extend_non_interface // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/fail_extend_partially_defined_interface.carbon b/toolchain/check/testdata/impl/fail_extend_partially_defined_interface.carbon index 2ef4ce419b19..50157f8820d4 100644 --- a/toolchain/check/testdata/impl/fail_extend_partially_defined_interface.carbon +++ b/toolchain/check/testdata/impl/fail_extend_partially_defined_interface.carbon @@ -30,7 +30,7 @@ interface I { } } -// CHECK:STDOUT: --- fail_extend_partially_defined_interface.carbon +// CHECK:STDOUT: --- fail_extend_partially_defined_interface.carbon = $fail_extend_partially_defined_interface // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/fail_extend_undefined_interface.carbon b/toolchain/check/testdata/impl/fail_extend_undefined_interface.carbon index d77c6dde50c0..15d69e75b09d 100644 --- a/toolchain/check/testdata/impl/fail_extend_undefined_interface.carbon +++ b/toolchain/check/testdata/impl/fail_extend_undefined_interface.carbon @@ -34,7 +34,7 @@ fn F(c: C) { c.F(); } -// CHECK:STDOUT: --- fail_extend_undefined_interface.carbon +// CHECK:STDOUT: --- fail_extend_undefined_interface.carbon = $fail_extend_undefined_interface // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/fail_impl_as_scope.carbon b/toolchain/check/testdata/impl/fail_impl_as_scope.carbon index 11b2ccf45886..7c88d72201c2 100644 --- a/toolchain/check/testdata/impl/fail_impl_as_scope.carbon +++ b/toolchain/check/testdata/impl/fail_impl_as_scope.carbon @@ -108,7 +108,7 @@ class X { } -// CHECK:STDOUT: --- fail_impl_as_file_scope.carbon +// CHECK:STDOUT: --- fail_impl_as_file_scope.carbon = $fail_impl_as_file_scope // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -176,7 +176,7 @@ class X { // CHECK:STDOUT: // CHECK:STDOUT: specific @I.WithSelf(constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_impl_as_function_scope.carbon +// CHECK:STDOUT: --- fail_impl_as_function_scope.carbon = $fail_impl_as_function_scope // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -244,7 +244,7 @@ class X { // CHECK:STDOUT: // CHECK:STDOUT: specific @J.WithSelf(constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_impl_as_self_interface.carbon +// CHECK:STDOUT: --- fail_impl_as_self_interface.carbon = $fail_impl_as_self_interface // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -573,7 +573,7 @@ class X { // CHECK:STDOUT: %self.patt.loc5_13.2 => constants.%self.patt.5e8 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_impl_as_other_interface.carbon +// CHECK:STDOUT: --- fail_impl_as_other_interface.carbon = $fail_impl_as_other_interface // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/fail_impl_bad_assoc_const.carbon b/toolchain/check/testdata/impl/fail_impl_bad_assoc_const.carbon index cfd6318854e7..b3132615f7f9 100644 --- a/toolchain/check/testdata/impl/fail_impl_bad_assoc_const.carbon +++ b/toolchain/check/testdata/impl/fail_impl_bad_assoc_const.carbon @@ -28,7 +28,7 @@ interface I { let T: type; } // CHECK:STDERR: impl () as I {} -// CHECK:STDOUT: --- fail_impl_bad_assoc_const.carbon +// CHECK:STDOUT: --- fail_impl_bad_assoc_const.carbon = $fail_impl_bad_assoc_const // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 a4914d9e793e..f945f09b6e6d 100644 --- a/toolchain/check/testdata/impl/fail_impl_bad_assoc_fn.carbon +++ b/toolchain/check/testdata/impl/fail_impl_bad_assoc_fn.carbon @@ -285,7 +285,7 @@ class SelfNestedBadReturnType { } -// CHECK:STDOUT: --- fail_impl_bad_assoc_fn.carbon +// CHECK:STDOUT: --- fail_impl_bad_assoc_fn.carbon = $fail_impl_bad_assoc_fn // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/fail_impl_bad_interface.carbon b/toolchain/check/testdata/impl/fail_impl_bad_interface.carbon index 85bf99a16533..c9f8fce36bb4 100644 --- a/toolchain/check/testdata/impl/fail_impl_bad_interface.carbon +++ b/toolchain/check/testdata/impl/fail_impl_bad_interface.carbon @@ -69,7 +69,7 @@ interface I {} // CHECK:STDERR: impl {.a: bool} as type where .Self impls I {} -// CHECK:STDOUT: --- fail_impl_as_false.carbon +// CHECK:STDOUT: --- fail_impl_as_false.carbon = $fail_impl_as_false // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -111,7 +111,7 @@ impl {.a: bool} as type where .Self impls I {} // CHECK:STDOUT: witness = // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_impl_as_type.carbon +// CHECK:STDOUT: --- fail_impl_as_type.carbon = $fail_impl_as_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -143,7 +143,7 @@ impl {.a: bool} as type where .Self impls I {} // CHECK:STDOUT: witness = // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_impl_as_type_where.carbon +// CHECK:STDOUT: --- fail_impl_as_type_where.carbon = $fail_impl_as_type_where // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -193,7 +193,7 @@ impl {.a: bool} as type where .Self impls I {} // CHECK:STDOUT: witness = // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_impl_as_type_where_impls_interface.carbon +// CHECK:STDOUT: --- fail_impl_as_type_where_impls_interface.carbon = $fail_impl_as_type_where_impls_interface // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/fail_impl_bad_type.carbon b/toolchain/check/testdata/impl/fail_impl_bad_type.carbon index 1a43dffd16ab..4431d86f43dd 100644 --- a/toolchain/check/testdata/impl/fail_impl_bad_type.carbon +++ b/toolchain/check/testdata/impl/fail_impl_bad_type.carbon @@ -26,7 +26,7 @@ interface I {} // CHECK:STDERR: impl true as I {} -// CHECK:STDOUT: --- fail_impl_bad_type.carbon +// CHECK:STDOUT: --- fail_impl_bad_type.carbon = $fail_impl_bad_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/fail_redefinition.carbon b/toolchain/check/testdata/impl/fail_redefinition.carbon index 3ecf9db56fb7..b9ae085c05d0 100644 --- a/toolchain/check/testdata/impl/fail_redefinition.carbon +++ b/toolchain/check/testdata/impl/fail_redefinition.carbon @@ -28,7 +28,7 @@ impl i32 as I {} // CHECK:STDERR: impl i32 as I {} -// CHECK:STDOUT: --- fail_redefinition.carbon +// CHECK:STDOUT: --- fail_redefinition.carbon = $fail_redefinition // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/fail_self_type_mismatch.carbon b/toolchain/check/testdata/impl/fail_self_type_mismatch.carbon index 6673f39dfb60..38b49b16a6f2 100644 --- a/toolchain/check/testdata/impl/fail_self_type_mismatch.carbon +++ b/toolchain/check/testdata/impl/fail_self_type_mismatch.carbon @@ -47,7 +47,7 @@ impl i32 as I { fn F(c: C(i32)); } -// CHECK:STDOUT: --- fail_self_type_mismatch.carbon +// CHECK:STDOUT: --- fail_self_type_mismatch.carbon = $fail_self_type_mismatch // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/forward_decls.carbon b/toolchain/check/testdata/impl/forward_decls.carbon index d772f6c47932..5ed400b96e12 100644 --- a/toolchain/check/testdata/impl/forward_decls.carbon +++ b/toolchain/check/testdata/impl/forward_decls.carbon @@ -250,7 +250,7 @@ impl C as Y; impl C as X {} impl C as Y {} -// CHECK:STDOUT: --- empty.carbon +// CHECK:STDOUT: --- empty.carbon = $empty // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -320,7 +320,7 @@ impl C as Y {} // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- method.carbon +// CHECK:STDOUT: --- method.carbon = $method // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -424,7 +424,7 @@ impl C as Y {} // CHECK:STDOUT: // CHECK:STDOUT: specific @I.WithSelf.G(constants.%I.facet) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- combine.carbon +// CHECK:STDOUT: --- combine.carbon = $combine // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -520,7 +520,7 @@ impl C as Y {} // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- associated_const.carbon +// CHECK:STDOUT: --- associated_const.carbon = $associated_const // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -644,7 +644,7 @@ impl C as Y {} // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- associated_const_compound_member_access.carbon +// CHECK:STDOUT: --- associated_const_compound_member_access.carbon = $associated_const_compound_member_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -800,7 +800,7 @@ impl C as Y {} // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- associated_const_of_facet.carbon +// CHECK:STDOUT: --- associated_const_of_facet.carbon = $associated_const_of_facet // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -958,7 +958,7 @@ impl C as Y {} // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_unset_associated_const.carbon +// CHECK:STDOUT: --- fail_unset_associated_const.carbon = $fail_unset_associated_const // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1067,7 +1067,7 @@ impl C as Y {} // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_associated_const_before_interface_definition.carbon +// CHECK:STDOUT: --- fail_associated_const_before_interface_definition.carbon = $fail_associated_const_before_interface_definition // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1177,7 +1177,7 @@ impl C as Y {} // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- associated_const_of_parameterized.carbon +// CHECK:STDOUT: --- associated_const_of_parameterized.carbon = $associated_const_of_parameterized // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1376,7 +1376,7 @@ impl C as Y {} // CHECK:STDOUT: %assoc0 => constants.%assoc0.8e0 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- find_incomplete_impl.carbon +// CHECK:STDOUT: --- find_incomplete_impl.carbon = $find_incomplete_impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1548,7 +1548,7 @@ impl C as Y {} // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_two_interfaces.carbon +// CHECK:STDOUT: --- fail_todo_two_interfaces.carbon = $fail_todo_two_interfaces // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1634,7 +1634,7 @@ impl C as Y {} // CHECK:STDOUT: // CHECK:STDOUT: specific @J.WithSelf(constants.%Self.653) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_never_assigned_associated_const.carbon +// CHECK:STDOUT: --- fail_never_assigned_associated_const.carbon = $fail_never_assigned_associated_const // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1772,7 +1772,7 @@ impl C as Y {} // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- example_from_proposal_5168.carbon +// CHECK:STDOUT: --- example_from_proposal_5168.carbon = $example_from_proposal_5168 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/generic_redeclaration.carbon b/toolchain/check/testdata/impl/generic_redeclaration.carbon index 3c81129c2f70..f0d374cc0afc 100644 --- a/toolchain/check/testdata/impl/generic_redeclaration.carbon +++ b/toolchain/check/testdata/impl/generic_redeclaration.carbon @@ -109,7 +109,7 @@ impl forall [T: type] T as I { } } -// CHECK:STDOUT: --- same_self_and_interface.carbon +// CHECK:STDOUT: --- same_self_and_interface.carbon = $same_self_and_interface // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -486,7 +486,7 @@ impl forall [T: type] T as I { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_same_self_and_interface_redefined.carbon +// CHECK:STDOUT: --- fail_same_self_and_interface_redefined.carbon = $fail_same_self_and_interface_redefined // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -631,7 +631,7 @@ impl forall [T: type] T as I { // CHECK:STDOUT: %.loc18_27 => constants.%.d10 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_same_type_different_spelling.carbon +// CHECK:STDOUT: --- fail_same_type_different_spelling.carbon = $fail_same_type_different_spelling // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -725,7 +725,7 @@ impl forall [T: type] T as I { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_redefinition_generic_regions.carbon +// CHECK:STDOUT: --- fail_redefinition_generic_regions.carbon = $fail_redefinition_generic_regions // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/impl_as.carbon b/toolchain/check/testdata/impl/impl_as.carbon index b797fa494838..40a244f1f0c8 100644 --- a/toolchain/check/testdata/impl/impl_as.carbon +++ b/toolchain/check/testdata/impl/impl_as.carbon @@ -25,7 +25,7 @@ class C { } } -// CHECK:STDOUT: --- impl_as.carbon +// CHECK:STDOUT: --- impl_as.carbon = $impl_as // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/impl_as_named_constraint.carbon b/toolchain/check/testdata/impl/impl_as_named_constraint.carbon index a1cc2db0a6da..d5699f9ba674 100644 --- a/toolchain/check/testdata/impl/impl_as_named_constraint.carbon +++ b/toolchain/check/testdata/impl/impl_as_named_constraint.carbon @@ -521,132 +521,7 @@ constraint J { // CHECK:STDERR: impl () as J {} -// --- fail_named_constraint_requirement_not_set_for_equivalent.carbon -library "[[@TEST_NAME]]"; - -interface Z { - let Z1: type; -} - -constraint N { - extend require impls Z where .Z1 = (); -} - -// Did not set a value for `.Z1` but `N` provides a requirement for the value -// of `.Z1`. We don't want multiple errors for the same thing. -// CHECK:STDERR: ╭─┤ fail_named_constraint_requirement_not_set_for_equivalent.carbon:[[@LINE+11]]:1 -// CHECK:STDERR: │ let Z1: type; -// CHECK:STDERR: · ────┬─── -// CHECK:STDERR: · ╰──┤ associated constant declared here [AssociatedConstantHere] -// CHECK:STDERR: ┆ -// CHECK:STDERR: -> │ impl () as Z where .Self impls N {} -// CHECK:STDERR: · ━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━ -// CHECK:STDERR: · ┗━━┫ error: associated constant Z1 not given a value in impl of interface Z -// CHECK:STDERR: · ┃ [ImplAssociatedConstantNeedsValue] -// CHECK:STDERR: ╰──── -// CHECK:STDERR: -impl () as Z where .Self impls N {} - -fn F() { - // The constant value should be an error. - //@dump-sem-ir-begin - () as Z; - //@dump-sem-ir-end -} - -// --- fail_named_constraint_requirement_not_equal.carbon -library "[[@TEST_NAME]]"; - -interface Z { - let Z1: type; -} - -constraint N { - extend require impls Z where .Z1 = (); -} - -// CHECK:STDERR: ╭─┤ fail_named_constraint_requirement_not_equal.carbon:[[@LINE+9]]:1 -// CHECK:STDERR: -> │ impl () as Z where .Z1 = {} and .Self impls N {} -// CHECK:STDERR: · ┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ -// CHECK:STDERR: · ┗━━┫ error: constraint `Z where .Self impls N and .(Z.Z1) = {}` being -// CHECK:STDERR: · ┃ implemented requires that `().(Z.Z1)` equals `()`; found `{}` and -// CHECK:STDERR: · ┃ `()` -// CHECK:STDERR: · ┃ [IdentifiedRequireImplsNotEquivalent] -// CHECK:STDERR: ╰──── -// CHECK:STDERR: -impl () as Z where .Z1 = {} and .Self impls N {} - -fn F() { - // The constant value should be an error. - //@dump-sem-ir-begin - () as Z; - //@dump-sem-ir-end -} - -// --- fail_named_constraint_requirement_not_set_for_impls.carbon -library "[[@TEST_NAME]]"; - -interface Z { - let Z1: type; -} -interface Y {} - -constraint N { - extend require impls Z where .Z1 impls Y; -} - -// Did not set a value for `.Z1` but `N` provides a requirement for the value -// of `.Z1`. We don't want multiple errors for the same thing. -// CHECK:STDERR: ╭─┤ fail_named_constraint_requirement_not_set_for_impls.carbon:[[@LINE+11]]:1 -// CHECK:STDERR: │ let Z1: type; -// CHECK:STDERR: · ────┬─── -// CHECK:STDERR: · ╰──┤ associated constant declared here [AssociatedConstantHere] -// CHECK:STDERR: ┆ -// CHECK:STDERR: -> │ impl () as Z where .Self impls N {} -// CHECK:STDERR: · ━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━ -// CHECK:STDERR: · ┗━━┫ error: associated constant Z1 not given a value in impl of interface Z -// CHECK:STDERR: · ┃ [ImplAssociatedConstantNeedsValue] -// CHECK:STDERR: ╰──── -// CHECK:STDERR: -impl () as Z where .Self impls N {} - -fn F() { - // The constant value should be an error. - //@dump-sem-ir-begin - () as Z; - //@dump-sem-ir-end -} - -// --- fail_named_constraint_requirement_not_impld.carbon -library "[[@TEST_NAME]]"; - -interface Z { - let Z1: type; -} -interface Y {} - -constraint N { - extend require impls Z where .Z1 impls Y; -} - -// CHECK:STDERR: ╭─┤ fail_named_constraint_requirement_not_impld.carbon:[[@LINE+8]]:1 -// CHECK:STDERR: -> │ impl () as Z where .Z1 = {} and .Self impls N {} -// CHECK:STDERR: · ┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ -// CHECK:STDERR: · ┗━━┫ error: constraint `Z where .Self impls N and .(Z.Z1) = {}` being -// CHECK:STDERR: · ┃ implemented requires that `{}` implements `Y` -// CHECK:STDERR: · ┃ [IdentifiedRequireImplsNotImplemented] -// CHECK:STDERR: ╰──── -// CHECK:STDERR: -impl () as Z where .Z1 = {} and .Self impls N {} - -fn F() { - // The constant value should be an error. - //@dump-sem-ir-begin - () as Z; - //@dump-sem-ir-end -} - -// CHECK:STDOUT: --- fail_error_self_in_require.carbon +// CHECK:STDOUT: --- fail_error_self_in_require.carbon = $fail_error_self_in_require // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -686,75 +561,3 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: specific @B.WithSelf(, ) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_named_constraint_requirement_not_set_for_equivalent.carbon -// CHECK:STDOUT: -// CHECK:STDOUT: constants { -// CHECK:STDOUT: type: type = facet_type [concrete] -// CHECK:STDOUT: %Z.type: type = facet_type <@Z> [concrete] -// CHECK:STDOUT: %empty_tuple.type: type = tuple_type () [concrete] -// CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] -// CHECK:STDOUT: } -// CHECK:STDOUT: -// CHECK:STDOUT: fn @F() { -// CHECK:STDOUT: !entry: -// CHECK:STDOUT: %.loc29_4: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] -// CHECK:STDOUT: %Z.ref: type = name_ref Z, file.%Z.decl [concrete = constants.%Z.type] -// CHECK:STDOUT: %Z.facet: %Z.type = facet_value constants.%empty_tuple.type, () [concrete = ] -// CHECK:STDOUT: %.loc29_6: %Z.type = converted %.loc29_4, %Z.facet [concrete = ] -// CHECK:STDOUT: -// CHECK:STDOUT: } -// CHECK:STDOUT: -// CHECK:STDOUT: --- fail_named_constraint_requirement_not_equal.carbon -// CHECK:STDOUT: -// CHECK:STDOUT: constants { -// CHECK:STDOUT: type: type = facet_type [concrete] -// CHECK:STDOUT: %Z.type: type = facet_type <@Z> [concrete] -// CHECK:STDOUT: %empty_tuple.type: type = tuple_type () [concrete] -// CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] -// CHECK:STDOUT: } -// CHECK:STDOUT: -// CHECK:STDOUT: fn @F() { -// CHECK:STDOUT: !entry: -// CHECK:STDOUT: %.loc25_4: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] -// CHECK:STDOUT: %Z.ref: type = name_ref Z, file.%Z.decl [concrete = constants.%Z.type] -// CHECK:STDOUT: %Z.facet: %Z.type = facet_value constants.%empty_tuple.type, () [concrete = ] -// CHECK:STDOUT: %.loc25_6: %Z.type = converted %.loc25_4, %Z.facet [concrete = ] -// CHECK:STDOUT: -// CHECK:STDOUT: } -// CHECK:STDOUT: -// CHECK:STDOUT: --- fail_named_constraint_requirement_not_set_for_impls.carbon -// CHECK:STDOUT: -// CHECK:STDOUT: constants { -// CHECK:STDOUT: type: type = facet_type [concrete] -// CHECK:STDOUT: %Z.type: type = facet_type <@Z> [concrete] -// CHECK:STDOUT: %empty_tuple.type: type = tuple_type () [concrete] -// CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] -// CHECK:STDOUT: } -// CHECK:STDOUT: -// CHECK:STDOUT: fn @F() { -// CHECK:STDOUT: !entry: -// CHECK:STDOUT: %.loc30_4: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] -// CHECK:STDOUT: %Z.ref: type = name_ref Z, file.%Z.decl [concrete = constants.%Z.type] -// CHECK:STDOUT: %Z.facet: %Z.type = facet_value constants.%empty_tuple.type, () [concrete = ] -// CHECK:STDOUT: %.loc30_6: %Z.type = converted %.loc30_4, %Z.facet [concrete = ] -// CHECK:STDOUT: -// CHECK:STDOUT: } -// CHECK:STDOUT: -// CHECK:STDOUT: --- fail_named_constraint_requirement_not_impld.carbon -// CHECK:STDOUT: -// CHECK:STDOUT: constants { -// CHECK:STDOUT: type: type = facet_type [concrete] -// CHECK:STDOUT: %Z.type: type = facet_type <@Z> [concrete] -// CHECK:STDOUT: %empty_tuple.type: type = tuple_type () [concrete] -// CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] -// CHECK:STDOUT: } -// CHECK:STDOUT: -// CHECK:STDOUT: fn @F() { -// CHECK:STDOUT: !entry: -// CHECK:STDOUT: %.loc25_4: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] -// CHECK:STDOUT: %Z.ref: type = name_ref Z, file.%Z.decl [concrete = constants.%Z.type] -// CHECK:STDOUT: %Z.facet: %Z.type = facet_value constants.%empty_tuple.type, () [concrete = ] -// CHECK:STDOUT: %.loc25_6: %Z.type = converted %.loc25_4, %Z.facet [concrete = ] -// CHECK:STDOUT: -// CHECK:STDOUT: } -// CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/impl_assoc_const.carbon b/toolchain/check/testdata/impl/impl_assoc_const.carbon index 83f774912d34..516239cc1712 100644 --- a/toolchain/check/testdata/impl/impl_assoc_const.carbon +++ b/toolchain/check/testdata/impl/impl_assoc_const.carbon @@ -521,7 +521,7 @@ fn G() { F(C); } -// CHECK:STDOUT: --- fail_many_different.carbon +// CHECK:STDOUT: --- fail_many_different.carbon = $fail_many_different // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -642,7 +642,7 @@ fn G() { // CHECK:STDOUT: witness = // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_cycle.carbon +// CHECK:STDOUT: --- fail_cycle.carbon = $fail_cycle // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/impl_assoc_const_with_prelude.carbon b/toolchain/check/testdata/impl/impl_assoc_const_with_prelude.carbon index ca4f7c5ec018..c988d8594471 100644 --- a/toolchain/check/testdata/impl/impl_assoc_const_with_prelude.carbon +++ b/toolchain/check/testdata/impl/impl_assoc_const_with_prelude.carbon @@ -37,7 +37,7 @@ interface I { // CHECK:STDERR: impl () as I where .X = {.a = true, .b = (1, 2)} and .X = {.a = false, .b = (3, 4)} {} -// CHECK:STDOUT: --- same_non_type.carbon +// CHECK:STDOUT: --- same_non_type.carbon = $same_non_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -280,7 +280,7 @@ impl () as I where .X = {.a = true, .b = (1, 2)} and .X = {.a = false, .b = (3, // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_two_different_non_type.carbon +// CHECK:STDOUT: --- fail_two_different_non_type.carbon = $fail_two_different_non_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/impl_assoc_fn_as_alias.carbon b/toolchain/check/testdata/impl/impl_assoc_fn_as_alias.carbon index d5a38fd15b97..9ae399c96ac4 100644 --- a/toolchain/check/testdata/impl/impl_assoc_fn_as_alias.carbon +++ b/toolchain/check/testdata/impl/impl_assoc_fn_as_alias.carbon @@ -22,7 +22,7 @@ class FAlias { } //@dump-sem-ir-end -// CHECK:STDOUT: --- impl_assoc_fn_as_alias.carbon +// CHECK:STDOUT: --- impl_assoc_fn_as_alias.carbon = $impl_assoc_fn_as_alias // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/impl_forall.carbon b/toolchain/check/testdata/impl/impl_forall.carbon index 68231a281825..eeffe1b060f4 100644 --- a/toolchain/check/testdata/impl/impl_forall.carbon +++ b/toolchain/check/testdata/impl/impl_forall.carbon @@ -39,7 +39,7 @@ interface Y {} // CHECK:STDERR: impl forall [T: Invalid] T as Z where .Z1 impls Y {} -// CHECK:STDOUT: --- impl_forall.carbon +// CHECK:STDOUT: --- impl_forall.carbon = $impl_forall // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -163,7 +163,7 @@ impl forall [T: Invalid] T as Z where .Z1 impls Y {} // CHECK:STDOUT: // CHECK:STDOUT: specific @Simple.WithSelf.F(constants.%Simple.facet) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_self_error.carbon +// CHECK:STDOUT: --- fail_self_error.carbon = $fail_self_error // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/impl_thunk.carbon b/toolchain/check/testdata/impl/impl_thunk.carbon index 0f7b926b827c..d822e970bca7 100644 --- a/toolchain/check/testdata/impl/impl_thunk.carbon +++ b/toolchain/check/testdata/impl/impl_thunk.carbon @@ -380,7 +380,7 @@ impl () as I({}) { //@dump-sem-ir-end } -// CHECK:STDOUT: --- struct_conversion.carbon +// CHECK:STDOUT: --- struct_conversion.carbon = $struct_conversion // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -532,7 +532,7 @@ impl () as I({}) { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- inheritance_conversion.carbon +// CHECK:STDOUT: --- inheritance_conversion.carbon = $inheritance_conversion // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -644,7 +644,7 @@ impl () as I({}) { // CHECK:STDOUT: return %ptr.as.Copy.impl.Op.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- inheritance_value_conversion.carbon +// CHECK:STDOUT: --- inheritance_value_conversion.carbon = $inheritance_value_conversion // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -709,7 +709,7 @@ impl () as I({}) { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- inheritance_value_conversion_pointer.carbon +// CHECK:STDOUT: --- inheritance_value_conversion_pointer.carbon = $inheritance_value_conversion_pointer // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -821,7 +821,7 @@ impl () as I({}) { // CHECK:STDOUT: return %ptr.as.Copy.impl.Op.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- inheritance_value_conversion_pointer_addr.carbon +// CHECK:STDOUT: --- inheritance_value_conversion_pointer_addr.carbon = $inheritance_value_conversion_pointer_addr // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -933,7 +933,7 @@ impl () as I({}) { // CHECK:STDOUT: return %ptr.as.Copy.impl.Op.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- inheritance_ref_conversion.carbon +// CHECK:STDOUT: --- inheritance_ref_conversion.carbon = $inheritance_ref_conversion // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -997,7 +997,7 @@ impl () as I({}) { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- form_parameter.carbon +// CHECK:STDOUT: --- form_parameter.carbon = $form_parameter // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1082,7 +1082,7 @@ impl () as I({}) { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_inheritance_value_conversion_copy_return.carbon +// CHECK:STDOUT: --- fail_inheritance_value_conversion_copy_return.carbon = $fail_inheritance_value_conversion_copy_return // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1201,7 +1201,7 @@ impl () as I({}) { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- generic_function.carbon +// CHECK:STDOUT: --- generic_function.carbon = $generic_function // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1402,7 +1402,7 @@ impl () as I({}) { // CHECK:STDOUT: %specific_impl_fn.loc10_42.2 => constants.%specific_impl_fn.6b3 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- generic_method.carbon +// CHECK:STDOUT: --- generic_method.carbon = $generic_method // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1617,7 +1617,7 @@ impl () as I({}) { // CHECK:STDOUT: %specific_impl_fn.loc10_59.2 => constants.%specific_impl_fn.6b3 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- generic_interface.carbon +// CHECK:STDOUT: --- generic_interface.carbon = $generic_interface // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/impl_thunk_min_prelude.carbon b/toolchain/check/testdata/impl/impl_thunk_min_prelude.carbon index 8e6640e7d234..f33b35058d53 100644 --- a/toolchain/check/testdata/impl/impl_thunk_min_prelude.carbon +++ b/toolchain/check/testdata/impl/impl_thunk_min_prelude.carbon @@ -104,7 +104,7 @@ fn Call() -> i32 { ; } -// CHECK:STDOUT: --- thunk_literal_convert.carbon +// CHECK:STDOUT: --- thunk_literal_convert.carbon = $thunk_literal_convert // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/import_builtin_call.carbon b/toolchain/check/testdata/impl/import_builtin_call.carbon index 5d47a72db7ea..c2f17f153c21 100644 --- a/toolchain/check/testdata/impl/import_builtin_call.carbon +++ b/toolchain/check/testdata/impl/import_builtin_call.carbon @@ -86,7 +86,7 @@ var n: Int(64) = MakeFromClass(FromLiteral(64) as OtherInt); //@dump-sem-ir-end -// CHECK:STDOUT: --- use_generic_impl.carbon +// CHECK:STDOUT: --- use_generic_impl.carbon = $use_generic_impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -110,7 +110,7 @@ var n: Int(64) = MakeFromClass(FromLiteral(64) as OtherInt); // CHECK:STDOUT: return %Double.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_convert_symbolic.carbon +// CHECK:STDOUT: --- use_convert_symbolic.carbon = $use_convert_symbolic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/import_canonical_witnesses.carbon b/toolchain/check/testdata/impl/import_canonical_witnesses.carbon index c26ba97e0e04..03a0f467bdf0 100644 --- a/toolchain/check/testdata/impl/import_canonical_witnesses.carbon +++ b/toolchain/check/testdata/impl/import_canonical_witnesses.carbon @@ -14,9 +14,9 @@ // follows (if these become the same, it means the test is no longer effective): // // SET-CHECK-SUBSET -// CHECK:STDOUT: --- interfaces.carbon +// CHECK:STDOUT: --- interfaces.carbon = $interfaces // CHECK:STDOUT: %facet_type{{.*}}: type = facet_type <@SimpleOp & @Empty> [concrete] -// CHECK:STDOUT: --- use.carbon +// CHECK:STDOUT: --- use.carbon = $use // CHECK:STDOUT: %facet_type{{.*}}: type = facet_type <@Empty & @SimpleOp> [concrete] // // This check does not strictly exclude extra facet types, although that should diff --git a/toolchain/check/testdata/impl/import_compound.carbon b/toolchain/check/testdata/impl/import_compound.carbon index 274c0de127eb..613f08a19003 100644 --- a/toolchain/check/testdata/impl/import_compound.carbon +++ b/toolchain/check/testdata/impl/import_compound.carbon @@ -111,7 +111,7 @@ fn InstanceCallImportFail() { } -// CHECK:STDOUT: --- lib.carbon +// CHECK:STDOUT: --- lib.carbon = $lib // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -329,7 +329,7 @@ fn InstanceCallImportFail() { // CHECK:STDOUT: %self.patt.loc12_8.2 => constants.%self.patt.713 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_non-instance_success.carbon +// CHECK:STDOUT: --- import_non-instance_success.carbon = $import_non-instance_success // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -434,7 +434,7 @@ fn InstanceCallImportFail() { // CHECK:STDOUT: %NonInstance.WithSelf.F => constants.%NonInstance.WithSelf.F.036 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_import_non-instance.carbon +// CHECK:STDOUT: --- fail_import_non-instance.carbon = $fail_import_non-instance // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -526,7 +526,7 @@ fn InstanceCallImportFail() { // CHECK:STDOUT: // CHECK:STDOUT: specific @NonInstance.WithSelf.F(constants.%Self.002) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_import_non-instance_indirect.carbon +// CHECK:STDOUT: --- fail_import_non-instance_indirect.carbon = $fail_import_non-instance_indirect // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -621,7 +621,7 @@ fn InstanceCallImportFail() { // CHECK:STDOUT: // CHECK:STDOUT: specific @NonInstance.WithSelf.F(constants.%Self.002) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- import_instance_success.carbon +// CHECK:STDOUT: --- import_instance_success.carbon = $import_instance_success // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -791,7 +791,7 @@ fn InstanceCallImportFail() { // CHECK:STDOUT: %Instance.WithSelf.G => constants.%Instance.WithSelf.G.88e // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_import_instance.carbon +// CHECK:STDOUT: --- fail_import_instance.carbon = $fail_import_instance // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/import_extend_impl.carbon b/toolchain/check/testdata/impl/import_extend_impl.carbon index da8dc50af8f5..085d6e4dcf7c 100644 --- a/toolchain/check/testdata/impl/import_extend_impl.carbon +++ b/toolchain/check/testdata/impl/import_extend_impl.carbon @@ -37,7 +37,7 @@ fn G(c: C) { c.F(); } -// CHECK:STDOUT: --- extend_impl_library.carbon +// CHECK:STDOUT: --- extend_impl_library.carbon = $extend_impl_library // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -137,7 +137,7 @@ fn G(c: C) { // CHECK:STDOUT: // CHECK:STDOUT: specific @I.WithSelf.F(constants.%I.facet) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- use_imported_class_extend_impl.carbon +// CHECK:STDOUT: --- use_imported_class_extend_impl.carbon = $use_imported_class_extend_impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/import_generic.carbon b/toolchain/check/testdata/impl/import_generic.carbon index 64e7acc1eb71..9da1d4fe9436 100644 --- a/toolchain/check/testdata/impl/import_generic.carbon +++ b/toolchain/check/testdata/impl/import_generic.carbon @@ -215,7 +215,7 @@ impl forall [T: type] D as N(T) {} // CHECK:STDERR: impl forall [T: type] D as N(T*) {} -// CHECK:STDOUT: --- basic_import_generic_interface.carbon +// CHECK:STDOUT: --- basic_import_generic_interface.carbon = $basic_import_generic_interface // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -355,7 +355,7 @@ impl forall [T: type] D as N(T*) {} // CHECK:STDOUT: %I.type.loc5_27.2 => constants.%I.type.184 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- basic_import_generic_interface.impl.carbon +// CHECK:STDOUT: --- basic_import_generic_interface.impl.carbon = $basic_import_generic_interface.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -584,7 +584,7 @@ impl forall [T: type] D as N(T*) {} // CHECK:STDOUT: %require_complete => constants.%complete_type.a15 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- basic_import_generic_constraint.carbon +// CHECK:STDOUT: --- basic_import_generic_constraint.carbon = $basic_import_generic_constraint // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -723,7 +723,7 @@ impl forall [T: type] D as N(T*) {} // CHECK:STDOUT: %I.type.loc5_27.2 => constants.%I.type.184 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- basic_import_generic_constraint.impl.carbon +// CHECK:STDOUT: --- basic_import_generic_constraint.impl.carbon = $basic_import_generic_constraint.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -944,7 +944,7 @@ impl forall [T: type] D as N(T*) {} // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_generic.carbon +// CHECK:STDOUT: --- import_generic.carbon = $import_generic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1229,7 +1229,7 @@ impl forall [T: type] D as N(T*) {} // CHECK:STDOUT: %I.type.loc15_27.2 => constants.%I.type.184 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_import_generic.impl.carbon +// CHECK:STDOUT: --- fail_import_generic.impl.carbon = $fail_import_generic.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1703,7 +1703,7 @@ impl forall [T: type] D as N(T*) {} // CHECK:STDOUT: %.loc49_33 => constants.%.f39 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_generic_with_different_specific.carbon +// CHECK:STDOUT: --- import_generic_with_different_specific.carbon = $import_generic_with_different_specific // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1905,7 +1905,7 @@ impl forall [T: type] D as N(T*) {} // CHECK:STDOUT: %I.type.loc10_27.2 => constants.%I.type.184 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_generic_with_different_specific.impl.carbon +// CHECK:STDOUT: --- import_generic_with_different_specific.impl.carbon = $import_generic_with_different_specific.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2247,7 +2247,7 @@ impl forall [T: type] D as N(T*) {} // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_import_generic_decl.carbon +// CHECK:STDOUT: --- fail_import_generic_decl.carbon = $fail_import_generic_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2477,7 +2477,7 @@ impl forall [T: type] D as N(T*) {} // CHECK:STDOUT: %J.impl_witness.loc27_33.2 => constants.%J.impl_witness.ac6 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_import_generic_decl.impl.carbon +// CHECK:STDOUT: --- fail_import_generic_decl.impl.carbon = $fail_import_generic_decl.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/import_interface_assoc_const.carbon b/toolchain/check/testdata/impl/import_interface_assoc_const.carbon index 13cb7b9968ce..b9120382ce90 100644 --- a/toolchain/check/testdata/impl/import_interface_assoc_const.carbon +++ b/toolchain/check/testdata/impl/import_interface_assoc_const.carbon @@ -247,7 +247,7 @@ impl CD as IF where .F = 0 { fn F() {} } -// CHECK:STDOUT: --- interface.carbon +// CHECK:STDOUT: --- interface.carbon = $interface // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -345,7 +345,7 @@ impl CD as IF where .F = 0 { // CHECK:STDOUT: // CHECK:STDOUT: specific @NonType.WithSelf(constants.%Self.ab8) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: --- basic.carbon = $basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -452,7 +452,7 @@ impl CD as IF where .F = 0 { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- redecl.carbon +// CHECK:STDOUT: --- redecl.carbon = $redecl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -580,7 +580,7 @@ impl CD as IF where .F = 0 { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_redecl_adds_rewrites.carbon +// CHECK:STDOUT: --- fail_redecl_adds_rewrites.carbon = $fail_redecl_adds_rewrites // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -694,7 +694,7 @@ impl CD as IF where .F = 0 { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_mismatch.carbon +// CHECK:STDOUT: --- fail_mismatch.carbon = $fail_mismatch // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -827,7 +827,7 @@ impl CD as IF where .F = 0 { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_mismatch_bad_value.carbon +// CHECK:STDOUT: --- fail_mismatch_bad_value.carbon = $fail_mismatch_bad_value // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1007,7 +1007,7 @@ impl CD as IF where .F = 0 { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_missing_on_definition.carbon +// CHECK:STDOUT: --- fail_missing_on_definition.carbon = $fail_missing_on_definition // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1120,7 +1120,7 @@ impl CD as IF where .F = 0 { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_two_different.carbon +// CHECK:STDOUT: --- fail_two_different.carbon = $fail_two_different // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1229,7 +1229,7 @@ impl CD as IF where .F = 0 { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_two_different_first_bad.carbon +// CHECK:STDOUT: --- fail_two_different_first_bad.carbon = $fail_two_different_first_bad // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1337,7 +1337,7 @@ impl CD as IF where .F = 0 { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_two_different_second_bad.carbon +// CHECK:STDOUT: --- fail_two_different_second_bad.carbon = $fail_two_different_second_bad // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1444,7 +1444,7 @@ impl CD as IF where .F = 0 { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_two_different_both_bad.carbon +// CHECK:STDOUT: --- fail_two_different_both_bad.carbon = $fail_two_different_both_bad // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1550,7 +1550,7 @@ impl CD as IF where .F = 0 { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- repeated.carbon +// CHECK:STDOUT: --- repeated.carbon = $repeated // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1670,7 +1670,7 @@ impl CD as IF where .F = 0 { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- non-type.carbon +// CHECK:STDOUT: --- non-type.carbon = $non-type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1783,7 +1783,7 @@ impl CD as IF where .F = 0 { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- interface_with_function.carbon +// CHECK:STDOUT: --- interface_with_function.carbon = $interface_with_function // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1826,7 +1826,7 @@ impl CD as IF where .F = 0 { // CHECK:STDOUT: // CHECK:STDOUT: specific @IF.WithSelf.F(constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_where_rewrite_function.carbon +// CHECK:STDOUT: --- fail_where_rewrite_function.carbon = $fail_where_rewrite_function // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/import_self.carbon b/toolchain/check/testdata/impl/import_self.carbon index b3d82d2871f0..37dba5fb4c8c 100644 --- a/toolchain/check/testdata/impl/import_self.carbon +++ b/toolchain/check/testdata/impl/import_self.carbon @@ -37,7 +37,7 @@ fn F(x: C, y: C) -> C { } -// CHECK:STDOUT: --- a.carbon +// CHECK:STDOUT: --- a.carbon = $a // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -148,7 +148,7 @@ fn F(x: C, y: C) -> C { // CHECK:STDOUT: %return.patt.loc5_28.2 => constants.%return.patt // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- b.carbon +// CHECK:STDOUT: --- b.carbon = $b // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/import_self_specific.carbon b/toolchain/check/testdata/impl/import_self_specific.carbon index 5558e3a94246..c6f62db6e0d5 100644 --- a/toolchain/check/testdata/impl/import_self_specific.carbon +++ b/toolchain/check/testdata/impl/import_self_specific.carbon @@ -62,7 +62,7 @@ impl forall [N: E] D(N) as I where .Assoc = () { fn F(unused c: C(())) {} } -// CHECK:STDOUT: --- impl_def.carbon +// CHECK:STDOUT: --- impl_def.carbon = $impl_def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -348,7 +348,7 @@ impl forall [N: E] D(N) as I where .Assoc = () { // CHECK:STDOUT: %c.patt.loc24_9.2 => constants.%c.patt // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- impl_use.carbon +// CHECK:STDOUT: --- impl_use.carbon = $impl_use // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/import_thunk.carbon b/toolchain/check/testdata/impl/import_thunk.carbon index bc6234a7ff68..eed90ad53486 100644 --- a/toolchain/check/testdata/impl/import_thunk.carbon +++ b/toolchain/check/testdata/impl/import_thunk.carbon @@ -42,7 +42,7 @@ fn G() { } -// CHECK:STDOUT: --- a.carbon +// CHECK:STDOUT: --- a.carbon = $a // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -109,7 +109,7 @@ fn G() { // CHECK:STDOUT: // CHECK:STDOUT: specific @I.WithSelf.F(constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- b.carbon +// CHECK:STDOUT: --- b.carbon = $b // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -396,7 +396,7 @@ fn G() { // CHECK:STDOUT: // CHECK:STDOUT: specific @C.as.I.impl.F.loc8_24.2(constants.%Y) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- c.carbon +// CHECK:STDOUT: --- c.carbon = $c // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/import_use_generic.carbon b/toolchain/check/testdata/impl/import_use_generic.carbon index 7e70a8c7f2f6..42a30623c429 100644 --- a/toolchain/check/testdata/impl/import_use_generic.carbon +++ b/toolchain/check/testdata/impl/import_use_generic.carbon @@ -69,7 +69,7 @@ fn G() -> c.(I.F)() {} // CHECK:STDERR: fn H() -> C({}).(I.F)() {} -// CHECK:STDOUT: --- import_generic.carbon +// CHECK:STDOUT: --- import_generic.carbon = $import_generic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -232,7 +232,7 @@ fn H() -> C({}).(I.F)() {} // CHECK:STDOUT: // CHECK:STDOUT: specific @I.WithSelf.F(constants.%I.facet) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_use_in_fn_decl.carbon +// CHECK:STDOUT: --- fail_use_in_fn_decl.carbon = $fail_use_in_fn_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/incomplete.carbon b/toolchain/check/testdata/impl/incomplete.carbon index f61087619f5d..87a24003f7d5 100644 --- a/toolchain/check/testdata/impl/incomplete.carbon +++ b/toolchain/check/testdata/impl/incomplete.carbon @@ -254,7 +254,7 @@ interface B { require impls A; } -// CHECK:STDOUT: --- fail_empty_struct.carbon +// CHECK:STDOUT: --- fail_empty_struct.carbon = $fail_empty_struct // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -295,7 +295,7 @@ interface B { // CHECK:STDOUT: witness = // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_class.carbon +// CHECK:STDOUT: --- fail_class.carbon = $fail_class // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -347,7 +347,7 @@ interface B { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_class_no_forward_decl.carbon +// CHECK:STDOUT: --- fail_class_no_forward_decl.carbon = $fail_class_no_forward_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -392,7 +392,7 @@ interface B { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_class_with_rewrite.carbon +// CHECK:STDOUT: --- fail_class_with_rewrite.carbon = $fail_class_with_rewrite // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -463,7 +463,7 @@ interface B { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- incomplete_where.carbon +// CHECK:STDOUT: --- incomplete_where.carbon = $incomplete_where // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -610,7 +610,7 @@ interface B { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- incomplete_where_rewrite.carbon +// CHECK:STDOUT: --- incomplete_where_rewrite.carbon = $incomplete_where_rewrite // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -798,7 +798,7 @@ interface B { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_incomplete_where_definition.carbon +// CHECK:STDOUT: --- fail_incomplete_where_definition.carbon = $fail_incomplete_where_definition // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -883,7 +883,7 @@ interface B { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_declaration_lookup_into_incomplete.carbon +// CHECK:STDOUT: --- fail_declaration_lookup_into_incomplete.carbon = $fail_declaration_lookup_into_incomplete // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -983,7 +983,7 @@ interface B { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_unidentified_constraint.carbon +// CHECK:STDOUT: --- fail_unidentified_constraint.carbon = $fail_unidentified_constraint // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1018,7 +1018,7 @@ interface B { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- nested_require_incomplete_interface.carbon +// CHECK:STDOUT: --- nested_require_incomplete_interface.carbon = $nested_require_incomplete_interface // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1195,7 +1195,7 @@ interface B { // CHECK:STDOUT: %T.loc16_22.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_incomplete_constraint.carbon +// CHECK:STDOUT: --- fail_incomplete_constraint.carbon = $fail_incomplete_constraint // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/interface_args.carbon b/toolchain/check/testdata/impl/interface_args.carbon index 8c5b536fa34d..5ea2a31d44b8 100644 --- a/toolchain/check/testdata/impl/interface_args.carbon +++ b/toolchain/check/testdata/impl/interface_args.carbon @@ -110,7 +110,7 @@ fn InstanceC(a: A) -> C { } -// CHECK:STDOUT: --- action.carbon +// CHECK:STDOUT: --- action.carbon = $action // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -373,7 +373,7 @@ fn InstanceC(a: A) -> C { // CHECK:STDOUT: %self.patt.loc5_9.2 => constants.%self.patt.7cd // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- action.impl.carbon +// CHECK:STDOUT: --- action.impl.carbon = $action.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -586,7 +586,7 @@ fn InstanceC(a: A) -> C { // CHECK:STDOUT: %assoc0 => constants.%assoc0.f05 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_action.impl.carbon +// CHECK:STDOUT: --- fail_action.impl.carbon = $fail_action.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -794,7 +794,7 @@ fn InstanceC(a: A) -> C { // CHECK:STDOUT: %assoc0 => constants.%assoc0.933 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- factory.carbon +// CHECK:STDOUT: --- factory.carbon = $factory // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1117,7 +1117,7 @@ fn InstanceC(a: A) -> C { // CHECK:STDOUT: %return.patt.loc8_19.2 => constants.%return.patt.911 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- factory.impl.carbon +// CHECK:STDOUT: --- factory.impl.carbon = $factory.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1423,7 +1423,7 @@ fn InstanceC(a: A) -> C { // CHECK:STDOUT: %assoc1 => constants.%assoc1.120 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_factory.impl.carbon +// CHECK:STDOUT: --- fail_factory.impl.carbon = $fail_factory.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/lookup/alias.carbon b/toolchain/check/testdata/impl/lookup/alias.carbon index 28d5bacd0264..9397078d30a9 100644 --- a/toolchain/check/testdata/impl/lookup/alias.carbon +++ b/toolchain/check/testdata/impl/lookup/alias.carbon @@ -29,7 +29,7 @@ fn G(c: C) { c.G(); } -// CHECK:STDOUT: --- alias.carbon +// CHECK:STDOUT: --- alias.carbon = $alias // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/lookup/canonical_query_self.carbon b/toolchain/check/testdata/impl/lookup/canonical_query_self.carbon index 85aa7147b5b4..fca83a84bb56 100644 --- a/toolchain/check/testdata/impl/lookup/canonical_query_self.carbon +++ b/toolchain/check/testdata/impl/lookup/canonical_query_self.carbon @@ -47,7 +47,7 @@ fn G() { } -// CHECK:STDOUT: --- canonical_query_self.carbon +// CHECK:STDOUT: --- canonical_query_self.carbon = $canonical_query_self // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 a532da94fcf1..99fcc02e997c 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 @@ -41,7 +41,7 @@ fn F(c: C) { c.F(); } -// CHECK:STDOUT: --- fail_alias_impl_not_found.carbon +// CHECK:STDOUT: --- fail_alias_impl_not_found.carbon = $fail_alias_impl_not_found // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/lookup/fail_todo_undefined_impl.carbon b/toolchain/check/testdata/impl/lookup/fail_todo_undefined_impl.carbon index 040fb9a40924..72ed97458f29 100644 --- a/toolchain/check/testdata/impl/lookup/fail_todo_undefined_impl.carbon +++ b/toolchain/check/testdata/impl/lookup/fail_todo_undefined_impl.carbon @@ -56,7 +56,7 @@ fn G() { C.F(); } -// CHECK:STDOUT: --- fail_todo_undefined_impl.carbon +// CHECK:STDOUT: --- fail_todo_undefined_impl.carbon = $fail_todo_undefined_impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/lookup/generic.carbon b/toolchain/check/testdata/impl/lookup/generic.carbon index 74ea995cf490..7f28f1227df3 100644 --- a/toolchain/check/testdata/impl/lookup/generic.carbon +++ b/toolchain/check/testdata/impl/lookup/generic.carbon @@ -139,7 +139,7 @@ fn G(x: A) { } -// CHECK:STDOUT: --- deduced_type.carbon +// CHECK:STDOUT: --- deduced_type.carbon = $deduced_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -403,7 +403,7 @@ fn G(x: A) { // CHECK:STDOUT: %require_complete => constants.%complete_type // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- deduced_type_subst.carbon +// CHECK:STDOUT: --- deduced_type_subst.carbon = $deduced_type_subst // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -771,7 +771,7 @@ fn G(x: A) { // CHECK:STDOUT: %specific_impl_fn.loc9_29.2 => constants.%ptr.as.Copy.impl.Op.specific_fn // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- deduced_type_argument.carbon +// CHECK:STDOUT: --- deduced_type_argument.carbon = $deduced_type_argument // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1088,7 +1088,7 @@ fn G(x: A) { // CHECK:STDOUT: %require_complete => constants.%complete_type // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- deduced_interface_argument.carbon +// CHECK:STDOUT: --- deduced_interface_argument.carbon = $deduced_interface_argument // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1415,7 +1415,7 @@ fn G(x: A) { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_incomplete_deduction.carbon +// CHECK:STDOUT: --- fail_incomplete_deduction.carbon = $fail_incomplete_deduction // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1627,7 +1627,7 @@ fn G(x: A) { // CHECK:STDOUT: %self.patt.loc16_15.2 => constants.%self.patt.4d9 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_inconsistent_deduction.carbon +// CHECK:STDOUT: --- fail_inconsistent_deduction.carbon = $fail_inconsistent_deduction // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/lookup/impl_forall.carbon b/toolchain/check/testdata/impl/lookup/impl_forall.carbon index 36397bbffdaf..4c59148c4da9 100644 --- a/toolchain/check/testdata/impl/lookup/impl_forall.carbon +++ b/toolchain/check/testdata/impl/lookup/impl_forall.carbon @@ -42,7 +42,7 @@ fn TestSpecific(a: A({})*) -> {}* { } -// CHECK:STDOUT: --- impl_forall.carbon +// CHECK:STDOUT: --- impl_forall.carbon = $impl_forall // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/lookup/import.carbon b/toolchain/check/testdata/impl/lookup/import.carbon index c0e565dda6e3..b37b3119b824 100644 --- a/toolchain/check/testdata/impl/lookup/import.carbon +++ b/toolchain/check/testdata/impl/lookup/import.carbon @@ -229,7 +229,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { } -// CHECK:STDOUT: --- package_a.carbon +// CHECK:STDOUT: --- package_a.carbon = $package_a // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -379,7 +379,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %self.patt.loc5_8.2 => constants.%self.patt.610 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- package_b.carbon +// CHECK:STDOUT: --- package_b.carbon = $package_b // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -699,7 +699,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %self.patt.loc7_8.2 => constants.%self.patt.2d6 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_cf.carbon +// CHECK:STDOUT: --- use_cf.carbon = $use_cf // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -845,7 +845,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %HasF.WithSelf.F => constants.%HasF.WithSelf.F.0d8 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_df.carbon +// CHECK:STDOUT: --- use_df.carbon = $use_df // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1014,7 +1014,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %HasF.WithSelf.F => constants.%HasF.WithSelf.F.b68 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_cg.carbon +// CHECK:STDOUT: --- use_cg.carbon = $use_cg // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1183,7 +1183,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %HasG.WithSelf.G => constants.%HasG.WithSelf.G.747 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_dg.carbon +// CHECK:STDOUT: --- use_dg.carbon = $use_dg // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1347,7 +1347,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %HasG.WithSelf.G => constants.%HasG.WithSelf.G.5a9 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- associated_interface.carbon +// CHECK:STDOUT: --- associated_interface.carbon = $associated_interface // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1487,7 +1487,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %self.patt.loc5_8.2 => constants.%self.patt.462 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_associated_interface.carbon +// CHECK:STDOUT: --- import_associated_interface.carbon = $import_associated_interface // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1610,7 +1610,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %Z.WithSelf.H => constants.%Z.WithSelf.H.18a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- has_param.carbon +// CHECK:STDOUT: --- has_param.carbon = $has_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1755,7 +1755,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %self.patt.loc7_15.2 => constants.%self.patt // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- has_generic_interface.carbon +// CHECK:STDOUT: --- has_generic_interface.carbon = $has_generic_interface // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2057,7 +2057,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %self.patt => constants.%self.patt.5a8 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_generic_interface_as_param.carbon +// CHECK:STDOUT: --- use_generic_interface_as_param.carbon = $use_generic_interface_as_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2324,7 +2324,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %Y.WithSelf.K => constants.%Y.WithSelf.K.93e // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- has_generic_class.carbon +// CHECK:STDOUT: --- has_generic_class.carbon = $has_generic_class // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2618,7 +2618,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %self.patt => constants.%self.patt.274 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_generic_class_as_param.carbon +// CHECK:STDOUT: --- use_generic_class_as_param.carbon = $use_generic_class_as_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2879,7 +2879,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %Y.WithSelf.K => constants.%Y.WithSelf.K.a5b // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- has_extra_interfaces.carbon +// CHECK:STDOUT: --- has_extra_interfaces.carbon = $has_extra_interfaces // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -3213,7 +3213,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %self.patt.loc14_20.2 => constants.%self.patt.d38 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_use_has_extra_interfaces.carbon +// CHECK:STDOUT: --- fail_use_has_extra_interfaces.carbon = $fail_use_has_extra_interfaces // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/lookup/instance_method.carbon b/toolchain/check/testdata/impl/lookup/instance_method.carbon index 4585ba0ccc1b..2a7b8477c7b8 100644 --- a/toolchain/check/testdata/impl/lookup/instance_method.carbon +++ b/toolchain/check/testdata/impl/lookup/instance_method.carbon @@ -29,7 +29,7 @@ fn F(c: C) -> i32 { } -// CHECK:STDOUT: --- instance_method.carbon +// CHECK:STDOUT: --- instance_method.carbon = $instance_method // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/lookup/lookup_interface_with_enclosing_generic_inside_rewrite_constraint.carbon b/toolchain/check/testdata/impl/lookup/lookup_interface_with_enclosing_generic_inside_rewrite_constraint.carbon index 167b48847b41..3941aafa5bd4 100644 --- a/toolchain/check/testdata/impl/lookup/lookup_interface_with_enclosing_generic_inside_rewrite_constraint.carbon +++ b/toolchain/check/testdata/impl/lookup/lookup_interface_with_enclosing_generic_inside_rewrite_constraint.carbon @@ -100,7 +100,7 @@ fn F() { Outer(() as (Z1 & Z2)).G(Outer(() as (Z1 & Z2)).C); } -// CHECK:STDOUT: --- lookup_interface_with_encenclosing_specific_is_concrete_type.carbon +// CHECK:STDOUT: --- lookup_interface_with_encenclosing_specific_is_concrete_type.carbon = $lookup_interface_with_encenclosing_specific_is_concrete_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -434,7 +434,7 @@ fn F() { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- enclosing_specific_is_facet_value.carbon +// CHECK:STDOUT: --- enclosing_specific_is_facet_value.carbon = $enclosing_specific_is_facet_value // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 fa033b06d1ed..3d9379aaf063 100644 --- a/toolchain/check/testdata/impl/lookup/specialization_with_symbolic_rewrite.carbon +++ b/toolchain/check/testdata/impl/lookup/specialization_with_symbolic_rewrite.carbon @@ -99,7 +99,7 @@ fn F[T: Ptr](var t: T) -> T.(Ptr.Type) { } -// CHECK:STDOUT: --- final_specialized_symbolic_rewrite.carbon +// CHECK:STDOUT: --- final_specialized_symbolic_rewrite.carbon = $final_specialized_symbolic_rewrite // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -510,7 +510,7 @@ fn F[T: Ptr](var t: T) -> T.(Ptr.Type) { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_nonfinal_specialized_symbolic_rewrite.carbon +// CHECK:STDOUT: --- fail_nonfinal_specialized_symbolic_rewrite.carbon = $fail_nonfinal_specialized_symbolic_rewrite // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -959,7 +959,7 @@ fn F[T: Ptr](var t: T) -> T.(Ptr.Type) { // CHECK:STDOUT: %assoc0 => constants.%assoc0.fd2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- final_impl_rewrite_of_symbolic_through_impl_lookup.carbon +// CHECK:STDOUT: --- final_impl_rewrite_of_symbolic_through_impl_lookup.carbon = $final_impl_rewrite_of_symbolic_through_impl_lookup // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1212,7 +1212,7 @@ fn F[T: Ptr](var t: T) -> T.(Ptr.Type) { // CHECK:STDOUT: %return.patt.loc9_25.2 => constants.%return.patt.d67 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- final_impl_rewrite_of_symbolic_through_facet_access_type.carbon +// CHECK:STDOUT: --- final_impl_rewrite_of_symbolic_through_facet_access_type.carbon = $final_impl_rewrite_of_symbolic_through_facet_access_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1467,7 +1467,7 @@ fn F[T: Ptr](var t: T) -> T.(Ptr.Type) { // CHECK:STDOUT: %return.patt.loc9_24.2 => constants.%return.patt.058 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- final_impl_rewrite_of_symbolic_through_facet_value.carbon +// CHECK:STDOUT: --- final_impl_rewrite_of_symbolic_through_facet_value.carbon = $final_impl_rewrite_of_symbolic_through_facet_value // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/lookup/specific_args.carbon b/toolchain/check/testdata/impl/lookup/specific_args.carbon index d2134acb8e64..ab4e98cde538 100644 --- a/toolchain/check/testdata/impl/lookup/specific_args.carbon +++ b/toolchain/check/testdata/impl/lookup/specific_args.carbon @@ -56,7 +56,7 @@ import library "impl_in_class_args"; fn H(c: C(InClassArgs)) { c.(I(X).F)(); } -// CHECK:STDOUT: --- types.carbon +// CHECK:STDOUT: --- types.carbon = $types // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -205,7 +205,7 @@ fn H(c: C(InClassArgs)) { c.(I(X).F)(); } // CHECK:STDOUT: %T.loc5_10.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- impl_in_interface_args.carbon +// CHECK:STDOUT: --- impl_in_interface_args.carbon = $impl_in_interface_args // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -403,7 +403,7 @@ fn H(c: C(InClassArgs)) { c.(I(X).F)(); } // CHECK:STDOUT: %self.patt => constants.%self.patt.af8 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_impl_in_interface_args.carbon +// CHECK:STDOUT: --- use_impl_in_interface_args.carbon = $use_impl_in_interface_args // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -603,7 +603,7 @@ fn H(c: C(InClassArgs)) { c.(I(X).F)(); } // CHECK:STDOUT: %assoc0 => constants.%assoc0.278 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- impl_in_class_args.carbon +// CHECK:STDOUT: --- impl_in_class_args.carbon = $impl_in_class_args // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -835,7 +835,7 @@ fn H(c: C(InClassArgs)) { c.(I(X).F)(); } // CHECK:STDOUT: %self.patt => constants.%self.patt.aef // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_impl_in_class_args.carbon +// CHECK:STDOUT: --- use_impl_in_class_args.carbon = $use_impl_in_class_args // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/lookup/transitive.carbon b/toolchain/check/testdata/impl/lookup/transitive.carbon index 45829b2be219..c01d755508fa 100644 --- a/toolchain/check/testdata/impl/lookup/transitive.carbon +++ b/toolchain/check/testdata/impl/lookup/transitive.carbon @@ -48,7 +48,7 @@ fn Call() { } -// CHECK:STDOUT: --- i.carbon +// CHECK:STDOUT: --- i.carbon = $i // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -127,7 +127,7 @@ fn Call() { // CHECK:STDOUT: %self.patt.loc4_20.2 => constants.%self.patt // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- c.carbon +// CHECK:STDOUT: --- c.carbon = $c // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -262,7 +262,7 @@ fn Call() { // CHECK:STDOUT: %self.patt => constants.%self.patt.36a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- get.carbon +// CHECK:STDOUT: --- get.carbon = $get // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -315,7 +315,7 @@ fn Call() { // CHECK:STDOUT: // CHECK:STDOUT: fn @Get() -> out %return.param: %C; // CHECK:STDOUT: -// CHECK:STDOUT: --- call.carbon +// CHECK:STDOUT: --- call.carbon = $call // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/multiple_extend.carbon b/toolchain/check/testdata/impl/multiple_extend.carbon index 3d4e01e3340e..07ee48609cbf 100644 --- a/toolchain/check/testdata/impl/multiple_extend.carbon +++ b/toolchain/check/testdata/impl/multiple_extend.carbon @@ -176,7 +176,7 @@ fn P(o: O) { o.N(); } -// CHECK:STDOUT: --- different_impl_member_names.carbon +// CHECK:STDOUT: --- different_impl_member_names.carbon = $different_impl_member_names // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -413,7 +413,7 @@ fn P(o: O) { // CHECK:STDOUT: %HasF.WithSelf.F => constants.%HasF.WithSelf.F.c72 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_ambiguous_impls.carbon +// CHECK:STDOUT: --- fail_ambiguous_impls.carbon = $fail_ambiguous_impls // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -632,7 +632,7 @@ fn P(o: O) { // CHECK:STDOUT: %HasA1.WithSelf.A => constants.%HasA1.WithSelf.A.254 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- different_impl_and_base.carbon +// CHECK:STDOUT: --- different_impl_and_base.carbon = $different_impl_and_base // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -809,7 +809,7 @@ fn P(o: O) { // CHECK:STDOUT: %HasI.WithSelf.I => constants.%HasI.WithSelf.I.f9b // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_ambiguous_impl_and_base.carbon +// CHECK:STDOUT: --- fail_ambiguous_impl_and_base.carbon = $fail_ambiguous_impl_and_base // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -971,7 +971,7 @@ fn P(o: O) { // CHECK:STDOUT: %HasK.WithSelf.K => constants.%HasK.WithSelf.K.73a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- ambiguity_hidden.carbon +// CHECK:STDOUT: --- ambiguity_hidden.carbon = $ambiguity_hidden // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/name_lookup_in_impl_definition.carbon b/toolchain/check/testdata/impl/name_lookup_in_impl_definition.carbon index 7900f69ab131..cbed549b31d8 100644 --- a/toolchain/check/testdata/impl/name_lookup_in_impl_definition.carbon +++ b/toolchain/check/testdata/impl/name_lookup_in_impl_definition.carbon @@ -27,7 +27,7 @@ impl forall [T: type] T as I where .U = C { //@dump-sem-ir-end } -// CHECK:STDOUT: --- name_lookup_into_impl_as_target.carbon +// CHECK:STDOUT: --- name_lookup_into_impl_as_target.carbon = $name_lookup_into_impl_as_target // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/no_definition_in_impl_file.carbon b/toolchain/check/testdata/impl/no_definition_in_impl_file.carbon index 3b46134fde5f..bf4342ce57f6 100644 --- a/toolchain/check/testdata/impl/no_definition_in_impl_file.carbon +++ b/toolchain/check/testdata/impl/no_definition_in_impl_file.carbon @@ -118,7 +118,7 @@ interface D {} // CHECK:STDERR: impl () as D; -// CHECK:STDOUT: --- fail_decl_in_api_definition_in_impl.carbon +// CHECK:STDOUT: --- fail_decl_in_api_definition_in_impl.carbon = $fail_decl_in_api_definition_in_impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -157,7 +157,7 @@ impl () as D; // CHECK:STDOUT: // CHECK:STDOUT: specific @A.WithSelf(constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_decl_in_api_definition_in_impl.impl.carbon +// CHECK:STDOUT: --- fail_decl_in_api_definition_in_impl.impl.carbon = $fail_decl_in_api_definition_in_impl.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -215,13 +215,13 @@ impl () as D; // CHECK:STDOUT: // CHECK:STDOUT: specific @A.WithSelf(constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- use_decl_in_api.carbon +// CHECK:STDOUT: --- use_decl_in_api.carbon = $use_decl_in_api // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_decl_in_api.impl.carbon +// CHECK:STDOUT: --- use_decl_in_api.impl.carbon = $use_decl_in_api.impl // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Main.A = import_ref Main//decl_in_api_definition_in_impl, A, unloaded @@ -235,7 +235,7 @@ impl () as D; // CHECK:STDOUT: %default.import.loc2_31.2 = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_decl_only_in_api.carbon +// CHECK:STDOUT: --- fail_decl_only_in_api.carbon = $fail_decl_only_in_api // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -274,7 +274,7 @@ impl () as D; // CHECK:STDOUT: // CHECK:STDOUT: specific @B.WithSelf(constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- decl_only_in_api.impl.carbon +// CHECK:STDOUT: --- decl_only_in_api.impl.carbon = $decl_only_in_api.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -310,7 +310,7 @@ impl () as D; // CHECK:STDOUT: // CHECK:STDOUT: specific @B.WithSelf(constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_decl_in_api_decl_in_impl.carbon +// CHECK:STDOUT: --- fail_decl_in_api_decl_in_impl.carbon = $fail_decl_in_api_decl_in_impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -349,7 +349,7 @@ impl () as D; // CHECK:STDOUT: // CHECK:STDOUT: specific @C.WithSelf(constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_decl_in_api_decl_in_impl.impl.carbon +// CHECK:STDOUT: --- fail_decl_in_api_decl_in_impl.impl.carbon = $fail_decl_in_api_decl_in_impl.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -395,13 +395,13 @@ impl () as D; // CHECK:STDOUT: // CHECK:STDOUT: specific @C.WithSelf(constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- decl_only_in_impl.carbon +// CHECK:STDOUT: --- decl_only_in_impl.carbon = $decl_only_in_impl // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_decl_only_in_impl.impl.carbon +// CHECK:STDOUT: --- fail_decl_only_in_impl.impl.carbon = $fail_decl_only_in_impl.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/period_self.carbon b/toolchain/check/testdata/impl/period_self.carbon index dbe886783170..7a1e385267bb 100644 --- a/toolchain/check/testdata/impl/period_self.carbon +++ b/toolchain/check/testdata/impl/period_self.carbon @@ -353,7 +353,7 @@ class C(T: Z & Y) {} impl forall [U: X] U as Z where .Z1 = C(.Self) {} //@dump-sem-ir-end -// CHECK:STDOUT: --- period_self_converted_in_impl_as_decl.carbon +// CHECK:STDOUT: --- period_self_converted_in_impl_as_decl.carbon = $period_self_converted_in_impl_as_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -425,7 +425,7 @@ impl forall [U: X] U as Z where .Z1 = C(.Self) {} // CHECK:STDOUT: witness = %Z.impl_witness // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_period_self_converted_in_specific_in_named_constraint.carbon +// CHECK:STDOUT: --- fail_todo_period_self_converted_in_specific_in_named_constraint.carbon = $fail_todo_period_self_converted_in_specific_in_named_constraint // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -669,7 +669,7 @@ impl forall [U: X] U as Z where .Z1 = C(.Self) {} // CHECK:STDOUT: %Z_where.type.loc14_26.3 => constants.%Z_where.type.37e // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- period_self_converted_in_specific_in_named_constraint_from_generic_impl.carbon +// CHECK:STDOUT: --- period_self_converted_in_specific_in_named_constraint_from_generic_impl.carbon = $period_self_converted_in_specific_in_named_constraint_from_generic_impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -939,7 +939,7 @@ impl forall [U: X] U as Z where .Z1 = C(.Self) {} // CHECK:STDOUT: %C.loc23_73 => constants.%C.92a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- period_self_conversion_in_generic_impl.carbon +// CHECK:STDOUT: --- period_self_conversion_in_generic_impl.carbon = $period_self_conversion_in_generic_impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/self_in_class.carbon b/toolchain/check/testdata/impl/self_in_class.carbon index 612bee94f60b..34f33383f3e7 100644 --- a/toolchain/check/testdata/impl/self_in_class.carbon +++ b/toolchain/check/testdata/impl/self_in_class.carbon @@ -26,7 +26,7 @@ class A { } } -// CHECK:STDOUT: --- self_in_class.carbon +// CHECK:STDOUT: --- self_in_class.carbon = $self_in_class // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/self_in_signature.carbon b/toolchain/check/testdata/impl/self_in_signature.carbon index 01d397288e09..112dcaeb597e 100644 --- a/toolchain/check/testdata/impl/self_in_signature.carbon +++ b/toolchain/check/testdata/impl/self_in_signature.carbon @@ -41,7 +41,7 @@ impl D as SelfNested { } -// CHECK:STDOUT: --- self_in_signature.carbon +// CHECK:STDOUT: --- self_in_signature.carbon = $self_in_signature // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/todo_impl_with_unrelated_fn.carbon b/toolchain/check/testdata/impl/todo_impl_with_unrelated_fn.carbon index d946deed393d..3814662d28e8 100644 --- a/toolchain/check/testdata/impl/todo_impl_with_unrelated_fn.carbon +++ b/toolchain/check/testdata/impl/todo_impl_with_unrelated_fn.carbon @@ -25,7 +25,7 @@ class X { } } -// CHECK:STDOUT: --- todo_impl_with_unrelated_fn.carbon +// CHECK:STDOUT: --- todo_impl_with_unrelated_fn.carbon = $todo_impl_with_unrelated_fn // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/impl/use_assoc_entity.carbon b/toolchain/check/testdata/impl/use_assoc_entity.carbon index d987f9fc60e7..f549fe6df6c2 100644 --- a/toolchain/check/testdata/impl/use_assoc_entity.carbon +++ b/toolchain/check/testdata/impl/use_assoc_entity.carbon @@ -532,7 +532,7 @@ fn F() { } -// CHECK:STDOUT: --- associated_type_in_method_signature.carbon +// CHECK:STDOUT: --- associated_type_in_method_signature.carbon = $associated_type_in_method_signature // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -865,7 +865,7 @@ fn F() { // CHECK:STDOUT: %return.patt.loc6_20.2 => constants.%return.patt.e4a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- extend_impl_with_associated_type_in_signature.carbon +// CHECK:STDOUT: --- extend_impl_with_associated_type_in_signature.carbon = $extend_impl_with_associated_type_in_signature // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1035,7 +1035,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_associated_fn_in_impl.carbon +// CHECK:STDOUT: --- use_associated_fn_in_impl.carbon = $use_associated_fn_in_impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1065,7 +1065,7 @@ fn F() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_associated_constant_in_impl.carbon +// CHECK:STDOUT: --- use_associated_constant_in_impl.carbon = $use_associated_constant_in_impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1154,7 +1154,7 @@ fn F() { // CHECK:STDOUT: return %Int.as.Copy.impl.Op.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- call_extend_fn.carbon +// CHECK:STDOUT: --- call_extend_fn.carbon = $call_extend_fn // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1191,7 +1191,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_extend_constant.carbon +// CHECK:STDOUT: --- use_extend_constant.carbon = $use_extend_constant // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1242,7 +1242,7 @@ fn F() { // CHECK:STDOUT: return %.loc11_26 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- associated_fn_use_in_def_before_decl.carbon +// CHECK:STDOUT: --- associated_fn_use_in_def_before_decl.carbon = $associated_fn_use_in_def_before_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1272,7 +1272,7 @@ fn F() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_non-type_in_function.carbon +// CHECK:STDOUT: --- use_non-type_in_function.carbon = $use_non-type_in_function // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/index/array_element_access.carbon b/toolchain/check/testdata/index/array_element_access.carbon index dbaf1293d73d..55f9a475a7a4 100644 --- a/toolchain/check/testdata/index/array_element_access.carbon +++ b/toolchain/check/testdata/index/array_element_access.carbon @@ -17,7 +17,7 @@ var b: i32 = 1; var c: i32 = a[0]; var d: i32 = a[b]; -// CHECK:STDOUT: --- array_element_access.carbon +// CHECK:STDOUT: --- array_element_access.carbon = $array_element_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/index/expr_category.carbon b/toolchain/check/testdata/index/expr_category.carbon index 332540b8f0ad..4c99a414cb12 100644 --- a/toolchain/check/testdata/index/expr_category.carbon +++ b/toolchain/check/testdata/index/expr_category.carbon @@ -32,7 +32,7 @@ fn ValueBinding(b: array(i32, 3)) { F()[0]; } -// CHECK:STDOUT: --- expr_category.carbon +// CHECK:STDOUT: --- expr_category.carbon = $expr_category // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/index/fail_array_large_index.carbon b/toolchain/check/testdata/index/fail_array_large_index.carbon index 832ba265f0d3..3085dcada30d 100644 --- a/toolchain/check/testdata/index/fail_array_large_index.carbon +++ b/toolchain/check/testdata/index/fail_array_large_index.carbon @@ -34,7 +34,7 @@ var b: i32 = a[1]; // CHECK:STDERR: var c: i32 = a[0x7FFF_FFFF]; -// CHECK:STDOUT: --- fail_array_large_index.carbon +// CHECK:STDOUT: --- fail_array_large_index.carbon = $fail_array_large_index // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 343ad2200e21..68e0a7cbc988 100644 --- a/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon +++ b/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon @@ -26,7 +26,7 @@ var a: array(i32, 1) = (12,); // CHECK:STDERR: var b: i32 = a[2.6]; -// CHECK:STDOUT: --- fail_array_non_int_indexing.carbon +// CHECK:STDOUT: --- fail_array_non_int_indexing.carbon = $fail_array_non_int_indexing // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 08e0b2321191..054fc26218c9 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 @@ -23,7 +23,7 @@ var a: array(i32, 1) = (12,); // CHECK:STDERR: var b: i32 = a[1]; -// CHECK:STDOUT: --- fail_array_out_of_bound_access.carbon +// CHECK:STDOUT: --- fail_array_out_of_bound_access.carbon = $fail_array_out_of_bound_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/index/fail_expr_category.carbon b/toolchain/check/testdata/index/fail_expr_category.carbon index c1469865c18d..64263443a998 100644 --- a/toolchain/check/testdata/index/fail_expr_category.carbon +++ b/toolchain/check/testdata/index/fail_expr_category.carbon @@ -53,7 +53,7 @@ fn G(b: array(i32, 3)) { F()[0] = 4; } -// CHECK:STDOUT: --- fail_expr_category.carbon +// CHECK:STDOUT: --- fail_expr_category.carbon = $fail_expr_category // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/index/fail_invalid_base.carbon b/toolchain/check/testdata/index/fail_invalid_base.carbon index 258ef4ea6fb3..227f5ef719a3 100644 --- a/toolchain/check/testdata/index/fail_invalid_base.carbon +++ b/toolchain/check/testdata/index/fail_invalid_base.carbon @@ -58,7 +58,7 @@ var c: i32 = {.a = 1, .b = 2}[0]; // CHECK:STDERR: var d: i32 = {.a: i32, .b: i32}[0]; -// CHECK:STDOUT: --- fail_invalid_base.carbon +// CHECK:STDOUT: --- fail_invalid_base.carbon = $fail_invalid_base // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/index/fail_name_not_found.carbon b/toolchain/check/testdata/index/fail_name_not_found.carbon index d7efd04893e9..437955b30798 100644 --- a/toolchain/check/testdata/index/fail_name_not_found.carbon +++ b/toolchain/check/testdata/index/fail_name_not_found.carbon @@ -22,7 +22,7 @@ fn Main() { var unused b: i32 = a[0]; } -// CHECK:STDOUT: --- fail_name_not_found.carbon +// CHECK:STDOUT: --- fail_name_not_found.carbon = $fail_name_not_found // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/index/fail_negative_indexing.carbon b/toolchain/check/testdata/index/fail_negative_indexing.carbon index c67ed4bd6c18..12e591158191 100644 --- a/toolchain/check/testdata/index/fail_negative_indexing.carbon +++ b/toolchain/check/testdata/index/fail_negative_indexing.carbon @@ -24,7 +24,7 @@ var c: array(i32, 2) = (42, 42); var d: i32 = c[-10]; -// CHECK:STDOUT: --- fail_negative_indexing.carbon +// CHECK:STDOUT: --- fail_negative_indexing.carbon = $fail_negative_indexing // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/index/fail_non_tuple_access.carbon b/toolchain/check/testdata/index/fail_non_tuple_access.carbon index 3d878b3fe122..ccdf3c1ec0cb 100644 --- a/toolchain/check/testdata/index/fail_non_tuple_access.carbon +++ b/toolchain/check/testdata/index/fail_non_tuple_access.carbon @@ -25,7 +25,7 @@ fn Main() { 0[1]; } -// CHECK:STDOUT: --- fail_non_tuple_access.carbon +// CHECK:STDOUT: --- fail_non_tuple_access.carbon = $fail_non_tuple_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/as_type.carbon b/toolchain/check/testdata/interface/as_type.carbon index 7c3f87e322a8..39be3464bf56 100644 --- a/toolchain/check/testdata/interface/as_type.carbon +++ b/toolchain/check/testdata/interface/as_type.carbon @@ -16,7 +16,7 @@ interface Empty {} fn F(unused e: Empty) {} -// CHECK:STDOUT: --- as_type.carbon +// CHECK:STDOUT: --- as_type.carbon = $as_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/as_type_of_type.carbon b/toolchain/check/testdata/interface/as_type_of_type.carbon index 8f96e07362b4..deb10313ee34 100644 --- a/toolchain/check/testdata/interface/as_type_of_type.carbon +++ b/toolchain/check/testdata/interface/as_type_of_type.carbon @@ -23,7 +23,7 @@ fn F(generic T: Empty) { } -// CHECK:STDOUT: --- as_type_of_type.carbon +// CHECK:STDOUT: --- as_type_of_type.carbon = $as_type_of_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/assoc_const.carbon b/toolchain/check/testdata/interface/assoc_const.carbon index 43c5ca7c2e79..e083f835fa98 100644 --- a/toolchain/check/testdata/interface/assoc_const.carbon +++ b/toolchain/check/testdata/interface/assoc_const.carbon @@ -18,7 +18,7 @@ interface I { let Empty: (); } -// CHECK:STDOUT: --- assoc_const.carbon +// CHECK:STDOUT: --- assoc_const.carbon = $assoc_const // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/assoc_const_in_generic.carbon b/toolchain/check/testdata/interface/assoc_const_in_generic.carbon index 958294be2b79..a50c314881bb 100644 --- a/toolchain/check/testdata/interface/assoc_const_in_generic.carbon +++ b/toolchain/check/testdata/interface/assoc_const_in_generic.carbon @@ -27,7 +27,7 @@ fn H() { G({}); } -// CHECK:STDOUT: --- assoc_const_in_generic.carbon +// CHECK:STDOUT: --- assoc_const_in_generic.carbon = $assoc_const_in_generic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/basic.carbon b/toolchain/check/testdata/interface/basic.carbon index faf465520439..89bea47923d9 100644 --- a/toolchain/check/testdata/interface/basic.carbon +++ b/toolchain/check/testdata/interface/basic.carbon @@ -21,7 +21,7 @@ interface ForwardDeclared { fn F(); } -// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: --- basic.carbon = $basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/compound_member_access.carbon b/toolchain/check/testdata/interface/compound_member_access.carbon index bb86b500a228..ddae6f396b99 100644 --- a/toolchain/check/testdata/interface/compound_member_access.carbon +++ b/toolchain/check/testdata/interface/compound_member_access.carbon @@ -218,7 +218,7 @@ fn Works() { } -// CHECK:STDOUT: --- associated_constant.carbon +// CHECK:STDOUT: --- associated_constant.carbon = $associated_constant // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -389,7 +389,7 @@ fn Works() { // CHECK:STDOUT: %W.loc11_44.1 => constants.%W // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- non_instance.carbon +// CHECK:STDOUT: --- non_instance.carbon = $non_instance // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -566,7 +566,7 @@ fn Works() { // CHECK:STDOUT: // CHECK:STDOUT: specific @K1.WithSelf.Q1(constants.%V) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_caller_instance_interface_not.carbon +// CHECK:STDOUT: --- fail_caller_instance_interface_not.carbon = $fail_caller_instance_interface_not // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -767,7 +767,7 @@ fn Works() { // CHECK:STDOUT: %y.patt.loc14_30.2 => constants.%y.patt // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- instance.carbon +// CHECK:STDOUT: --- instance.carbon = $instance // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1187,7 +1187,7 @@ fn Works() { // CHECK:STDOUT: %self.patt.loc5_13.2 => constants.%self.patt.38f562.2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_interface_instance_caller_not.carbon +// CHECK:STDOUT: --- fail_interface_instance_caller_not.carbon = $fail_interface_instance_caller_not // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1417,7 +1417,7 @@ fn Works() { // CHECK:STDOUT: %V.loc38_23.1 => constants.%V // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_combine_non_instance.carbon +// CHECK:STDOUT: --- fail_combine_non_instance.carbon = $fail_combine_non_instance // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1609,7 +1609,7 @@ fn Works() { // CHECK:STDOUT: // CHECK:STDOUT: specific @A.WithSelf.G(constants.%A.facet) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- allowed_combine_non_instance.carbon +// CHECK:STDOUT: --- allowed_combine_non_instance.carbon = $allowed_combine_non_instance // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/default_fn.carbon b/toolchain/check/testdata/interface/default_fn.carbon index d324d35bca7b..12f725aa03d8 100644 --- a/toolchain/check/testdata/interface/default_fn.carbon +++ b/toolchain/check/testdata/interface/default_fn.carbon @@ -49,7 +49,7 @@ impl forall [T: type] T as I { fn Call() { ().(I.G)(); } -// CHECK:STDOUT: --- parsed_in_class_scope.carbon +// CHECK:STDOUT: --- parsed_in_class_scope.carbon = $parsed_in_class_scope // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -240,7 +240,7 @@ fn Call() { ().(I.G)(); } // CHECK:STDOUT: %require_complete => constants.%complete_type // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- generic_impl.carbon +// CHECK:STDOUT: --- generic_impl.carbon = $generic_impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/export_name.carbon b/toolchain/check/testdata/interface/export_name.carbon index 3858d62c3d36..c36ea957e8a8 100644 --- a/toolchain/check/testdata/interface/export_name.carbon +++ b/toolchain/check/testdata/interface/export_name.carbon @@ -42,7 +42,7 @@ import library "export"; fn UseEmpty(unused i: I) {} -// CHECK:STDOUT: --- base.carbon +// CHECK:STDOUT: --- base.carbon = $base // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -70,7 +70,7 @@ fn UseEmpty(unused i: I) {} // CHECK:STDOUT: // CHECK:STDOUT: specific @I.WithSelf(constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- export.carbon +// CHECK:STDOUT: --- export.carbon = $export // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -101,7 +101,7 @@ fn UseEmpty(unused i: I) {} // CHECK:STDOUT: // CHECK:STDOUT: specific @I.WithSelf(constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- use_export.carbon +// CHECK:STDOUT: --- use_export.carbon = $use_export // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/extend_require_call.carbon b/toolchain/check/testdata/interface/extend_require_call.carbon index 8a6925933b0d..c50b11c12de9 100644 --- a/toolchain/check/testdata/interface/extend_require_call.carbon +++ b/toolchain/check/testdata/interface/extend_require_call.carbon @@ -22,7 +22,7 @@ interface K { } //@dump-sem-ir-end -// CHECK:STDOUT: --- extend_require_call.carbon +// CHECK:STDOUT: --- extend_require_call.carbon = $extend_require_call // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/fail_add_member_outside_definition.carbon b/toolchain/check/testdata/interface/fail_add_member_outside_definition.carbon index 3e8951384b15..b8ae955af0c0 100644 --- a/toolchain/check/testdata/interface/fail_add_member_outside_definition.carbon +++ b/toolchain/check/testdata/interface/fail_add_member_outside_definition.carbon @@ -46,7 +46,7 @@ interface Outer { fn Inner.F(); } -// CHECK:STDOUT: --- fail_add_member_outside_definition.carbon +// CHECK:STDOUT: --- fail_add_member_outside_definition.carbon = $fail_add_member_outside_definition // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/fail_assoc_const_alias.carbon b/toolchain/check/testdata/interface/fail_assoc_const_alias.carbon index 8374774d6a4c..988c17c087df 100644 --- a/toolchain/check/testdata/interface/fail_assoc_const_alias.carbon +++ b/toolchain/check/testdata/interface/fail_assoc_const_alias.carbon @@ -82,7 +82,7 @@ interface C { } -// CHECK:STDOUT: --- alias_to_different_interface_with_requires.carbon +// CHECK:STDOUT: --- alias_to_different_interface_with_requires.carbon = $alias_to_different_interface_with_requires // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -171,7 +171,7 @@ interface C { // CHECK:STDOUT: %return.patt.loc14_11.2 => constants.%return.patt // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- call_with_compound_member_access.carbon +// CHECK:STDOUT: --- call_with_compound_member_access.carbon = $call_with_compound_member_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/fail_assoc_const_bad_default.carbon b/toolchain/check/testdata/interface/fail_assoc_const_bad_default.carbon index 126eeb64411d..aea62137e84d 100644 --- a/toolchain/check/testdata/interface/fail_assoc_const_bad_default.carbon +++ b/toolchain/check/testdata/interface/fail_assoc_const_bad_default.carbon @@ -27,7 +27,7 @@ interface I { let T: type = 42; } -// CHECK:STDOUT: --- fail_assoc_const_bad_default.carbon +// CHECK:STDOUT: --- fail_assoc_const_bad_default.carbon = $fail_assoc_const_bad_default // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 f268d4f5c53e..b17de32da711 100644 --- a/toolchain/check/testdata/interface/fail_assoc_fn_invalid_use.carbon +++ b/toolchain/check/testdata/interface/fail_assoc_fn_invalid_use.carbon @@ -32,7 +32,7 @@ fn Use(generic T: I) { } -// CHECK:STDOUT: --- fail_member_access.carbon +// CHECK:STDOUT: --- fail_member_access.carbon = $fail_member_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/fail_definition_imported.carbon b/toolchain/check/testdata/interface/fail_definition_imported.carbon index e8ee0a9c289d..5c4adae76eb7 100644 --- a/toolchain/check/testdata/interface/fail_definition_imported.carbon +++ b/toolchain/check/testdata/interface/fail_definition_imported.carbon @@ -37,7 +37,7 @@ import library "a"; // CHECK:STDERR: interface I {} -// CHECK:STDOUT: --- a.carbon +// CHECK:STDOUT: --- a.carbon = $a // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -53,7 +53,7 @@ interface I {} // CHECK:STDOUT: // CHECK:STDOUT: interface @I; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_b.carbon +// CHECK:STDOUT: --- fail_b.carbon = $fail_b // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/fail_duplicate.carbon b/toolchain/check/testdata/interface/fail_duplicate.carbon index 5072bd316d6d..ea1fc27ef5a4 100644 --- a/toolchain/check/testdata/interface/fail_duplicate.carbon +++ b/toolchain/check/testdata/interface/fail_duplicate.carbon @@ -89,7 +89,7 @@ class Class; interface Class { } -// CHECK:STDOUT: --- fail_redefine_without_dependents.carbon +// CHECK:STDOUT: --- fail_redefine_without_dependents.carbon = $fail_redefine_without_dependents // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -148,7 +148,7 @@ interface Class { } // CHECK:STDOUT: // CHECK:STDOUT: specific @Interface.WithSelf.F(constants.%Self.3ce02d.2) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_redefine_with_dependents.carbon +// CHECK:STDOUT: --- fail_redefine_with_dependents.carbon = $fail_redefine_with_dependents // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -234,7 +234,7 @@ interface Class { } // CHECK:STDOUT: %self.patt.loc17_8.2 => constants.%self.patt // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_name_conflict_with_fn.carbon +// CHECK:STDOUT: --- fail_name_conflict_with_fn.carbon = $fail_name_conflict_with_fn // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -255,7 +255,7 @@ interface Class { } // CHECK:STDOUT: // CHECK:STDOUT: fn @Function.loc4(); // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_name_conflict_with_class.carbon +// CHECK:STDOUT: --- fail_name_conflict_with_class.carbon = $fail_name_conflict_with_class // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/fail_generic_redeclaration.carbon b/toolchain/check/testdata/interface/fail_generic_redeclaration.carbon index 975fd8cc3f2f..8797d951fc9e 100644 --- a/toolchain/check/testdata/interface/fail_generic_redeclaration.carbon +++ b/toolchain/check/testdata/interface/fail_generic_redeclaration.carbon @@ -60,7 +60,7 @@ interface DifferentParams(T: type); // CHECK:STDERR: interface DifferentParams(T: ()) {} -// CHECK:STDOUT: --- fail_generic_redeclaration.carbon +// CHECK:STDOUT: --- fail_generic_redeclaration.carbon = $fail_generic_redeclaration // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 15458b8ee337..8d138e756087 100644 --- a/toolchain/check/testdata/interface/fail_lookup_in_type_type.carbon +++ b/toolchain/check/testdata/interface/fail_lookup_in_type_type.carbon @@ -38,7 +38,7 @@ library "[[@TEST_NAME]]"; // CHECK:STDERR: let U: (type where .Self impls type).missing = {}; -// CHECK:STDOUT: --- fail_lookup_in_type.carbon +// CHECK:STDOUT: --- fail_lookup_in_type.carbon = $fail_lookup_in_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -63,7 +63,7 @@ let U: (type where .Self impls type).missing = {}; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_lookup_type_where.carbon +// CHECK:STDOUT: --- fail_lookup_type_where.carbon = $fail_lookup_type_where // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/fail_lookup_undefined.carbon b/toolchain/check/testdata/interface/fail_lookup_undefined.carbon index 69771662774f..26f93ea38c1c 100644 --- a/toolchain/check/testdata/interface/fail_lookup_undefined.carbon +++ b/toolchain/check/testdata/interface/fail_lookup_undefined.carbon @@ -67,7 +67,7 @@ interface BeingDefined { fn BeingDefined.I(); } -// CHECK:STDOUT: --- fail_lookup_undefined.carbon +// CHECK:STDOUT: --- fail_lookup_undefined.carbon = $fail_lookup_undefined // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/fail_member_lookup.carbon b/toolchain/check/testdata/interface/fail_member_lookup.carbon index 69358f4b852a..c5ebae35f71c 100644 --- a/toolchain/check/testdata/interface/fail_member_lookup.carbon +++ b/toolchain/check/testdata/interface/fail_member_lookup.carbon @@ -58,7 +58,7 @@ interface Different {} // CHECK:STDERR: fn G(generic U: Different) -> U.(Interface.T); -// CHECK:STDOUT: --- fail_member_lookup.carbon +// CHECK:STDOUT: --- fail_member_lookup.carbon = $fail_member_lookup // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/fail_modifiers.carbon b/toolchain/check/testdata/interface/fail_modifiers.carbon index e4b4baceeb3c..2317d5a39c18 100644 --- a/toolchain/check/testdata/interface/fail_modifiers.carbon +++ b/toolchain/check/testdata/interface/fail_modifiers.carbon @@ -96,7 +96,7 @@ interface I { protected fn F(self); } -// CHECK:STDOUT: --- fail_abstract.carbon +// CHECK:STDOUT: --- fail_abstract.carbon = $fail_abstract // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -124,7 +124,7 @@ interface I { // CHECK:STDOUT: // CHECK:STDOUT: specific @Abstract.WithSelf(constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_default.carbon +// CHECK:STDOUT: --- fail_default.carbon = $fail_default // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -140,7 +140,7 @@ interface I { // CHECK:STDOUT: // CHECK:STDOUT: interface @Default; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_virtual.carbon +// CHECK:STDOUT: --- fail_virtual.carbon = $fail_virtual // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -168,7 +168,7 @@ interface I { // CHECK:STDOUT: // CHECK:STDOUT: specific @Virtual.WithSelf(constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_protected.carbon +// CHECK:STDOUT: --- fail_protected.carbon = $fail_protected // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -184,7 +184,7 @@ interface I { // CHECK:STDOUT: // CHECK:STDOUT: interface @Protected; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_private_member.carbon +// CHECK:STDOUT: --- fail_private_member.carbon = $fail_private_member // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -254,7 +254,7 @@ interface I { // CHECK:STDOUT: %self.patt.loc12_16.2 => constants.%self.patt // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_protected_member.carbon +// CHECK:STDOUT: --- fail_protected_member.carbon = $fail_protected_member // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/fail_redeclare_member.carbon b/toolchain/check/testdata/interface/fail_redeclare_member.carbon index 4c25b3142826..1c6ec1f8509f 100644 --- a/toolchain/check/testdata/interface/fail_redeclare_member.carbon +++ b/toolchain/check/testdata/interface/fail_redeclare_member.carbon @@ -27,7 +27,7 @@ interface Interface { fn F(); } -// CHECK:STDOUT: --- fail_redeclare_member.carbon +// CHECK:STDOUT: --- fail_redeclare_member.carbon = $fail_redeclare_member // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/fail_todo_assoc_const_default.carbon b/toolchain/check/testdata/interface/fail_todo_assoc_const_default.carbon index 7b5b062e2a4e..e280f2679356 100644 --- a/toolchain/check/testdata/interface/fail_todo_assoc_const_default.carbon +++ b/toolchain/check/testdata/interface/fail_todo_assoc_const_default.carbon @@ -29,7 +29,7 @@ interface I { default let N: i32 = 42; } -// CHECK:STDOUT: --- fail_todo_assoc_const_default.carbon +// CHECK:STDOUT: --- fail_todo_assoc_const_default.carbon = $fail_todo_assoc_const_default // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/final.carbon b/toolchain/check/testdata/interface/final.carbon index ea5d149b0afa..311e4647684e 100644 --- a/toolchain/check/testdata/interface/final.carbon +++ b/toolchain/check/testdata/interface/final.carbon @@ -165,7 +165,7 @@ fn Use() { D_As_I.(I.F)(); } -// CHECK:STDOUT: --- require_specific_impl_definition.carbon +// CHECK:STDOUT: --- require_specific_impl_definition.carbon = $require_specific_impl_definition // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -545,7 +545,7 @@ fn Use() { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- require_specific_impl_definition_from_symbolic_impl_in_class_definition.carbon +// CHECK:STDOUT: --- require_specific_impl_definition_from_symbolic_impl_in_class_definition.carbon = $require_specific_impl_definition_from_symbolic_impl_in_class_definition // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -915,7 +915,7 @@ fn Use() { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- require_specific_impl_definition_from_lookup_impl_witness_in_class_definition.carbon +// CHECK:STDOUT: --- require_specific_impl_definition_from_lookup_impl_witness_in_class_definition.carbon = $require_specific_impl_definition_from_lookup_impl_witness_in_class_definition // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1384,7 +1384,7 @@ fn Use() { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- require_specific_impl_definition_through_specific_instantiation.carbon +// CHECK:STDOUT: --- require_specific_impl_definition_through_specific_instantiation.carbon = $require_specific_impl_definition_through_specific_instantiation // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1740,7 +1740,7 @@ fn Use() { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- require_specific_impl_definition_from_inside_impl_definition.carbon +// CHECK:STDOUT: --- require_specific_impl_definition_from_inside_impl_definition.carbon = $require_specific_impl_definition_from_inside_impl_definition // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/generic.carbon b/toolchain/check/testdata/interface/generic.carbon index f5c091809e3e..85ad9a392099 100644 --- a/toolchain/check/testdata/interface/generic.carbon +++ b/toolchain/check/testdata/interface/generic.carbon @@ -87,7 +87,7 @@ interface Generic(T: type) {} // CHECK:STDERR: fn F(unused generic T: Generic((), ())) {} -// CHECK:STDOUT: --- generic.carbon +// CHECK:STDOUT: --- generic.carbon = $generic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -484,7 +484,7 @@ fn F(unused generic T: Generic((), ())) {} // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_mismatched_args.carbon +// CHECK:STDOUT: --- fail_mismatched_args.carbon = $fail_mismatched_args // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -644,7 +644,7 @@ fn F(unused generic T: Generic((), ())) {} // CHECK:STDOUT: %T.loc10_15.1 => constants.%T.ec1 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_args_count_mismatch.carbon +// CHECK:STDOUT: --- fail_args_count_mismatch.carbon = $fail_args_count_mismatch // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/generic_binding_after_assoc_const.carbon b/toolchain/check/testdata/interface/generic_binding_after_assoc_const.carbon index c03e6f319494..2ae437c1d542 100644 --- a/toolchain/check/testdata/interface/generic_binding_after_assoc_const.carbon +++ b/toolchain/check/testdata/interface/generic_binding_after_assoc_const.carbon @@ -20,7 +20,7 @@ interface I { fn G(generic T: type); } -// CHECK:STDOUT: --- generic_binding_after_assoc_const.carbon +// CHECK:STDOUT: --- generic_binding_after_assoc_const.carbon = $generic_binding_after_assoc_const // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/generic_import.carbon b/toolchain/check/testdata/interface/generic_import.carbon index 3c2b3f8d69af..efe33f08dec5 100644 --- a/toolchain/check/testdata/interface/generic_import.carbon +++ b/toolchain/check/testdata/interface/generic_import.carbon @@ -31,7 +31,7 @@ impl C as AddWith(C) { fn F() {} } -// CHECK:STDOUT: --- a.carbon +// CHECK:STDOUT: --- a.carbon = $a // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -102,7 +102,7 @@ impl C as AddWith(C) { // CHECK:STDOUT: // CHECK:STDOUT: specific @AddWith.WithSelf.F(constants.%T, constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- b.carbon +// CHECK:STDOUT: --- b.carbon = $b // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/generic_method.carbon b/toolchain/check/testdata/interface/generic_method.carbon index 4a903d9933a2..269dbd0dedd4 100644 --- a/toolchain/check/testdata/interface/generic_method.carbon +++ b/toolchain/check/testdata/interface/generic_method.carbon @@ -84,7 +84,7 @@ fn CallIndirect() { } -// CHECK:STDOUT: --- generic_method_fewer_params.carbon +// CHECK:STDOUT: --- generic_method_fewer_params.carbon = $generic_method_fewer_params // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -936,7 +936,7 @@ fn CallIndirect() { // CHECK:STDOUT: %return.patt.loc6_32.2 => constants.%return.patt.8bb // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- generic_method_more_params.carbon +// CHECK:STDOUT: --- generic_method_more_params.carbon = $generic_method_more_params // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/generic_vs_params.carbon b/toolchain/check/testdata/interface/generic_vs_params.carbon index c6692bad1c3a..6ce5128fce4f 100644 --- a/toolchain/check/testdata/interface/generic_vs_params.carbon +++ b/toolchain/check/testdata/interface/generic_vs_params.carbon @@ -84,7 +84,7 @@ library "[[@TEST_NAME]]"; // CHECK:STDERR: interface Bar[T: type] {} -// CHECK:STDOUT: --- params.carbon +// CHECK:STDOUT: --- params.carbon = $params // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -474,7 +474,7 @@ interface Bar[T: type] {} // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_non_generic_implicit_params.carbon +// CHECK:STDOUT: --- fail_non_generic_implicit_params.carbon = $fail_non_generic_implicit_params // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -504,7 +504,7 @@ interface Bar[T: type] {} // CHECK:STDOUT: // CHECK:STDOUT: specific @A.WithSelf(constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_non_generic_params.carbon +// CHECK:STDOUT: --- fail_non_generic_params.carbon = $fail_non_generic_params // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -534,7 +534,7 @@ interface Bar[T: type] {} // CHECK:STDOUT: // CHECK:STDOUT: specific @A.WithSelf(constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_implicit_params_only_empty.carbon +// CHECK:STDOUT: --- fail_implicit_params_only_empty.carbon = $fail_implicit_params_only_empty // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -564,7 +564,7 @@ interface Bar[T: type] {} // CHECK:STDOUT: // CHECK:STDOUT: specific @Bar.WithSelf(constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_implicit_params_only.carbon +// CHECK:STDOUT: --- fail_implicit_params_only.carbon = $fail_implicit_params_only // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/import.carbon b/toolchain/check/testdata/interface/import.carbon index 87faf48978cc..82c734bc81fe 100644 --- a/toolchain/check/testdata/interface/import.carbon +++ b/toolchain/check/testdata/interface/import.carbon @@ -52,7 +52,7 @@ alias UseForwardDeclaredF = ForwardDeclared.F; var f: ForwardDeclared* = &f_ref.f; -// CHECK:STDOUT: --- a.carbon +// CHECK:STDOUT: --- a.carbon = $a // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -208,7 +208,7 @@ var f: ForwardDeclared* = &f_ref.f; // CHECK:STDOUT: // CHECK:STDOUT: specific @ForwardDeclared.WithSelf.F(constants.%Self.d56) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- b.carbon +// CHECK:STDOUT: --- b.carbon = $b // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/import_access.carbon b/toolchain/check/testdata/interface/import_access.carbon index 45ad2e798954..37a17327e927 100644 --- a/toolchain/check/testdata/interface/import_access.carbon +++ b/toolchain/check/testdata/interface/import_access.carbon @@ -172,7 +172,7 @@ private interface Redecl; private interface Redecl {} -// CHECK:STDOUT: --- def.carbon +// CHECK:STDOUT: --- def.carbon = $def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -200,7 +200,7 @@ private interface Redecl {} // CHECK:STDOUT: // CHECK:STDOUT: specific @Def.WithSelf(constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- forward_with_def.carbon +// CHECK:STDOUT: --- forward_with_def.carbon = $forward_with_def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -229,13 +229,13 @@ private interface Redecl {} // CHECK:STDOUT: // CHECK:STDOUT: specific @ForwardWithDef.WithSelf(constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- forward.carbon +// CHECK:STDOUT: --- forward.carbon = $forward // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- def.impl.carbon +// CHECK:STDOUT: --- def.impl.carbon = $def.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -287,7 +287,7 @@ private interface Redecl {} // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_local_def.carbon +// CHECK:STDOUT: --- fail_local_def.carbon = $fail_local_def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -316,7 +316,7 @@ private interface Redecl {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_other_def.carbon +// CHECK:STDOUT: --- fail_other_def.carbon = $fail_other_def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -355,7 +355,7 @@ private interface Redecl {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- forward_with_def.impl.carbon +// CHECK:STDOUT: --- forward_with_def.impl.carbon = $forward_with_def.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -407,7 +407,7 @@ private interface Redecl {} // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_local_forward_with_def.carbon +// CHECK:STDOUT: --- fail_local_forward_with_def.carbon = $fail_local_forward_with_def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -436,7 +436,7 @@ private interface Redecl {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_other_forward_with_def.carbon +// CHECK:STDOUT: --- fail_other_forward_with_def.carbon = $fail_other_forward_with_def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -475,7 +475,7 @@ private interface Redecl {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_forward.impl.carbon +// CHECK:STDOUT: --- fail_todo_forward.impl.carbon = $fail_todo_forward.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -524,7 +524,7 @@ private interface Redecl {} // CHECK:STDOUT: // CHECK:STDOUT: specific @Forward.WithSelf(constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_local_forward.carbon +// CHECK:STDOUT: --- fail_local_forward.carbon = $fail_local_forward // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -556,7 +556,7 @@ private interface Redecl {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_other_forward.carbon +// CHECK:STDOUT: --- fail_other_forward.carbon = $fail_other_forward // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -595,7 +595,7 @@ private interface Redecl {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- todo_fail_private_on_redecl.carbon +// CHECK:STDOUT: --- todo_fail_private_on_redecl.carbon = $todo_fail_private_on_redecl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/import_interface_decl.carbon b/toolchain/check/testdata/interface/import_interface_decl.carbon index 5ef1b5737557..d718c5316107 100644 --- a/toolchain/check/testdata/interface/import_interface_decl.carbon +++ b/toolchain/check/testdata/interface/import_interface_decl.carbon @@ -33,7 +33,7 @@ impl () as B; //@include-in-dumps impl library "[[@TEST_NAME]]"; -// CHECK:STDOUT: --- a.impl.carbon +// CHECK:STDOUT: --- a.impl.carbon = $a.impl // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Main.A = import_ref Main//a, A, unloaded @@ -47,7 +47,7 @@ impl library "[[@TEST_NAME]]"; // CHECK:STDOUT: %default.import.loc2_17.2 = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- b.impl.carbon +// CHECK:STDOUT: --- b.impl.carbon = $b.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/incomplete.carbon b/toolchain/check/testdata/interface/incomplete.carbon index 838b6fa004a0..258cb01e7332 100644 --- a/toolchain/check/testdata/interface/incomplete.carbon +++ b/toolchain/check/testdata/interface/incomplete.carbon @@ -118,7 +118,7 @@ interface A(T: type) { extend require impls A({}); } -// CHECK:STDOUT: --- incomplete_type.carbon +// CHECK:STDOUT: --- incomplete_type.carbon = $incomplete_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -161,7 +161,7 @@ interface A(T: type) { // CHECK:STDOUT: // CHECK:STDOUT: specific @I.WithSelf(constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_incomplete_type_impl.carbon +// CHECK:STDOUT: --- fail_incomplete_type_impl.carbon = $fail_incomplete_type_impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -246,7 +246,7 @@ interface A(T: type) { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- incomplete_type_usage.carbon +// CHECK:STDOUT: --- incomplete_type_usage.carbon = $incomplete_type_usage // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -358,7 +358,7 @@ interface A(T: type) { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_incomplete_extend_constraint.carbon +// CHECK:STDOUT: --- fail_incomplete_extend_constraint.carbon = $fail_incomplete_extend_constraint // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -394,7 +394,7 @@ interface A(T: type) { // CHECK:STDOUT: // CHECK:STDOUT: specific @B.WithSelf(constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_extend_require_enclosing.carbon +// CHECK:STDOUT: --- fail_extend_require_enclosing.carbon = $fail_extend_require_enclosing // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -443,7 +443,7 @@ interface A(T: type) { // CHECK:STDOUT: %Self.as_type.loc16_18.2 => constants.%Self.as_type // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_extend_require_enclosing_generic.carbon +// CHECK:STDOUT: --- fail_extend_require_enclosing_generic.carbon = $fail_extend_require_enclosing_generic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/local.carbon b/toolchain/check/testdata/interface/local.carbon index d90111971f11..16b805ec8eb4 100644 --- a/toolchain/check/testdata/interface/local.carbon +++ b/toolchain/check/testdata/interface/local.carbon @@ -22,7 +22,7 @@ fn F() { ().(I.G)(); } -// CHECK:STDOUT: --- local.carbon +// CHECK:STDOUT: --- local.carbon = $local // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/member_lookup.carbon b/toolchain/check/testdata/interface/member_lookup.carbon index 2fe41906ea7d..eb81282eb75a 100644 --- a/toolchain/check/testdata/interface/member_lookup.carbon +++ b/toolchain/check/testdata/interface/member_lookup.carbon @@ -59,7 +59,7 @@ fn AccessMissingConcrete(generic I: Interface(i32)) -> i32 { } -// CHECK:STDOUT: --- member_access.carbon +// CHECK:STDOUT: --- member_access.carbon = $member_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -381,7 +381,7 @@ fn AccessMissingConcrete(generic I: Interface(i32)) -> i32 { // CHECK:STDOUT: %assoc0 => constants.%assoc0.8c4 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_no_member.carbon +// CHECK:STDOUT: --- fail_no_member.carbon = $fail_no_member // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/modifiers.carbon b/toolchain/check/testdata/interface/modifiers.carbon index 7868e7b2ef1a..58b162d31821 100644 --- a/toolchain/check/testdata/interface/modifiers.carbon +++ b/toolchain/check/testdata/interface/modifiers.carbon @@ -245,7 +245,7 @@ interface C { final let U: type = C; } -// CHECK:STDOUT: --- default_interfaces.carbon +// CHECK:STDOUT: --- default_interfaces.carbon = $default_interfaces // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -518,7 +518,7 @@ interface C { // CHECK:STDOUT: %self.patt.loc10_23.2 => constants.%self.patt.99e // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- final_interfaces.carbon +// CHECK:STDOUT: --- final_interfaces.carbon = $final_interfaces // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -791,7 +791,7 @@ interface C { // CHECK:STDOUT: %self.patt.loc10_21.2 => constants.%self.patt.bc8 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- default_function.carbon +// CHECK:STDOUT: --- default_function.carbon = $default_function // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -857,7 +857,7 @@ interface C { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- default_method.carbon +// CHECK:STDOUT: --- default_method.carbon = $default_method // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -964,7 +964,7 @@ interface C { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc11_15.2(%self.param: ref %C) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- default_function_overridden.carbon +// CHECK:STDOUT: --- default_function_overridden.carbon = $default_function_overridden // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1050,7 +1050,7 @@ interface C { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- default_method_overridden.carbon +// CHECK:STDOUT: --- default_method_overridden.carbon = $default_method_overridden // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1193,7 +1193,7 @@ interface C { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc14_15.2(%self.param: ref %C) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- final_function.carbon +// CHECK:STDOUT: --- final_function.carbon = $final_function // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1259,7 +1259,7 @@ interface C { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- final_method.carbon +// CHECK:STDOUT: --- final_method.carbon = $final_method // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/observe.carbon b/toolchain/check/testdata/interface/observe.carbon index 95312422ed6a..e0a6115948b2 100644 --- a/toolchain/check/testdata/interface/observe.carbon +++ b/toolchain/check/testdata/interface/observe.carbon @@ -593,7 +593,7 @@ fn F[W: A, X: I(W)](x: X) { x.TakesT(v); } -// CHECK:STDOUT: --- transitive.carbon +// CHECK:STDOUT: --- transitive.carbon = $transitive // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -798,7 +798,7 @@ fn F[W: A, X: I(W)](x: X) { // CHECK:STDOUT: %c.patt.loc14_20.2 => constants.%c.patt // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- blanket_impls.carbon +// CHECK:STDOUT: --- blanket_impls.carbon = $blanket_impls // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -921,7 +921,7 @@ fn F[W: A, X: I(W)](x: X) { // CHECK:STDOUT: %x.patt.loc16_21.2 => constants.%x.patt.cd4828.1 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_nested_functions_in_outer.carbon +// CHECK:STDOUT: --- fail_todo_nested_functions_in_outer.carbon = $fail_todo_nested_functions_in_outer // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1145,7 +1145,7 @@ fn F[W: A, X: I(W)](x: X) { // CHECK:STDOUT: %x.patt.loc12_14.2 => constants.%x.patt.860 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- generic_observe.carbon +// CHECK:STDOUT: --- generic_observe.carbon = $generic_observe // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/require.carbon b/toolchain/check/testdata/interface/require.carbon index 73bacdba61ea..b1af34cca039 100644 --- a/toolchain/check/testdata/interface/require.carbon +++ b/toolchain/check/testdata/interface/require.carbon @@ -452,7 +452,7 @@ interface Z(T: type) { } //@dump-sem-ir-end -// CHECK:STDOUT: --- fail_todo_extend.carbon +// CHECK:STDOUT: --- fail_todo_extend.carbon = $fail_todo_extend // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -512,7 +512,7 @@ interface Z(T: type) { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_extend_with_self.carbon +// CHECK:STDOUT: --- fail_todo_extend_with_self.carbon = $fail_todo_extend_with_self // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -592,7 +592,7 @@ interface Z(T: type) { // CHECK:STDOUT: %require_complete => constants.%require_complete.d69 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_implicit_self_impls.carbon +// CHECK:STDOUT: --- fail_todo_implicit_self_impls.carbon = $fail_todo_implicit_self_impls // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -642,7 +642,7 @@ interface Z(T: type) { // CHECK:STDOUT: %Self.as_type.loc9_11.2 => constants.%Self.as_type // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_explicit_self_impls.carbon +// CHECK:STDOUT: --- fail_todo_explicit_self_impls.carbon = $fail_todo_explicit_self_impls // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -694,7 +694,7 @@ interface Z(T: type) { // CHECK:STDOUT: %Self.as_type.loc9_11.2 => constants.%Self.as_type // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- explicit_self_specific_impls.carbon +// CHECK:STDOUT: --- explicit_self_specific_impls.carbon = $explicit_self_specific_impls // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -755,7 +755,7 @@ interface Z(T: type) { // CHECK:STDOUT: %C.loc9_17.2 => constants.%C.4f7 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- require_impls_where.carbon +// CHECK:STDOUT: --- require_impls_where.carbon = $require_impls_where // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -843,7 +843,7 @@ interface Z(T: type) { // CHECK:STDOUT: %Y_where.type.loc7_19.2 => constants.%Y_where.type.bc8 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- require_impls_self_specific.carbon +// CHECK:STDOUT: --- require_impls_self_specific.carbon = $require_impls_self_specific // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -940,7 +940,7 @@ interface Z(T: type) { // CHECK:STDOUT: %Z.type.loc5_25.2 => constants.%Z.type.833 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- require_self_in_requirement.carbon +// CHECK:STDOUT: --- require_self_in_requirement.carbon = $require_self_in_requirement // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1029,7 +1029,7 @@ interface Z(T: type) { // CHECK:STDOUT: %Y_where.type.loc10_19.3 => constants.%Y_where.type.061 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- require_same.carbon +// CHECK:STDOUT: --- require_same.carbon = $require_same // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/self.carbon b/toolchain/check/testdata/interface/self.carbon index 06f4888991c1..07027d6f38ee 100644 --- a/toolchain/check/testdata/interface/self.carbon +++ b/toolchain/check/testdata/interface/self.carbon @@ -17,7 +17,7 @@ interface UseSelf { } -// CHECK:STDOUT: --- self.carbon +// CHECK:STDOUT: --- self.carbon = $self // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/syntactic_merge.carbon b/toolchain/check/testdata/interface/syntactic_merge.carbon index 5d5b7886a513..1b5084c229f3 100644 --- a/toolchain/check/testdata/interface/syntactic_merge.carbon +++ b/toolchain/check/testdata/interface/syntactic_merge.carbon @@ -243,7 +243,7 @@ interface Foo(a: const C); // CHECK:STDERR: interface Foo(a: const (const C)) {} -// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: --- basic.carbon = $basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -374,7 +374,7 @@ interface Foo(a: const (const C)) {} // CHECK:STDOUT: // CHECK:STDOUT: specific @Bar.WithSelf(constants.%a, constants.%Self.3ee) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- spacing.carbon +// CHECK:STDOUT: --- spacing.carbon = $spacing // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -452,7 +452,7 @@ interface Foo(a: const (const C)) {} // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo.WithSelf(constants.%a, constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_parens.carbon +// CHECK:STDOUT: --- fail_parens.carbon = $fail_parens // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -544,7 +544,7 @@ interface Foo(a: const (const C)) {} // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo.WithSelf(constants.%a, constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_raw_identifier.carbon +// CHECK:STDOUT: --- fail_raw_identifier.carbon = $fail_raw_identifier // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -636,7 +636,7 @@ interface Foo(a: const (const C)) {} // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo.WithSelf(constants.%a, constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- two_file.carbon +// CHECK:STDOUT: --- two_file.carbon = $two_file // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -715,7 +715,7 @@ interface Foo(a: const (const C)) {} // CHECK:STDOUT: %a.loc8_16.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_two_file.impl.carbon +// CHECK:STDOUT: --- fail_todo_two_file.impl.carbon = $fail_todo_two_file.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -865,7 +865,7 @@ interface Foo(a: const (const C)) {} // CHECK:STDOUT: // CHECK:STDOUT: specific @Bar.WithSelf(constants.%a, constants.%Self.3ee) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_name_mismatch.carbon +// CHECK:STDOUT: --- fail_name_mismatch.carbon = $fail_name_mismatch // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -962,7 +962,7 @@ interface Foo(a: const (const C)) {} // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo.WithSelf(constants.%b, constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_alias.carbon +// CHECK:STDOUT: --- fail_alias.carbon = $fail_alias // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1057,7 +1057,7 @@ interface Foo(a: const (const C)) {} // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo.WithSelf(constants.%a, constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_deduced_alias.carbon +// CHECK:STDOUT: --- fail_deduced_alias.carbon = $fail_deduced_alias // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1152,7 +1152,7 @@ interface Foo(a: const (const C)) {} // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo.WithSelf(constants.%a, constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- alias_two_file.carbon +// CHECK:STDOUT: --- alias_two_file.carbon = $alias_two_file // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1204,7 +1204,7 @@ interface Foo(a: const (const C)) {} // CHECK:STDOUT: %a.loc6_16.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_alias_two_file.impl.carbon +// CHECK:STDOUT: --- fail_alias_two_file.impl.carbon = $fail_alias_two_file.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1298,7 +1298,7 @@ interface Foo(a: const (const C)) {} // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo.WithSelf(constants.%a, constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_repeat_const.carbon +// CHECK:STDOUT: --- fail_repeat_const.carbon = $fail_repeat_const // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interface/todo_define_not_default.carbon b/toolchain/check/testdata/interface/todo_define_not_default.carbon index 1d935bb441b1..a65fdf02f0b5 100644 --- a/toolchain/check/testdata/interface/todo_define_not_default.carbon +++ b/toolchain/check/testdata/interface/todo_define_not_default.carbon @@ -23,7 +23,7 @@ interface I { let N: i32 = 42; } -// CHECK:STDOUT: --- todo_define_not_default.carbon +// CHECK:STDOUT: --- todo_define_not_default.carbon = $todo_define_not_default // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/basics/cpp_diagnostics.carbon b/toolchain/check/testdata/interop/cpp/basics/cpp_diagnostics.carbon index 969e7960ff82..a9ce9fb7634a 100644 --- a/toolchain/check/testdata/interop/cpp/basics/cpp_diagnostics.carbon +++ b/toolchain/check/testdata/interop/cpp/basics/cpp_diagnostics.carbon @@ -554,7 +554,7 @@ void f(const int n) { } '''; -// CHECK:STDOUT: --- import_cpp_file_with_one_warning.carbon +// CHECK:STDOUT: --- import_cpp_file_with_one_warning.carbon = $import_cpp_file_with_one_warning // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: %Cpp.import_cpp = import_cpp { @@ -562,7 +562,7 @@ void f(const int n) { // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_cpp_file_with_multiple_warnings.carbon +// CHECK:STDOUT: --- import_cpp_file_with_multiple_warnings.carbon = $import_cpp_file_with_multiple_warnings // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: %Cpp.import_cpp = import_cpp { @@ -570,7 +570,7 @@ void f(const int n) { // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_multiple_cpp_files_with_warnings.carbon +// CHECK:STDOUT: --- import_multiple_cpp_files_with_warnings.carbon = $import_multiple_cpp_files_with_warnings // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: %Cpp.import_cpp = import_cpp { @@ -579,7 +579,7 @@ void f(const int n) { // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_indirect_warning.carbon +// CHECK:STDOUT: --- import_indirect_warning.carbon = $import_indirect_warning // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: %Cpp.import_cpp = import_cpp { diff --git a/toolchain/check/testdata/interop/cpp/basics/import/cpp_namespace.carbon b/toolchain/check/testdata/interop/cpp/basics/import/cpp_namespace.carbon index f5f29f534b2c..d50fb58dba68 100644 --- a/toolchain/check/testdata/interop/cpp/basics/import/cpp_namespace.carbon +++ b/toolchain/check/testdata/interop/cpp/basics/import/cpp_namespace.carbon @@ -114,7 +114,7 @@ fn F() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- alias.carbon +// CHECK:STDOUT: --- alias.carbon = $alias // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Cpp: = namespace file.%Cpp.import_cpp, [concrete] { @@ -127,7 +127,7 @@ fn F() { // CHECK:STDOUT: %MyCpp: = alias_binding MyCpp, %Cpp.ref [concrete = imports.%Cpp] // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- api_and_impl.carbon +// CHECK:STDOUT: --- api_and_impl.carbon = $api_and_impl // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: %Cpp.import_cpp = import_cpp { @@ -135,9 +135,9 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- api_and_impl.impl.carbon +// CHECK:STDOUT: --- api_and_impl.impl.carbon = $api_and_impl.impl // CHECK:STDOUT: -// CHECK:STDOUT: --- system_header.carbon +// CHECK:STDOUT: --- system_header.carbon = $system_header // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/basics/import/import.carbon b/toolchain/check/testdata/interop/cpp/basics/import/import.carbon index 51f668c20d1b..736cacaa1e72 100644 --- a/toolchain/check/testdata/interop/cpp/basics/import/import.carbon +++ b/toolchain/check/testdata/interop/cpp/basics/import/import.carbon @@ -126,7 +126,7 @@ fn F() { Cpp.MyInlineFunction(9 as Cpp.short); } -// CHECK:STDOUT: --- fail_todo_import_struct_api.carbon +// CHECK:STDOUT: --- fail_todo_import_struct_api.carbon = $fail_todo_import_struct_api // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -151,7 +151,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_import_function_api.carbon +// CHECK:STDOUT: --- fail_todo_import_function_api.carbon = $fail_todo_import_function_api // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/basics/import/include.carbon b/toolchain/check/testdata/interop/cpp/basics/import/include.carbon index e360785402dc..f71ff147a424 100644 --- a/toolchain/check/testdata/interop/cpp/basics/import/include.carbon +++ b/toolchain/check/testdata/interop/cpp/basics/import/include.carbon @@ -26,7 +26,7 @@ library "[[@TEST_NAME]]"; import Cpp library "including_file.h"; //@dump-sem-ir-end -// CHECK:STDOUT: --- import_function_decl.carbon +// CHECK:STDOUT: --- import_function_decl.carbon = $import_function_decl // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: %Cpp.import_cpp = import_cpp { diff --git a/toolchain/check/testdata/interop/cpp/basics/import/indirect.carbon b/toolchain/check/testdata/interop/cpp/basics/import/indirect.carbon index cb10c5894729..e1981525b0c1 100644 --- a/toolchain/check/testdata/interop/cpp/basics/import/indirect.carbon +++ b/toolchain/check/testdata/interop/cpp/basics/import/indirect.carbon @@ -149,7 +149,7 @@ fn UseZ() -> Cpp.A.Z { //@dump-sem-ir-end } -// CHECK:STDOUT: --- indirect_import_via_function.carbon +// CHECK:STDOUT: --- indirect_import_via_function.carbon = $indirect_import_via_function // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -244,7 +244,7 @@ fn UseZ() -> Cpp.A.Z { // CHECK:STDOUT: return %X.g.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- indirect_import_via_alias.carbon +// CHECK:STDOUT: --- indirect_import_via_alias.carbon = $indirect_import_via_alias // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -376,7 +376,7 @@ fn UseZ() -> Cpp.A.Z { // CHECK:STDOUT: return %.loc10_24 to %return.param // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_template.carbon +// CHECK:STDOUT: --- import_template.carbon = $import_template // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/basics/import/multiple_imports.carbon b/toolchain/check/testdata/interop/cpp/basics/import/multiple_imports.carbon index 14f919fac4b1..328032c527df 100644 --- a/toolchain/check/testdata/interop/cpp/basics/import/multiple_imports.carbon +++ b/toolchain/check/testdata/interop/cpp/basics/import/multiple_imports.carbon @@ -27,7 +27,7 @@ import Cpp library "file1.h"; import Cpp library "file2.h"; //@dump-sem-ir-end -// CHECK:STDOUT: --- multiple_imports.carbon +// CHECK:STDOUT: --- multiple_imports.carbon = $multiple_imports // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: %Cpp.import_cpp = import_cpp { diff --git a/toolchain/check/testdata/interop/cpp/basics/inline/import.carbon b/toolchain/check/testdata/interop/cpp/basics/inline/import.carbon index 2efb42e52936..515a9cd42a12 100644 --- a/toolchain/check/testdata/interop/cpp/basics/inline/import.carbon +++ b/toolchain/check/testdata/interop/cpp/basics/inline/import.carbon @@ -48,7 +48,7 @@ fn Run() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- use_inline_function_decl.carbon +// CHECK:STDOUT: --- use_inline_function_decl.carbon = $use_inline_function_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -82,7 +82,7 @@ fn Run() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- with_language_marker.carbon +// CHECK:STDOUT: --- with_language_marker.carbon = $with_language_marker // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/basics/unsupported_decl_type.carbon b/toolchain/check/testdata/interop/cpp/basics/unsupported_decl_type.carbon index 61a926a67bd0..bed61aebafe9 100644 --- a/toolchain/check/testdata/interop/cpp/basics/unsupported_decl_type.carbon +++ b/toolchain/check/testdata/interop/cpp/basics/unsupported_decl_type.carbon @@ -40,7 +40,7 @@ fn F() -> i32 { //@dump-sem-ir-end } -// CHECK:STDOUT: --- fail_todo_use_structured_binding.carbon +// CHECK:STDOUT: --- fail_todo_use_structured_binding.carbon = $fail_todo_use_structured_binding // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/class/import/abstract.carbon b/toolchain/check/testdata/interop/cpp/class/import/abstract.carbon index f5a2f0d659b0..bc318e4e56b2 100644 --- a/toolchain/check/testdata/interop/cpp/class/import/abstract.carbon +++ b/toolchain/check/testdata/interop/cpp/class/import/abstract.carbon @@ -108,7 +108,7 @@ fn F() -> Cpp.AbstractFinal { } //@dump-sem-ir-end -// CHECK:STDOUT: --- use_abstract_final.carbon +// CHECK:STDOUT: --- use_abstract_final.carbon = $use_abstract_final // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/class/import/access.carbon b/toolchain/check/testdata/interop/cpp/class/import/access.carbon index 90437dadd478..a70ff4addae5 100644 --- a/toolchain/check/testdata/interop/cpp/class/import/access.carbon +++ b/toolchain/check/testdata/interop/cpp/class/import/access.carbon @@ -2195,7 +2195,7 @@ int G() { } '''; -// CHECK:STDOUT: --- import_non_function_member_public.carbon +// CHECK:STDOUT: --- import_non_function_member_public.carbon = $import_non_function_member_public // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2245,7 +2245,7 @@ int G() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_non_function_member_public_extend.carbon +// CHECK:STDOUT: --- import_non_function_member_public_extend.carbon = $import_non_function_member_public_extend // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2292,7 +2292,7 @@ int G() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_non_function_member_protected_extend_call_in_member.carbon +// CHECK:STDOUT: --- import_non_function_member_protected_extend_call_in_member.carbon = $import_non_function_member_protected_extend_call_in_member // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2376,7 +2376,7 @@ int G() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_function_member_public.carbon +// CHECK:STDOUT: --- import_function_member_public.carbon = $import_function_member_public // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2423,7 +2423,7 @@ int G() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_import_function_member_protected_extend_call_instance_in_member.carbon +// CHECK:STDOUT: --- fail_todo_import_function_member_protected_extend_call_instance_in_member.carbon = $fail_todo_import_function_member_protected_extend_call_instance_in_member // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2456,7 +2456,7 @@ int G() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_function_member_protected_extend_call_static_in_member.carbon +// CHECK:STDOUT: --- import_function_member_protected_extend_call_static_in_member.carbon = $import_function_member_protected_extend_call_static_in_member // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2506,7 +2506,7 @@ int G() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_overload_set_public.carbon +// CHECK:STDOUT: --- import_overload_set_public.carbon = $import_overload_set_public // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2633,7 +2633,7 @@ int G() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_overload_set_protected_base.carbon +// CHECK:STDOUT: --- import_overload_set_protected_base.carbon = $import_overload_set_protected_base // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2865,7 +2865,7 @@ int G() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_overload_set_public_base_class_call_public.carbon +// CHECK:STDOUT: --- import_overload_set_public_base_class_call_public.carbon = $import_overload_set_public_base_class_call_public // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2944,7 +2944,7 @@ int G() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_overload_set_public_base_class_derived_call_non_private.carbon +// CHECK:STDOUT: --- import_overload_set_public_base_class_derived_call_non_private.carbon = $import_overload_set_public_base_class_derived_call_non_private // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -3080,7 +3080,7 @@ int G() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_overload_set_protected_base_class_derived_call_non_private.carbon +// CHECK:STDOUT: --- import_overload_set_protected_base_class_derived_call_non_private.carbon = $import_overload_set_protected_base_class_derived_call_non_private // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -3216,7 +3216,7 @@ int G() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- base_class_public_access_allowed.carbon +// CHECK:STDOUT: --- base_class_public_access_allowed.carbon = $base_class_public_access_allowed // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -3340,7 +3340,7 @@ int G() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_base_class_public_access_denied.carbon +// CHECK:STDOUT: --- fail_base_class_public_access_denied.carbon = $fail_base_class_public_access_denied // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -3369,7 +3369,7 @@ int G() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- base_class_protected_access_allowed.carbon +// CHECK:STDOUT: --- base_class_protected_access_allowed.carbon = $base_class_protected_access_allowed // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -3469,7 +3469,7 @@ int G() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- base_class_public_protected_access_allowed.carbon +// CHECK:STDOUT: --- base_class_public_protected_access_allowed.carbon = $base_class_public_protected_access_allowed // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/class/import/base.carbon b/toolchain/check/testdata/interop/cpp/class/import/base.carbon index aa765e5dc209..4152f454dd05 100644 --- a/toolchain/check/testdata/interop/cpp/class/import/base.carbon +++ b/toolchain/check/testdata/interop/cpp/class/import/base.carbon @@ -546,7 +546,7 @@ class V { extend base: Cpp.U; } -// CHECK:STDOUT: --- use_derived_to_base_conversion.carbon +// CHECK:STDOUT: --- use_derived_to_base_conversion.carbon = $use_derived_to_base_conversion // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -656,7 +656,7 @@ class V { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_static_member.carbon +// CHECK:STDOUT: --- use_static_member.carbon = $use_static_member // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -707,7 +707,7 @@ class V { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_base_field.carbon +// CHECK:STDOUT: --- use_base_field.carbon = $use_base_field // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -775,7 +775,7 @@ class V { // CHECK:STDOUT: return %Int.as.Copy.impl.Op.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_base_method.carbon +// CHECK:STDOUT: --- use_base_method.carbon = $use_base_method // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/class/import/class.carbon b/toolchain/check/testdata/interop/cpp/class/import/class.carbon index 6e63c687ed49..b20e583344f3 100644 --- a/toolchain/check/testdata/interop/cpp/class/import/class.carbon +++ b/toolchain/check/testdata/interop/cpp/class/import/class.carbon @@ -267,7 +267,7 @@ class Generic(x: Core.Copy) { fn GenericUse(p2: Generic(Cpp.Class1)) { } -// CHECK:STDOUT: --- import_declaration.carbon +// CHECK:STDOUT: --- import_declaration.carbon = $import_declaration // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -305,7 +305,7 @@ fn GenericUse(p2: Generic(Cpp.Class1)) { // CHECK:STDOUT: // CHECK:STDOUT: fn @MyF(%bar.param: %ptr); // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition.carbon +// CHECK:STDOUT: --- import_definition.carbon = $import_definition // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -343,7 +343,7 @@ fn GenericUse(p2: Generic(Cpp.Class1)) { // CHECK:STDOUT: // CHECK:STDOUT: fn @MyF(%bar.param: %ptr); // CHECK:STDOUT: -// CHECK:STDOUT: --- import_declaration_and_definition.carbon +// CHECK:STDOUT: --- import_declaration_and_definition.carbon = $import_declaration_and_definition // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -381,7 +381,7 @@ fn GenericUse(p2: Generic(Cpp.Class1)) { // CHECK:STDOUT: // CHECK:STDOUT: fn @MyF(%bar.param: %ptr); // CHECK:STDOUT: -// CHECK:STDOUT: --- import_static_member_function.carbon +// CHECK:STDOUT: --- import_static_member_function.carbon = $import_static_member_function // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -412,7 +412,7 @@ fn GenericUse(p2: Generic(Cpp.Class1)) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_static_data_member.carbon +// CHECK:STDOUT: --- import_static_data_member.carbon = $import_static_data_member // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -453,7 +453,7 @@ fn GenericUse(p2: Generic(Cpp.Class1)) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_data_member.carbon +// CHECK:STDOUT: --- import_data_member.carbon = $import_data_member // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -510,7 +510,7 @@ fn GenericUse(p2: Generic(Cpp.Class1)) { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- call_dynamic.carbon +// CHECK:STDOUT: --- call_dynamic.carbon = $call_dynamic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -573,7 +573,7 @@ fn GenericUse(p2: Generic(Cpp.Class1)) { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_to_inherit_public.carbon +// CHECK:STDOUT: --- import_to_inherit_public.carbon = $import_to_inherit_public // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -628,7 +628,7 @@ fn GenericUse(p2: Generic(Cpp.Class1)) { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_template.carbon +// CHECK:STDOUT: --- import_template.carbon = $import_template // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/class/import/constructor.carbon b/toolchain/check/testdata/interop/cpp/class/import/constructor.carbon index 3fb25ef66b41..df6b67aa7ab0 100644 --- a/toolchain/check/testdata/interop/cpp/class/import/constructor.carbon +++ b/toolchain/check/testdata/interop/cpp/class/import/constructor.carbon @@ -329,7 +329,7 @@ fn F() { Cpp.IncompleteC.IncompleteC(); } -// CHECK:STDOUT: --- import_default.carbon +// CHECK:STDOUT: --- import_default.carbon = $import_default // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -399,7 +399,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- implicit_default.carbon +// CHECK:STDOUT: --- implicit_default.carbon = $implicit_default // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -473,7 +473,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_non_default.carbon +// CHECK:STDOUT: --- import_non_default.carbon = $import_non_default // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -582,7 +582,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_multiple.carbon +// CHECK:STDOUT: --- import_multiple.carbon = $import_multiple // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -722,7 +722,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_default_arguments.carbon +// CHECK:STDOUT: --- import_default_arguments.carbon = $import_default_arguments // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -870,7 +870,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_template.carbon +// CHECK:STDOUT: --- import_template.carbon = $import_template // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1072,7 +1072,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc9(%self.param: ref bool) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- import_implicit_single_argument.carbon +// CHECK:STDOUT: --- import_implicit_single_argument.carbon = $import_implicit_single_argument // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1214,7 +1214,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_implicit_multi_arguments.carbon +// CHECK:STDOUT: --- import_implicit_multi_arguments.carbon = $import_implicit_multi_arguments // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/class/import/dynamic.carbon b/toolchain/check/testdata/interop/cpp/class/import/dynamic.carbon index ab8eab874743..ee08cbab0c75 100644 --- a/toolchain/check/testdata/interop/cpp/class/import/dynamic.carbon +++ b/toolchain/check/testdata/interop/cpp/class/import/dynamic.carbon @@ -62,7 +62,7 @@ auto DoThing() -> int { '''; //@dump-sem-ir-end -// CHECK:STDOUT: --- dynamic_base_from_cpp.carbon +// CHECK:STDOUT: --- dynamic_base_from_cpp.carbon = $dynamic_base_from_cpp // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/class/import/field.carbon b/toolchain/check/testdata/interop/cpp/class/import/field.carbon index 0a2ed921a20a..12ddb8e11e46 100644 --- a/toolchain/check/testdata/interop/cpp/class/import/field.carbon +++ b/toolchain/check/testdata/interop/cpp/class/import/field.carbon @@ -217,7 +217,7 @@ fn Test(m: Cpp.UnsupportedMembers*) { let unused a: i32 = m->is_volatile; } -// CHECK:STDOUT: --- use_struct_fields.carbon +// CHECK:STDOUT: --- use_struct_fields.carbon = $use_struct_fields // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -353,7 +353,7 @@ fn Test(m: Cpp.UnsupportedMembers*) { // CHECK:STDOUT: return %.loc8_44 to %return.param // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_union_fields.carbon +// CHECK:STDOUT: --- use_union_fields.carbon = $use_union_fields // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -425,7 +425,7 @@ fn Test(m: Cpp.UnsupportedMembers*) { // CHECK:STDOUT: return %Int.as.Copy.impl.Op.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_non_bitfields_in_type_with_bitfields.carbon +// CHECK:STDOUT: --- use_non_bitfields_in_type_with_bitfields.carbon = $use_non_bitfields_in_type_with_bitfields // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -481,7 +481,7 @@ fn Test(m: Cpp.UnsupportedMembers*) { // CHECK:STDOUT: return %Int.as.Copy.impl.Op.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_use_bitfields.carbon +// CHECK:STDOUT: --- fail_todo_use_bitfields.carbon = $fail_todo_use_bitfields // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/class/import/method.carbon b/toolchain/check/testdata/interop/cpp/class/import/method.carbon index b9fb562e684f..daa380732954 100644 --- a/toolchain/check/testdata/interop/cpp/class/import/method.carbon +++ b/toolchain/check/testdata/interop/cpp/class/import/method.carbon @@ -315,7 +315,7 @@ fn Call(e: Cpp.ExplicitObjectParamOverloaded, n: i32, a: Cpp.AnotherOverloaded) //@dump-sem-ir-end } -// CHECK:STDOUT: --- use_object_param_qualifiers.carbon +// CHECK:STDOUT: --- use_object_param_qualifiers.carbon = $use_object_param_qualifiers // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -556,7 +556,7 @@ fn Call(e: Cpp.ExplicitObjectParamOverloaded, n: i32, a: Cpp.AnotherOverloaded) // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_object_param_qualifiers_overloaded.carbon +// CHECK:STDOUT: --- use_object_param_qualifiers_overloaded.carbon = $use_object_param_qualifiers_overloaded // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -730,7 +730,7 @@ fn Call(e: Cpp.ExplicitObjectParamOverloaded, n: i32, a: Cpp.AnotherOverloaded) // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- call_explicit_object_param.carbon +// CHECK:STDOUT: --- call_explicit_object_param.carbon = $call_explicit_object_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -808,7 +808,7 @@ fn Call(e: Cpp.ExplicitObjectParamOverloaded, n: i32, a: Cpp.AnotherOverloaded) // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- call_explicit_object_param_overloaded.carbon +// CHECK:STDOUT: --- call_explicit_object_param_overloaded.carbon = $call_explicit_object_param_overloaded // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/class/import/struct.carbon b/toolchain/check/testdata/interop/cpp/class/import/struct.carbon index 24a947b6b88b..d6d4fd135180 100644 --- a/toolchain/check/testdata/interop/cpp/class/import/struct.carbon +++ b/toolchain/check/testdata/interop/cpp/class/import/struct.carbon @@ -28,7 +28,7 @@ import Cpp library "declaration.h"; fn MyF(bar: Cpp.Bar*); //@dump-sem-ir-end -// CHECK:STDOUT: --- import_declaration.carbon +// CHECK:STDOUT: --- import_declaration.carbon = $import_declaration // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/class/import/template.carbon b/toolchain/check/testdata/interop/cpp/class/import/template.carbon index d4ee2bb5475f..5ec7f9521b5e 100644 --- a/toolchain/check/testdata/interop/cpp/class/import/template.carbon +++ b/toolchain/check/testdata/interop/cpp/class/import/template.carbon @@ -162,7 +162,7 @@ fn G() { F(i32); } -// CHECK:STDOUT: --- use_class_template.carbon +// CHECK:STDOUT: --- use_class_template.carbon = $use_class_template // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -248,7 +248,7 @@ fn G() { // CHECK:STDOUT: return %ptr.as.Copy.impl.Op.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_use_instantiation_error.carbon +// CHECK:STDOUT: --- fail_use_instantiation_error.carbon = $fail_use_instantiation_error // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -338,7 +338,7 @@ fn G() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_carbon_class_generic_in_cpp_template_param.carbon +// CHECK:STDOUT: --- use_carbon_class_generic_in_cpp_template_param.carbon = $use_carbon_class_generic_in_cpp_template_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -510,7 +510,7 @@ fn G() { // CHECK:STDOUT: %complete_type.loc13_1.2 => constants.%complete_type.12b // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- let_cpp_template_constructor.carbon +// CHECK:STDOUT: --- let_cpp_template_constructor.carbon = $let_cpp_template_constructor // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -705,7 +705,7 @@ fn G() { // CHECK:STDOUT: %.loc10_39.8 => // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- var_cpp_template_constructor.carbon +// CHECK:STDOUT: --- var_cpp_template_constructor.carbon = $var_cpp_template_constructor // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/class/import/union.carbon b/toolchain/check/testdata/interop/cpp/class/import/union.carbon index d43da338ccbc..abe75e2a7a92 100644 --- a/toolchain/check/testdata/interop/cpp/class/import/union.carbon +++ b/toolchain/check/testdata/interop/cpp/class/import/union.carbon @@ -179,7 +179,7 @@ import Cpp library "template.h"; fn MyF(bar: Cpp.TemplateBar(Cpp.X)*); //@dump-sem-ir-end -// CHECK:STDOUT: --- import_declaration.carbon +// CHECK:STDOUT: --- import_declaration.carbon = $import_declaration // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -217,7 +217,7 @@ fn MyF(bar: Cpp.TemplateBar(Cpp.X)*); // CHECK:STDOUT: // CHECK:STDOUT: fn @MyF(%bar.param: %ptr); // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition.carbon +// CHECK:STDOUT: --- import_definition.carbon = $import_definition // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -255,7 +255,7 @@ fn MyF(bar: Cpp.TemplateBar(Cpp.X)*); // CHECK:STDOUT: // CHECK:STDOUT: fn @MyF(%bar.param: %ptr); // CHECK:STDOUT: -// CHECK:STDOUT: --- import_declaration_and_definition.carbon +// CHECK:STDOUT: --- import_declaration_and_definition.carbon = $import_declaration_and_definition // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -293,7 +293,7 @@ fn MyF(bar: Cpp.TemplateBar(Cpp.X)*); // CHECK:STDOUT: // CHECK:STDOUT: fn @MyF(%bar.param: %ptr); // CHECK:STDOUT: -// CHECK:STDOUT: --- import_static_member_function.carbon +// CHECK:STDOUT: --- import_static_member_function.carbon = $import_static_member_function // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -324,7 +324,7 @@ fn MyF(bar: Cpp.TemplateBar(Cpp.X)*); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_static_data_member.carbon +// CHECK:STDOUT: --- import_static_data_member.carbon = $import_static_data_member // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -365,7 +365,7 @@ fn MyF(bar: Cpp.TemplateBar(Cpp.X)*); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_data_member.carbon +// CHECK:STDOUT: --- import_data_member.carbon = $import_data_member // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -422,7 +422,7 @@ fn MyF(bar: Cpp.TemplateBar(Cpp.X)*); // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_template.carbon +// CHECK:STDOUT: --- import_template.carbon = $import_template // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/enum/anonymous.carbon b/toolchain/check/testdata/interop/cpp/enum/anonymous.carbon index 409f1be9f7ca..e9f0bcd34e74 100644 --- a/toolchain/check/testdata/interop/cpp/enum/anonymous.carbon +++ b/toolchain/check/testdata/interop/cpp/enum/anonymous.carbon @@ -37,7 +37,7 @@ fn G() { } //@dump-sem-ir-end -// CHECK:STDOUT: --- copy_enum.carbon +// CHECK:STDOUT: --- copy_enum.carbon = $copy_enum // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/enum/convert.carbon b/toolchain/check/testdata/interop/cpp/enum/convert.carbon index 7a6eaf0bef09..25d759629a7a 100644 --- a/toolchain/check/testdata/interop/cpp/enum/convert.carbon +++ b/toolchain/check/testdata/interop/cpp/enum/convert.carbon @@ -97,7 +97,7 @@ fn F() { Cpp.a as Cpp.DifferentSize; } -// CHECK:STDOUT: --- convert_enum.carbon +// CHECK:STDOUT: --- convert_enum.carbon = $convert_enum // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/enum/copy.carbon b/toolchain/check/testdata/interop/cpp/enum/copy.carbon index ec1849dd52df..82ba602e4355 100644 --- a/toolchain/check/testdata/interop/cpp/enum/copy.carbon +++ b/toolchain/check/testdata/interop/cpp/enum/copy.carbon @@ -28,7 +28,7 @@ fn F() { } //@dump-sem-ir-end -// CHECK:STDOUT: --- copy_enum.carbon +// CHECK:STDOUT: --- copy_enum.carbon = $copy_enum // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/enum/fixed.carbon b/toolchain/check/testdata/interop/cpp/enum/fixed.carbon index e8d09c777e83..5ab257389473 100644 --- a/toolchain/check/testdata/interop/cpp/enum/fixed.carbon +++ b/toolchain/check/testdata/interop/cpp/enum/fixed.carbon @@ -27,7 +27,7 @@ fn F() { } //@dump-sem-ir-end -// CHECK:STDOUT: --- import_enum.carbon +// CHECK:STDOUT: --- import_enum.carbon = $import_enum // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/enum/incomplete.carbon b/toolchain/check/testdata/interop/cpp/enum/incomplete.carbon index 197b77b39cd7..585375c39fc6 100644 --- a/toolchain/check/testdata/interop/cpp/enum/incomplete.carbon +++ b/toolchain/check/testdata/interop/cpp/enum/incomplete.carbon @@ -69,7 +69,7 @@ fn MyF() { var unused e: Cpp.UnsizedEnum; } -// CHECK:STDOUT: --- import_declaration.carbon +// CHECK:STDOUT: --- import_declaration.carbon = $import_declaration // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/enum/member.carbon b/toolchain/check/testdata/interop/cpp/enum/member.carbon index 1ac86f29fc54..cdba06b19e9c 100644 --- a/toolchain/check/testdata/interop/cpp/enum/member.carbon +++ b/toolchain/check/testdata/interop/cpp/enum/member.carbon @@ -30,7 +30,7 @@ fn F() { } //@dump-sem-ir-end -// CHECK:STDOUT: --- import_enum_member.carbon +// CHECK:STDOUT: --- import_enum_member.carbon = $import_enum_member // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/enum/scoped.carbon b/toolchain/check/testdata/interop/cpp/enum/scoped.carbon index 56c227bf9bc2..8e91337229c8 100644 --- a/toolchain/check/testdata/interop/cpp/enum/scoped.carbon +++ b/toolchain/check/testdata/interop/cpp/enum/scoped.carbon @@ -43,7 +43,7 @@ fn F() { let unused b: Cpp.Enum = Cpp.b; } -// CHECK:STDOUT: --- import_enum.carbon +// CHECK:STDOUT: --- import_enum.carbon = $import_enum // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/enum/unscoped.carbon b/toolchain/check/testdata/interop/cpp/enum/unscoped.carbon index e0bf6c466412..dcda56d76488 100644 --- a/toolchain/check/testdata/interop/cpp/enum/unscoped.carbon +++ b/toolchain/check/testdata/interop/cpp/enum/unscoped.carbon @@ -80,7 +80,7 @@ fn F() { let unused c: Cpp.Other = Cpp.Enum.d; } -// CHECK:STDOUT: --- import_enum.carbon +// CHECK:STDOUT: --- import_enum.carbon = $import_enum // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/enum/using.carbon b/toolchain/check/testdata/interop/cpp/enum/using.carbon index 1e16cbb8a67d..0f44959033bf 100644 --- a/toolchain/check/testdata/interop/cpp/enum/using.carbon +++ b/toolchain/check/testdata/interop/cpp/enum/using.carbon @@ -55,7 +55,7 @@ fn F() { } //@dump-sem-ir-end -// CHECK:STDOUT: --- import_enum.carbon +// CHECK:STDOUT: --- import_enum.carbon = $import_enum // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/function/export/generic.carbon b/toolchain/check/testdata/interop/cpp/function/export/generic.carbon index 64bafc2099e4..9200206035ef 100644 --- a/toolchain/check/testdata/interop/cpp/function/export/generic.carbon +++ b/toolchain/check/testdata/interop/cpp/function/export/generic.carbon @@ -185,7 +185,7 @@ void CallUnsupportedF() { } '''; -// CHECK:STDOUT: --- generic_facet.carbon +// CHECK:STDOUT: --- generic_facet.carbon = $generic_facet // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -528,7 +528,7 @@ void CallUnsupportedF() { // CHECK:STDOUT: %C.val => constants.%C.val.b0d // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- generic_type_impls_interface.carbon +// CHECK:STDOUT: --- generic_type_impls_interface.carbon = $generic_type_impls_interface // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 6a00cfb6606b..50f26cabfb2f 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 @@ -581,7 +581,7 @@ fn F() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- import_bool_param_true.carbon +// CHECK:STDOUT: --- import_bool_param_true.carbon = $import_bool_param_true // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -655,7 +655,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8(%self.param: ref bool) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- import_bool_param_false.carbon +// CHECK:STDOUT: --- import_bool_param_false.carbon = $import_bool_param_false // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -729,7 +729,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8(%self.param: ref bool) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- import_signed_char_param.carbon +// CHECK:STDOUT: --- import_signed_char_param.carbon = $import_signed_char_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -852,7 +852,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8(%self.param: ref %i8) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- import_unsigned_char_param.carbon +// CHECK:STDOUT: --- import_unsigned_char_param.carbon = $import_unsigned_char_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -958,7 +958,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8(%self.param: ref %u8) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- import_char_param.carbon +// CHECK:STDOUT: --- import_char_param.carbon = $import_char_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1053,7 +1053,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8_11.2(%self.param: ref %char) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_import_wchar_t_param.carbon +// CHECK:STDOUT: --- fail_todo_import_wchar_t_param.carbon = $fail_todo_import_wchar_t_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1078,7 +1078,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_import_char8_t_param.carbon +// CHECK:STDOUT: --- fail_todo_import_char8_t_param.carbon = $fail_todo_import_char8_t_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1137,7 +1137,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_import_char16_t_param.carbon +// CHECK:STDOUT: --- fail_todo_import_char16_t_param.carbon = $fail_todo_import_char16_t_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1162,7 +1162,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_import_char32_t_param.carbon +// CHECK:STDOUT: --- fail_todo_import_char32_t_param.carbon = $fail_todo_import_char32_t_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1187,7 +1187,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_short_param.carbon +// CHECK:STDOUT: --- import_short_param.carbon = $import_short_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1294,7 +1294,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8(%self.param: ref %i16) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- import_short_param_max.carbon +// CHECK:STDOUT: --- import_short_param_max.carbon = $import_short_param_max // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1400,7 +1400,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8(%self.param: ref %i16) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- import_short_param_min.carbon +// CHECK:STDOUT: --- import_short_param_min.carbon = $import_short_param_min // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1523,7 +1523,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8(%self.param: ref %i16) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- import_short_int_param.carbon +// CHECK:STDOUT: --- import_short_int_param.carbon = $import_short_int_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1630,7 +1630,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8(%self.param: ref %i16) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- import_signed_short_param.carbon +// CHECK:STDOUT: --- import_signed_short_param.carbon = $import_signed_short_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1737,7 +1737,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8(%self.param: ref %i16) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- import_signed_short_int_param.carbon +// CHECK:STDOUT: --- import_signed_short_int_param.carbon = $import_signed_short_int_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1844,7 +1844,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8(%self.param: ref %i16) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- import_int16_t_param.carbon +// CHECK:STDOUT: --- import_int16_t_param.carbon = $import_int16_t_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1951,7 +1951,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8(%self.param: ref %i16) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- import_float16_param.carbon +// CHECK:STDOUT: --- import_float16_param.carbon = $import_float16_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2057,7 +2057,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8(%self.param: ref %f16.727) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- import_float_param.carbon +// CHECK:STDOUT: --- import_float_param.carbon = $import_float_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2163,7 +2163,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8(%self.param: ref %f32.3bc) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- import_double_param.carbon +// CHECK:STDOUT: --- import_double_param.carbon = $import_double_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2269,7 +2269,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8(%self.param: ref %f64.761) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- import_float128_param.carbon +// CHECK:STDOUT: --- import_float128_param.carbon = $import_float128_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2375,7 +2375,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8(%self.param: ref %f128.72e) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- import_bool_return.carbon +// CHECK:STDOUT: --- import_bool_return.carbon = $import_bool_return // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2441,7 +2441,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8(%self.param: ref bool) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- import_short_return.carbon +// CHECK:STDOUT: --- import_short_return.carbon = $import_short_return // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2509,7 +2509,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8(%self.param: ref %i16) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_import_bit_int_24_param.carbon +// CHECK:STDOUT: --- fail_todo_import_bit_int_24_param.carbon = $fail_todo_import_bit_int_24_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2534,7 +2534,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_double_return.carbon +// CHECK:STDOUT: --- import_double_return.carbon = $import_double_return // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/function/import/arithmetic_types_direct.carbon b/toolchain/check/testdata/interop/cpp/function/import/arithmetic_types_direct.carbon index e83b45850632..7be2533e1cce 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/arithmetic_types_direct.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/arithmetic_types_direct.carbon @@ -335,7 +335,7 @@ fn F() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- import_int_param.carbon +// CHECK:STDOUT: --- import_int_param.carbon = $import_int_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -394,7 +394,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_int_param_max.carbon +// CHECK:STDOUT: --- import_int_param_max.carbon = $import_int_param_max // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -453,7 +453,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_int_param_min.carbon +// CHECK:STDOUT: --- import_int_param_min.carbon = $import_int_param_min // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -529,7 +529,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_signed_int_param.carbon +// CHECK:STDOUT: --- import_signed_int_param.carbon = $import_signed_int_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -588,7 +588,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_signed_param.carbon +// CHECK:STDOUT: --- import_signed_param.carbon = $import_signed_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -647,7 +647,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_unsigned_int_param.carbon +// CHECK:STDOUT: --- import_unsigned_int_param.carbon = $import_unsigned_int_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -706,7 +706,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_int32_t_param.carbon +// CHECK:STDOUT: --- import_int32_t_param.carbon = $import_int32_t_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -765,7 +765,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_int_params.carbon +// CHECK:STDOUT: --- import_int_params.carbon = $import_int_params // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -836,7 +836,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_multiple_int_params.carbon +// CHECK:STDOUT: --- import_multiple_int_params.carbon = $import_multiple_int_params // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -945,7 +945,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_unnamed_int_param.carbon +// CHECK:STDOUT: --- import_unnamed_int_param.carbon = $import_unnamed_int_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1004,7 +1004,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_int_return.carbon +// CHECK:STDOUT: --- import_int_return.carbon = $import_int_return // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1044,7 +1044,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_long_param.carbon +// CHECK:STDOUT: --- import_long_param.carbon = $import_long_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/function/import/class.carbon b/toolchain/check/testdata/interop/cpp/function/import/class.carbon index 6bfd902fa21a..33e78d8f2552 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/class.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/class.carbon @@ -662,7 +662,7 @@ fn F() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- import_definition_no_data_members_value_param_type.carbon +// CHECK:STDOUT: --- import_definition_no_data_members_value_param_type.carbon = $import_definition_no_data_members_value_param_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -701,7 +701,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_import_non_copyable_param_type.carbon +// CHECK:STDOUT: --- fail_import_non_copyable_param_type.carbon = $fail_import_non_copyable_param_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -737,7 +737,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- pass_move_only_param_temporary.carbon +// CHECK:STDOUT: --- pass_move_only_param_temporary.carbon = $pass_move_only_param_temporary // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -790,7 +790,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition_single_data_member_value_param_type.carbon +// CHECK:STDOUT: --- import_definition_single_data_member_value_param_type.carbon = $import_definition_single_data_member_value_param_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -829,7 +829,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition_multiple_data_members_value_param_type.carbon +// CHECK:STDOUT: --- import_definition_multiple_data_members_value_param_type.carbon = $import_definition_multiple_data_members_value_param_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -868,7 +868,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition_in_namespace_value_param_type.carbon +// CHECK:STDOUT: --- import_definition_in_namespace_value_param_type.carbon = $import_definition_in_namespace_value_param_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -965,7 +965,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition_in_relative_namespace_value_param_type.carbon +// CHECK:STDOUT: --- import_definition_in_relative_namespace_value_param_type.carbon = $import_definition_in_relative_namespace_value_param_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1013,7 +1013,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition_in_outer_definition.carbon +// CHECK:STDOUT: --- import_definition_in_outer_definition.carbon = $import_definition_in_outer_definition // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1106,7 +1106,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition_and_static_method_call_before.carbon +// CHECK:STDOUT: --- import_definition_and_static_method_call_before.carbon = $import_definition_and_static_method_call_before // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1155,7 +1155,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition_and_static_method_call_after.carbon +// CHECK:STDOUT: --- import_definition_and_static_method_call_after.carbon = $import_definition_and_static_method_call_after // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1204,7 +1204,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_decl_pointer_param_type.carbon +// CHECK:STDOUT: --- import_decl_pointer_param_type.carbon = $import_decl_pointer_param_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1241,7 +1241,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition_pointer_param_type.carbon +// CHECK:STDOUT: --- import_definition_pointer_param_type.carbon = $import_definition_pointer_param_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1278,7 +1278,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition_value_return_type.carbon +// CHECK:STDOUT: --- import_definition_value_return_type.carbon = $import_definition_value_return_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1335,7 +1335,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_decl_pointer_return_type.carbon +// CHECK:STDOUT: --- import_decl_pointer_return_type.carbon = $import_decl_pointer_return_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1368,7 +1368,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition_pointer_return_type.carbon +// CHECK:STDOUT: --- import_definition_pointer_return_type.carbon = $import_definition_pointer_return_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/function/import/constexpr.carbon b/toolchain/check/testdata/interop/cpp/function/import/constexpr.carbon index 4b28740d95bb..15b7876451db 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/constexpr.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/constexpr.carbon @@ -173,7 +173,7 @@ eval fn F() -> i32 { let a: array(i32, F()) = (1, 2, 3); -// CHECK:STDOUT: --- fail_todo_constructor.carbon +// CHECK:STDOUT: --- fail_todo_constructor.carbon = $fail_todo_constructor // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 8a0561ea7581..9b8e0d48287b 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/decayed_param.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/decayed_param.carbon @@ -95,7 +95,7 @@ fn F() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- call_params.carbon +// CHECK:STDOUT: --- call_params.carbon = $call_params // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -748,7 +748,7 @@ fn F() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_call_params_2.carbon +// CHECK:STDOUT: --- fail_todo_call_params_2.carbon = $fail_todo_call_params_2 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 d493be337a16..b9ee2040255a 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/default_arg.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/default_arg.carbon @@ -176,7 +176,7 @@ fn Call() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- call_without_default.carbon +// CHECK:STDOUT: --- call_without_default.carbon = $call_without_default // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -467,7 +467,7 @@ fn Call() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- call_with_default.carbon +// CHECK:STDOUT: --- call_with_default.carbon = $call_with_default // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -935,7 +935,7 @@ fn Call() { // CHECK:STDOUT: // CHECK:STDOUT: fn @D__carbon_thunk(%_.param: %ptr.ca1, %a.param: %i32); // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_call_too_few_args.carbon +// CHECK:STDOUT: --- fail_call_too_few_args.carbon = $fail_call_too_few_args // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/function/import/extern_c.carbon b/toolchain/check/testdata/interop/cpp/function/import/extern_c.carbon index 6304037277ec..7f2b0b1166de 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/extern_c.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/extern_c.carbon @@ -69,7 +69,7 @@ fn MyF(a: Cpp.X, b: Cpp.X) -> Cpp.X { //@dump-sem-ir-end } -// CHECK:STDOUT: --- extern_c_function.carbon +// CHECK:STDOUT: --- extern_c_function.carbon = $extern_c_function // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -97,7 +97,7 @@ fn MyF(a: Cpp.X, b: Cpp.X) -> Cpp.X { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- extern_c_function_with_cpp_overload_set.carbon +// CHECK:STDOUT: --- extern_c_function_with_cpp_overload_set.carbon = $extern_c_function_with_cpp_overload_set // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -162,7 +162,7 @@ fn MyF(a: Cpp.X, b: Cpp.X) -> Cpp.X { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- extern_c_variable.carbon +// CHECK:STDOUT: --- extern_c_variable.carbon = $extern_c_variable // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -210,7 +210,7 @@ fn MyF(a: Cpp.X, b: Cpp.X) -> Cpp.X { // CHECK:STDOUT: return %Int.as.Copy.impl.Op.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- extern_c_with_special_name.carbon +// CHECK:STDOUT: --- extern_c_with_special_name.carbon = $extern_c_with_special_name // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 908af33d8f3f..2565f9e2bfa9 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/full_semir.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/full_semir.carbon @@ -65,7 +65,7 @@ fn F() { let unused x: i16 = Cpp.foo_short(); } -// CHECK:STDOUT: --- import_short_param.carbon +// CHECK:STDOUT: --- import_short_param.carbon = $import_short_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -220,7 +220,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc7(%self.param: ref %i16) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- import_int_param.carbon +// CHECK:STDOUT: --- import_int_param.carbon = $import_int_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -318,7 +318,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @foo(%a.param: %i32); // CHECK:STDOUT: -// CHECK:STDOUT: --- import_short_return.carbon +// CHECK:STDOUT: --- import_short_return.carbon = $import_short_return // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/function/import/function.carbon b/toolchain/check/testdata/interop/cpp/function/import/function.carbon index bf997e6066a3..9b51b1195db4 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/function.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/function.carbon @@ -220,7 +220,7 @@ fn G() -> i32 { // TODO: Add a test per unsupported return type. See https://github.com/carbon-language/carbon-lang/pull/5477/files/4321e21ed27d987fd71be182d292973fd9849df8#r2094655176 -// CHECK:STDOUT: --- import_global.carbon +// CHECK:STDOUT: --- import_global.carbon = $import_global // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -248,7 +248,7 @@ fn G() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_special_name_call_escaped.carbon +// CHECK:STDOUT: --- import_special_name_call_escaped.carbon = $import_special_name_call_escaped // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -276,7 +276,7 @@ fn G() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_overloaded.carbon +// CHECK:STDOUT: --- import_overloaded.carbon = $import_overloaded // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -304,7 +304,7 @@ fn G() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_import_variadic.carbon +// CHECK:STDOUT: --- fail_todo_import_variadic.carbon = $fail_todo_import_variadic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -329,7 +329,7 @@ fn G() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- todo_fail_import_static.carbon +// CHECK:STDOUT: --- todo_fail_import_static.carbon = $todo_fail_import_static // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -357,7 +357,7 @@ fn G() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_template_function.carbon +// CHECK:STDOUT: --- import_template_function.carbon = $import_template_function // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/function/import/function_ptr.carbon b/toolchain/check/testdata/interop/cpp/function/import/function_ptr.carbon index 8e038b0c8982..9bc606627615 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/function_ptr.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/function_ptr.carbon @@ -245,7 +245,7 @@ fn F() { var unused fn_ptr: Cpp.CallbackType = C.MyCallback; } -// CHECK:STDOUT: --- relay_fn_ptr.carbon +// CHECK:STDOUT: --- relay_fn_ptr.carbon = $relay_fn_ptr // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -294,7 +294,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- convert_fn_ptr.carbon +// CHECK:STDOUT: --- convert_fn_ptr.carbon = $convert_fn_ptr // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -379,7 +379,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc9(%self.param: ref %.659) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- pass_fn_ptr.carbon +// CHECK:STDOUT: --- pass_fn_ptr.carbon = $pass_fn_ptr // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -418,7 +418,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- call_fn_ptr.carbon +// CHECK:STDOUT: --- call_fn_ptr.carbon = $call_fn_ptr // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -560,7 +560,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc7_3(%self.param: ref %i32) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- relay_complex_fn_ptr.carbon +// CHECK:STDOUT: --- relay_complex_fn_ptr.carbon = $relay_complex_fn_ptr // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -609,7 +609,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- convert_complex_fn_ptr.carbon +// CHECK:STDOUT: --- convert_complex_fn_ptr.carbon = $convert_complex_fn_ptr // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -695,7 +695,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc9(%self.param: ref %.659) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- pass_complex_fn_ptr.carbon +// CHECK:STDOUT: --- pass_complex_fn_ptr.carbon = $pass_complex_fn_ptr // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -737,7 +737,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- call_complex_fn_ptr.carbon +// CHECK:STDOUT: --- call_complex_fn_ptr.carbon = $call_complex_fn_ptr // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -847,7 +847,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- mention_forward_decl.carbon +// CHECK:STDOUT: --- mention_forward_decl.carbon = $mention_forward_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/function/import/in_template.carbon b/toolchain/check/testdata/interop/cpp/function/import/in_template.carbon index 8174de83aa1e..db9db681e0cc 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/in_template.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/in_template.carbon @@ -33,7 +33,7 @@ fn F() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- use_class_template.carbon +// CHECK:STDOUT: --- use_class_template.carbon = $use_class_template // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/function/import/inline.carbon b/toolchain/check/testdata/interop/cpp/function/import/inline.carbon index 8b9d8990babe..6d36557b17f6 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/inline.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/inline.carbon @@ -90,7 +90,7 @@ fn MyF() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- import_with_definition.carbon +// CHECK:STDOUT: --- import_with_definition.carbon = $import_with_definition // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -118,7 +118,7 @@ fn MyF() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- todo_fail_import_without_definition.carbon +// CHECK:STDOUT: --- todo_fail_import_without_definition.carbon = $todo_fail_import_without_definition // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -149,7 +149,7 @@ fn MyF() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- automatic_return_type.carbon +// CHECK:STDOUT: --- automatic_return_type.carbon = $automatic_return_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/function/import/method_ptr.carbon b/toolchain/check/testdata/interop/cpp/function/import/method_ptr.carbon index 24319b28d172..09f350714d51 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/method_ptr.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/method_ptr.carbon @@ -204,7 +204,7 @@ fn G() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- relay_method_ptr.carbon +// CHECK:STDOUT: --- relay_method_ptr.carbon = $relay_method_ptr // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -298,7 +298,7 @@ fn G() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc7(%self.param: ref %.659) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- convert_method_ptr.carbon +// CHECK:STDOUT: --- convert_method_ptr.carbon = $convert_method_ptr // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -380,7 +380,7 @@ fn G() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc15(%self.param: ref %.659) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- pass_method_ptr.carbon +// CHECK:STDOUT: --- pass_method_ptr.carbon = $pass_method_ptr // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -460,7 +460,7 @@ fn G() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc11(%self.param: ref %.659) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_type_mismatch.carbon +// CHECK:STDOUT: --- fail_type_mismatch.carbon = $fail_type_mismatch // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/function/import/multiple_too_few_args_calls.carbon b/toolchain/check/testdata/interop/cpp/function/import/multiple_too_few_args_calls.carbon index 91a8c20fd2d8..e5d396c5d242 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/multiple_too_few_args_calls.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/multiple_too_few_args_calls.carbon @@ -51,7 +51,7 @@ fn Call() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- fail_call_too_few_args.carbon +// CHECK:STDOUT: --- fail_call_too_few_args.carbon = $fail_call_too_few_args // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/function/import/param_unsupported.carbon b/toolchain/check/testdata/interop/cpp/function/import/param_unsupported.carbon index 4ddaf74e25f0..bb79b186680f 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/param_unsupported.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/param_unsupported.carbon @@ -115,7 +115,7 @@ fn F(x: i8388608) { Cpp.foo(x); } -// CHECK:STDOUT: --- fail_todo_import_unsupported_primitive_type.carbon +// CHECK:STDOUT: --- fail_todo_import_unsupported_primitive_type.carbon = $fail_todo_import_unsupported_primitive_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -140,7 +140,7 @@ fn F(x: i8388608) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_import_unsupported_primitive_type_among_params.carbon +// CHECK:STDOUT: --- fail_todo_import_unsupported_primitive_type_among_params.carbon = $fail_todo_import_unsupported_primitive_type_among_params // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/function/import/pointer.carbon b/toolchain/check/testdata/interop/cpp/function/import/pointer.carbon index 152bbb19c888..c48bb525ed3e 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/pointer.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/pointer.carbon @@ -442,7 +442,7 @@ fn F() { let unused a: Cpp.DeducedPointerS* = Cpp.Indirect({} as Cpp.DeducedPointerS); } -// CHECK:STDOUT: --- import_non_nullable_pointer_param.carbon +// CHECK:STDOUT: --- import_non_nullable_pointer_param.carbon = $import_non_nullable_pointer_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -519,7 +519,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_non_nullable_pointer_param_using_const_pointer.carbon +// CHECK:STDOUT: --- import_non_nullable_pointer_param_using_const_pointer.carbon = $import_non_nullable_pointer_param_using_const_pointer // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -601,7 +601,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc10(%self.param: ref %const) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- import_double_non_nullable_pointer_param.carbon +// CHECK:STDOUT: --- import_double_non_nullable_pointer_param.carbon = $import_double_non_nullable_pointer_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -728,7 +728,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc9(%self.param: ref %ptr.40d) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- import_non_nullable_pointer_to_const_param_using_const.carbon +// CHECK:STDOUT: --- import_non_nullable_pointer_to_const_param_using_const.carbon = $import_non_nullable_pointer_to_const_param_using_const // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -811,7 +811,7 @@ fn F() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_non_nullable_pointer_to_const_param_using_non_const.carbon +// CHECK:STDOUT: --- import_non_nullable_pointer_to_const_param_using_non_const.carbon = $import_non_nullable_pointer_to_const_param_using_non_const // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -891,7 +891,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_const_non_nullable_pointer_param_using_const.carbon +// CHECK:STDOUT: --- import_const_non_nullable_pointer_param_using_const.carbon = $import_const_non_nullable_pointer_param_using_const // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -973,7 +973,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc10(%self.param: ref %const) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- import_const_non_nullable_pointer_param_using_non_const.carbon +// CHECK:STDOUT: --- import_const_non_nullable_pointer_param_using_non_const.carbon = $import_const_non_nullable_pointer_param_using_non_const // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1051,7 +1051,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc10(%self.param: ref %ptr) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- import_const_nullable_pointer_param_using_const.carbon +// CHECK:STDOUT: --- import_const_nullable_pointer_param_using_const.carbon = $import_const_nullable_pointer_param_using_const // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1221,7 +1221,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc10(%self.param: ref %const.2f4) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- import_const_nullable_pointer_param_using_non_const.carbon +// CHECK:STDOUT: --- import_const_nullable_pointer_param_using_non_const.carbon = $import_const_nullable_pointer_param_using_non_const // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1373,7 +1373,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc11_26.3(%self.param: ref %Optional.4b8) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- import_non_nullable_pointer_return.carbon +// CHECK:STDOUT: --- import_non_nullable_pointer_return.carbon = $import_non_nullable_pointer_return // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1418,7 +1418,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_double_pointer_return.carbon +// CHECK:STDOUT: --- import_double_pointer_return.carbon = $import_double_pointer_return // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1464,7 +1464,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_const_non_nullable_pointer_return.carbon +// CHECK:STDOUT: --- import_const_non_nullable_pointer_return.carbon = $import_const_non_nullable_pointer_return // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1510,7 +1510,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- non_nullable_pointer_arg_to_pointer_param.carbon +// CHECK:STDOUT: --- non_nullable_pointer_arg_to_pointer_param.carbon = $non_nullable_pointer_arg_to_pointer_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1669,7 +1669,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc9_26.3(%self.param: ref %Optional.37f) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- null_pointer_arg_to_pointer_param.carbon +// CHECK:STDOUT: --- null_pointer_arg_to_pointer_param.carbon = $null_pointer_arg_to_pointer_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1797,7 +1797,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8_66.3(%self.param: ref %Optional.37f) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- nonnull_pointer_arg_to_pointer_param.carbon +// CHECK:STDOUT: --- nonnull_pointer_arg_to_pointer_param.carbon = $nonnull_pointer_arg_to_pointer_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1963,7 +1963,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc9_68.3(%self.param: ref %Optional.37f) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- forward_nullable_pointer.carbon +// CHECK:STDOUT: --- forward_nullable_pointer.carbon = $forward_nullable_pointer // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2073,7 +2073,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8_49.3(%self.param: ref %Optional.37f) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- import_deduced_any_param_as_pointer.carbon +// CHECK:STDOUT: --- import_deduced_any_param_as_pointer.carbon = $import_deduced_any_param_as_pointer // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2163,7 +2163,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_deduced_pointer_param_as_pointer.carbon +// CHECK:STDOUT: --- import_deduced_pointer_param_as_pointer.carbon = $import_deduced_pointer_param_as_pointer // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 9536469d1e06..d6c331aef7c7 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/qualified_param.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/qualified_param.carbon @@ -33,7 +33,7 @@ fn F() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- call_qualifiers.carbon +// CHECK:STDOUT: --- call_qualifiers.carbon = $call_qualifiers // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/function/import/reference.carbon b/toolchain/check/testdata/interop/cpp/function/import/reference.carbon index 78b47182a695..99d191549194 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/reference.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/reference.carbon @@ -562,7 +562,7 @@ fn PassConstRef(ref x: const XByRef) { } -// CHECK:STDOUT: --- call_param_lvalue_ref.carbon +// CHECK:STDOUT: --- call_param_lvalue_ref.carbon = $call_param_lvalue_ref // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -638,7 +638,7 @@ fn PassConstRef(ref x: const XByRef) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_param_lvalue_ref.carbon +// CHECK:STDOUT: --- fail_param_lvalue_ref.carbon = $fail_param_lvalue_ref // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -818,7 +818,7 @@ fn PassConstRef(ref x: const XByRef) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- call_param_rvalue_ref.carbon +// CHECK:STDOUT: --- call_param_rvalue_ref.carbon = $call_param_rvalue_ref // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -865,7 +865,7 @@ fn PassConstRef(ref x: const XByRef) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_param_rvalue_ref.carbon +// CHECK:STDOUT: --- fail_param_rvalue_ref.carbon = $fail_param_rvalue_ref // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1009,7 +1009,7 @@ fn PassConstRef(ref x: const XByRef) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- call_param_const_lvalue_ref_with_ref.carbon +// CHECK:STDOUT: --- call_param_const_lvalue_ref_with_ref.carbon = $call_param_const_lvalue_ref_with_ref // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1108,7 +1108,7 @@ fn PassConstRef(ref x: const XByRef) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- call_param_const_lvalue_ref_with_value.carbon +// CHECK:STDOUT: --- call_param_const_lvalue_ref_with_value.carbon = $call_param_const_lvalue_ref_with_value // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1205,7 +1205,7 @@ fn PassConstRef(ref x: const XByRef) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- param_value_arg_for_const_rvalue_ref.carbon +// CHECK:STDOUT: --- param_value_arg_for_const_rvalue_ref.carbon = $param_value_arg_for_const_rvalue_ref // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1258,7 +1258,7 @@ fn PassConstRef(ref x: const XByRef) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_param_lvalue_ref_arg_const_rvalue_ref.carbon +// CHECK:STDOUT: --- fail_param_lvalue_ref_arg_const_rvalue_ref.carbon = $fail_param_lvalue_ref_arg_const_rvalue_ref // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1384,7 +1384,7 @@ fn PassConstRef(ref x: const XByRef) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- call_return_lvalue_ref.carbon +// CHECK:STDOUT: --- call_return_lvalue_ref.carbon = $call_return_lvalue_ref // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1424,7 +1424,7 @@ fn PassConstRef(ref x: const XByRef) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- call_return_rvalue_ref.carbon +// CHECK:STDOUT: --- call_return_rvalue_ref.carbon = $call_return_rvalue_ref // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1464,7 +1464,7 @@ fn PassConstRef(ref x: const XByRef) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- call_return_const_lvalue_ref.carbon +// CHECK:STDOUT: --- call_return_const_lvalue_ref.carbon = $call_return_const_lvalue_ref // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1506,7 +1506,7 @@ fn PassConstRef(ref x: const XByRef) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- forwarding_reference.carbon +// CHECK:STDOUT: --- forwarding_reference.carbon = $forwarding_reference // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/function/import/return.carbon b/toolchain/check/testdata/interop/cpp/function/import/return.carbon index ff9d6b362b45..016500c5e605 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/return.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/return.carbon @@ -107,7 +107,7 @@ fn Var() { var unused my_u32: u32 = Cpp.ReturnU32(); } -// CHECK:STDOUT: --- import_multiple.carbon +// CHECK:STDOUT: --- import_multiple.carbon = $import_multiple // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -194,7 +194,7 @@ fn Var() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc11(%self.param: ref %i16) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- var_from_thunk_param.carbon +// CHECK:STDOUT: --- var_from_thunk_param.carbon = $var_from_thunk_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -281,7 +281,7 @@ fn Var() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc11_3.3(%self.param: ref %Cpp.nullptr_t) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- return_from_thunk_param.carbon +// CHECK:STDOUT: --- return_from_thunk_param.carbon = $return_from_thunk_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -368,7 +368,7 @@ fn Var() { // CHECK:STDOUT: // CHECK:STDOUT: fn @ReturnU8__carbon_thunk(%return.param: %ptr); // CHECK:STDOUT: -// CHECK:STDOUT: --- var_from_thunk_by_value.carbon +// CHECK:STDOUT: --- var_from_thunk_by_value.carbon = $var_from_thunk_by_value // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/function/import/struct.carbon b/toolchain/check/testdata/interop/cpp/function/import/struct.carbon index 490731a6f29e..266f4ad0cb95 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/struct.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/struct.carbon @@ -534,7 +534,7 @@ fn F() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- import_definition_no_data_members_value_param_type.carbon +// CHECK:STDOUT: --- import_definition_no_data_members_value_param_type.carbon = $import_definition_no_data_members_value_param_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -573,7 +573,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_import_non_copyable_param_type.carbon +// CHECK:STDOUT: --- fail_import_non_copyable_param_type.carbon = $fail_import_non_copyable_param_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -609,7 +609,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- definition_single_data_member_value_param_type.carbon +// CHECK:STDOUT: --- definition_single_data_member_value_param_type.carbon = $definition_single_data_member_value_param_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -648,7 +648,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- definition_multiple_data_members_value_param_type.carbon +// CHECK:STDOUT: --- definition_multiple_data_members_value_param_type.carbon = $definition_multiple_data_members_value_param_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -687,7 +687,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition_in_namespace_value_param_type.carbon +// CHECK:STDOUT: --- import_definition_in_namespace_value_param_type.carbon = $import_definition_in_namespace_value_param_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -784,7 +784,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition_in_relative_namespace_value_param_type.carbon +// CHECK:STDOUT: --- import_definition_in_relative_namespace_value_param_type.carbon = $import_definition_in_relative_namespace_value_param_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -832,7 +832,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition_in_outer_definition.carbon +// CHECK:STDOUT: --- import_definition_in_outer_definition.carbon = $import_definition_in_outer_definition // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -925,7 +925,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition_and_static_method_call_before.carbon +// CHECK:STDOUT: --- import_definition_and_static_method_call_before.carbon = $import_definition_and_static_method_call_before // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -974,7 +974,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition_and_static_method_call_after.carbon +// CHECK:STDOUT: --- import_definition_and_static_method_call_after.carbon = $import_definition_and_static_method_call_after // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1023,7 +1023,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_decl_pointer_param_type.carbon +// CHECK:STDOUT: --- import_decl_pointer_param_type.carbon = $import_decl_pointer_param_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1060,7 +1060,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition_pointer_param_type.carbon +// CHECK:STDOUT: --- import_definition_pointer_param_type.carbon = $import_definition_pointer_param_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1097,7 +1097,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition_value_return_type.carbon +// CHECK:STDOUT: --- import_definition_value_return_type.carbon = $import_definition_value_return_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1154,7 +1154,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_decl_pointer_return_type.carbon +// CHECK:STDOUT: --- import_decl_pointer_return_type.carbon = $import_decl_pointer_return_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1187,7 +1187,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition_pointer_return_type.carbon +// CHECK:STDOUT: --- import_definition_pointer_return_type.carbon = $import_definition_pointer_return_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/function/import/union.carbon b/toolchain/check/testdata/interop/cpp/function/import/union.carbon index e38d50aa470b..5bd66085ca32 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/union.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/union.carbon @@ -489,7 +489,7 @@ fn F() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- import_definition_no_data_members_value_param_type.carbon +// CHECK:STDOUT: --- import_definition_no_data_members_value_param_type.carbon = $import_definition_no_data_members_value_param_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -528,7 +528,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition_single_data_member_value_param_type.carbon +// CHECK:STDOUT: --- import_definition_single_data_member_value_param_type.carbon = $import_definition_single_data_member_value_param_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -567,7 +567,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition_multiple_data_members_value_param_type.carbon +// CHECK:STDOUT: --- import_definition_multiple_data_members_value_param_type.carbon = $import_definition_multiple_data_members_value_param_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -606,7 +606,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition_in_namespace_value_param_type.carbon +// CHECK:STDOUT: --- import_definition_in_namespace_value_param_type.carbon = $import_definition_in_namespace_value_param_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -703,7 +703,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition_in_relative_namespace_value_param_type.carbon +// CHECK:STDOUT: --- import_definition_in_relative_namespace_value_param_type.carbon = $import_definition_in_relative_namespace_value_param_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -751,7 +751,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition_in_outer_definition.carbon +// CHECK:STDOUT: --- import_definition_in_outer_definition.carbon = $import_definition_in_outer_definition // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -844,7 +844,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition_and_static_method_call_before.carbon +// CHECK:STDOUT: --- import_definition_and_static_method_call_before.carbon = $import_definition_and_static_method_call_before // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -893,7 +893,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition_and_static_method_call_after.carbon +// CHECK:STDOUT: --- import_definition_and_static_method_call_after.carbon = $import_definition_and_static_method_call_after // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -942,7 +942,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_decl_pointer_param_type.carbon +// CHECK:STDOUT: --- import_decl_pointer_param_type.carbon = $import_decl_pointer_param_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -979,7 +979,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition_pointer_param_type.carbon +// CHECK:STDOUT: --- import_definition_pointer_param_type.carbon = $import_definition_pointer_param_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1016,7 +1016,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition_value_return_type.carbon +// CHECK:STDOUT: --- import_definition_value_return_type.carbon = $import_definition_value_return_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1073,7 +1073,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_decl_pointer_return_type.carbon +// CHECK:STDOUT: --- import_decl_pointer_return_type.carbon = $import_decl_pointer_return_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1106,7 +1106,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_definition_pointer_return_type.carbon +// CHECK:STDOUT: --- import_definition_pointer_return_type.carbon = $import_definition_pointer_return_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/function/import/variadic.carbon b/toolchain/check/testdata/interop/cpp/function/import/variadic.carbon index 7092a3d582ab..3d1ac3d93ffa 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/variadic.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/variadic.carbon @@ -39,7 +39,7 @@ fn Call3() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- call_variadic.carbon +// CHECK:STDOUT: --- call_variadic.carbon = $call_variadic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 288e36c752ae..1f947773ccef 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/void_pointer.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/void_pointer.carbon @@ -112,7 +112,7 @@ fn F() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- non_nullable_param.carbon +// CHECK:STDOUT: --- non_nullable_param.carbon = $non_nullable_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -148,7 +148,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- non_nullable_return_value.carbon +// CHECK:STDOUT: --- non_nullable_return_value.carbon = $non_nullable_return_value // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -195,7 +195,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- nullable_param.carbon +// CHECK:STDOUT: --- nullable_param.carbon = $nullable_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -320,7 +320,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc10_26.3(%self.param: ref %Optional.7de) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- null_param.carbon +// CHECK:STDOUT: --- null_param.carbon = $null_param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -455,7 +455,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc10_52.3(%self.param: ref %Optional.7de) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- nullable_return_value.carbon +// CHECK:STDOUT: --- nullable_return_value.carbon = $nullable_return_value // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -582,7 +582,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc10_73.3(%self.param: ref %Optional.7de) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- non_nullable_pointer.carbon +// CHECK:STDOUT: --- non_nullable_pointer.carbon = $non_nullable_pointer // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -671,7 +671,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc11(%self.param: ref %ptr.6f9) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- non_nullable_const.carbon +// CHECK:STDOUT: --- non_nullable_const.carbon = $non_nullable_const // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/impls/as.carbon b/toolchain/check/testdata/interop/cpp/impls/as.carbon index e65cbedd1de6..2bb86a00fe3a 100644 --- a/toolchain/check/testdata/interop/cpp/impls/as.carbon +++ b/toolchain/check/testdata/interop/cpp/impls/as.carbon @@ -136,7 +136,7 @@ fn ConversionExplicit(s: Cpp.ConditionallyExplicitFalse) { //@dump-sem-ir-end } -// CHECK:STDOUT: --- conversions.carbon +// CHECK:STDOUT: --- conversions.carbon = $conversions // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -309,7 +309,7 @@ fn ConversionExplicit(s: Cpp.ConditionallyExplicitFalse) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- conditionally_explicit.carbon +// CHECK:STDOUT: --- conditionally_explicit.carbon = $conditionally_explicit // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -518,7 +518,7 @@ fn ConversionExplicit(s: Cpp.ConditionallyExplicitFalse) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_conditionally_explicit_implicit.carbon +// CHECK:STDOUT: --- fail_conditionally_explicit_implicit.carbon = $fail_conditionally_explicit_implicit // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/impls/copy.carbon b/toolchain/check/testdata/interop/cpp/impls/copy.carbon index d86a2eff816c..2e6b01bdda67 100644 --- a/toolchain/check/testdata/interop/cpp/impls/copy.carbon +++ b/toolchain/check/testdata/interop/cpp/impls/copy.carbon @@ -221,7 +221,7 @@ fn EqualWitnesses(p: Wrap(Cpp.Copyable)*) -> Wrap(Cpp.Copyable)* { //@dump-sem-ir-end } -// CHECK:STDOUT: --- copy_copyable.carbon +// CHECK:STDOUT: --- copy_copyable.carbon = $copy_copyable // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -318,7 +318,7 @@ fn EqualWitnesses(p: Wrap(Cpp.Copyable)*) -> Wrap(Cpp.Copyable)* { // CHECK:STDOUT: return %.loc14_10.5 to %return.param // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- copy_generically.carbon +// CHECK:STDOUT: --- copy_generically.carbon = $copy_generically // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/impls/destroy.carbon b/toolchain/check/testdata/interop/cpp/impls/destroy.carbon index f8e9c1d1d180..caa1f35d02ca 100644 --- a/toolchain/check/testdata/interop/cpp/impls/destroy.carbon +++ b/toolchain/check/testdata/interop/cpp/impls/destroy.carbon @@ -307,7 +307,7 @@ fn F() { var _: AdaptNoDestroy = Make(); } -// CHECK:STDOUT: --- destroy_destroyable.carbon +// CHECK:STDOUT: --- destroy_destroyable.carbon = $destroy_destroyable // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -482,7 +482,7 @@ fn F() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_destroy_protected_base_destructor.carbon +// CHECK:STDOUT: --- fail_todo_destroy_protected_base_destructor.carbon = $fail_todo_destroy_protected_base_destructor // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -578,7 +578,7 @@ fn F() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_destroy_private_base_destructor.carbon +// CHECK:STDOUT: --- fail_destroy_private_base_destructor.carbon = $fail_destroy_private_base_destructor // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/impls/implicit_as.carbon b/toolchain/check/testdata/interop/cpp/impls/implicit_as.carbon index 03a0804de165..96ed02f7c29e 100644 --- a/toolchain/check/testdata/interop/cpp/impls/implicit_as.carbon +++ b/toolchain/check/testdata/interop/cpp/impls/implicit_as.carbon @@ -499,7 +499,7 @@ fn InitFromStruct() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- implicit_conversions.carbon +// CHECK:STDOUT: --- implicit_conversions.carbon = $implicit_conversions // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -657,7 +657,7 @@ fn InitFromStruct() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_expr_category.carbon +// CHECK:STDOUT: --- fail_expr_category.carbon = $fail_expr_category // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -692,7 +692,7 @@ fn InitFromStruct() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_access.carbon +// CHECK:STDOUT: --- fail_access.carbon = $fail_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -813,7 +813,7 @@ fn InitFromStruct() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_deleted.carbon +// CHECK:STDOUT: --- fail_deleted.carbon = $fail_deleted // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -871,7 +871,7 @@ fn InitFromStruct() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_explicit.carbon +// CHECK:STDOUT: --- fail_explicit.carbon = $fail_explicit // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -929,7 +929,7 @@ fn InitFromStruct() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- i32_to_int.carbon +// CHECK:STDOUT: --- i32_to_int.carbon = $i32_to_int // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -997,7 +997,7 @@ fn InitFromStruct() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_no_u32_to_int_conversion_in_carbon.carbon +// CHECK:STDOUT: --- fail_no_u32_to_int_conversion_in_carbon.carbon = $fail_no_u32_to_int_conversion_in_carbon // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1067,7 +1067,7 @@ fn InitFromStruct() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- default_constructor.carbon +// CHECK:STDOUT: --- default_constructor.carbon = $default_constructor // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1134,7 +1134,7 @@ fn InitFromStruct() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- construct_multi_argument.carbon +// CHECK:STDOUT: --- construct_multi_argument.carbon = $construct_multi_argument // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1357,7 +1357,7 @@ fn InitFromStruct() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_aggregate_from_tuple.carbon +// CHECK:STDOUT: --- fail_todo_aggregate_from_tuple.carbon = $fail_todo_aggregate_from_tuple // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1420,7 +1420,7 @@ fn InitFromStruct() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_aggregate_from_struct.carbon +// CHECK:STDOUT: --- fail_todo_aggregate_from_struct.carbon = $fail_todo_aggregate_from_struct // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1483,7 +1483,7 @@ fn InitFromStruct() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- non_aggregate_from_tuple.carbon +// CHECK:STDOUT: --- non_aggregate_from_tuple.carbon = $non_aggregate_from_tuple // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1659,7 +1659,7 @@ fn InitFromStruct() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_non_aggregate_from_struct.carbon +// CHECK:STDOUT: --- fail_non_aggregate_from_struct.carbon = $fail_non_aggregate_from_struct // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/macros/invalid.carbon b/toolchain/check/testdata/interop/cpp/macros/invalid.carbon index 506e797fd812..f6aedfff12d8 100644 --- a/toolchain/check/testdata/interop/cpp/macros/invalid.carbon +++ b/toolchain/check/testdata/interop/cpp/macros/invalid.carbon @@ -47,7 +47,7 @@ fn F() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- fail_macro_with_error.carbon +// CHECK:STDOUT: --- fail_macro_with_error.carbon = $fail_macro_with_error // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Cpp: = namespace file.%Cpp.import_cpp, [concrete] { diff --git a/toolchain/check/testdata/interop/cpp/macros/macros.carbon b/toolchain/check/testdata/interop/cpp/macros/macros.carbon index 4d561fbb93f0..bb8d7cbac518 100644 --- a/toolchain/check/testdata/interop/cpp/macros/macros.carbon +++ b/toolchain/check/testdata/interop/cpp/macros/macros.carbon @@ -1078,7 +1078,7 @@ class C(N: i32) {} // Expansion of `COUNT` should be suppressed inside itself. let _: C(1) = {} as C(Cpp.COUNT); -// CHECK:STDOUT: --- import_integer_literal_replacement_token.carbon +// CHECK:STDOUT: --- import_integer_literal_replacement_token.carbon = $import_integer_literal_replacement_token // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1169,7 +1169,7 @@ let _: C(1) = {} as C(Cpp.COUNT); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_macro_and_non_macro_same_name.carbon +// CHECK:STDOUT: --- import_macro_and_non_macro_same_name.carbon = $import_macro_and_non_macro_same_name // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1329,7 +1329,7 @@ let _: C(1) = {} as C(Cpp.COUNT); // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_unary_operator.carbon +// CHECK:STDOUT: --- import_unary_operator.carbon = $import_unary_operator // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1360,7 +1360,7 @@ let _: C(1) = {} as C(Cpp.COUNT); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_binary_operator.carbon +// CHECK:STDOUT: --- import_binary_operator.carbon = $import_binary_operator // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1391,7 +1391,7 @@ let _: C(1) = {} as C(Cpp.COUNT); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_casting.carbon +// CHECK:STDOUT: --- import_casting.carbon = $import_casting // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1457,7 +1457,7 @@ let _: C(1) = {} as C(Cpp.COUNT); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_nested_macros.carbon +// CHECK:STDOUT: --- import_nested_macros.carbon = $import_nested_macros // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1488,7 +1488,7 @@ let _: C(1) = {} as C(Cpp.COUNT); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_string_literal_object_like_macro.carbon +// CHECK:STDOUT: --- import_string_literal_object_like_macro.carbon = $import_string_literal_object_like_macro // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1600,7 +1600,7 @@ let _: C(1) = {} as C(Cpp.COUNT); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_floating_point_literal_macro.carbon +// CHECK:STDOUT: --- import_floating_point_literal_macro.carbon = $import_floating_point_literal_macro // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1656,7 +1656,7 @@ let _: C(1) = {} as C(Cpp.COUNT); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_character_literals.carbon +// CHECK:STDOUT: --- import_character_literals.carbon = $import_character_literals // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1741,7 +1741,7 @@ let _: C(1) = {} as C(Cpp.COUNT); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_character_literals_operators.carbon +// CHECK:STDOUT: --- import_character_literals_operators.carbon = $import_character_literals_operators // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1796,7 +1796,7 @@ let _: C(1) = {} as C(Cpp.COUNT); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_boolean_literal_macro.carbon +// CHECK:STDOUT: --- import_boolean_literal_macro.carbon = $import_boolean_literal_macro // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1922,7 +1922,7 @@ let _: C(1) = {} as C(Cpp.COUNT); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- nullptr.carbon +// CHECK:STDOUT: --- nullptr.carbon = $nullptr.2 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2045,7 +2045,7 @@ let _: C(1) = {} as C(Cpp.COUNT); // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc11_14.3(%self.param: ref %Optional.785) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- enums.carbon +// CHECK:STDOUT: --- enums.carbon = $enums // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2079,7 +2079,7 @@ let _: C(1) = {} as C(Cpp.COUNT); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- constexpr_int.carbon +// CHECK:STDOUT: --- constexpr_int.carbon = $constexpr_int // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2122,7 +2122,7 @@ let _: C(1) = {} as C(Cpp.COUNT); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- constexpr_int_addr.carbon +// CHECK:STDOUT: --- constexpr_int_addr.carbon = $constexpr_int_addr // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2169,7 +2169,7 @@ let _: C(1) = {} as C(Cpp.COUNT); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- lambda.carbon +// CHECK:STDOUT: --- lambda.carbon = $lambda // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2200,7 +2200,7 @@ let _: C(1) = {} as C(Cpp.COUNT); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_macro_redefined.carbon +// CHECK:STDOUT: --- import_macro_redefined.carbon = $import_macro_redefined // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2231,7 +2231,7 @@ let _: C(1) = {} as C(Cpp.COUNT); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_macro_defined_twice.carbon +// CHECK:STDOUT: --- import_macro_defined_twice.carbon = $import_macro_defined_twice // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2262,7 +2262,7 @@ let _: C(1) = {} as C(Cpp.COUNT); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- assign.carbon +// CHECK:STDOUT: --- assign.carbon = $assign // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2316,7 +2316,7 @@ let _: C(1) = {} as C(Cpp.COUNT); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- assign_subobject.carbon +// CHECK:STDOUT: --- assign_subobject.carbon = $assign_subobject // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/namespace/import.carbon b/toolchain/check/testdata/interop/cpp/namespace/import.carbon index ec7e81086fa1..1c14c277a3e0 100644 --- a/toolchain/check/testdata/interop/cpp/namespace/import.carbon +++ b/toolchain/check/testdata/interop/cpp/namespace/import.carbon @@ -401,7 +401,7 @@ fn F() { MyNamespaceAlias.baz(); } -// CHECK:STDOUT: --- import_single.carbon +// CHECK:STDOUT: --- import_single.carbon = $import_single // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -434,7 +434,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_multiple.carbon +// CHECK:STDOUT: --- import_multiple.carbon = $import_multiple // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -500,7 +500,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_inline.carbon +// CHECK:STDOUT: --- import_inline.carbon = $import_inline // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -533,7 +533,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_inline_ambiguity_not_triggered.carbon +// CHECK:STDOUT: --- import_inline_ambiguity_not_triggered.carbon = $import_inline_ambiguity_not_triggered // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -590,7 +590,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_special_name_call_escpaed.carbon +// CHECK:STDOUT: --- import_special_name_call_escpaed.carbon = $import_special_name_call_escpaed // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/operators/arithmetic_operators.carbon b/toolchain/check/testdata/interop/cpp/operators/arithmetic_operators.carbon index 8c3946726dd0..1c2d73c1dc26 100644 --- a/toolchain/check/testdata/interop/cpp/operators/arithmetic_operators.carbon +++ b/toolchain/check/testdata/interop/cpp/operators/arithmetic_operators.carbon @@ -306,7 +306,7 @@ fn TestUnaryOperators(a: Cpp.Int16, b: Cpp.Int32) { } -// CHECK:STDOUT: --- arithmetic_operators.carbon +// CHECK:STDOUT: --- arithmetic_operators.carbon = $arithmetic_operators // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/operators/deref.carbon b/toolchain/check/testdata/interop/cpp/operators/deref.carbon index f3cd6be0a02f..f7be07e70c21 100644 --- a/toolchain/check/testdata/interop/cpp/operators/deref.carbon +++ b/toolchain/check/testdata/interop/cpp/operators/deref.carbon @@ -126,7 +126,7 @@ fn TestDerefFail(not_ptr: Cpp.NotAPtr) { not_ptr.(Core.CppUnsafeDeref.Op)(); } -// CHECK:STDOUT: --- const_deref.carbon +// CHECK:STDOUT: --- const_deref.carbon = $const_deref // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -196,7 +196,7 @@ fn TestDerefFail(not_ptr: Cpp.NotAPtr) { // CHECK:STDOUT: return %operator_Star__carbon_thunk.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- mutable_deref.carbon +// CHECK:STDOUT: --- mutable_deref.carbon = $mutable_deref // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/operators/eq_with.carbon b/toolchain/check/testdata/interop/cpp/operators/eq_with.carbon index d3307c7f0288..2bb1b853ec60 100644 --- a/toolchain/check/testdata/interop/cpp/operators/eq_with.carbon +++ b/toolchain/check/testdata/interop/cpp/operators/eq_with.carbon @@ -458,7 +458,7 @@ fn Test(only_neq: Cpp.OnlyNeq, EqWith(a2, b2); } -// CHECK:STDOUT: --- returns_bool.carbon +// CHECK:STDOUT: --- returns_bool.carbon = $returns_bool // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -629,7 +629,7 @@ fn Test(only_neq: Cpp.OnlyNeq, // CHECK:STDOUT: %specific_impl_fn.loc14_5.2 => constants.%EqualityComparable.NotEqual // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- cross_type_equality.carbon +// CHECK:STDOUT: --- cross_type_equality.carbon = $cross_type_equality // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/operators/operators.carbon b/toolchain/check/testdata/interop/cpp/operators/operators.carbon index 8cde962355a5..dc3136716f82 100644 --- a/toolchain/check/testdata/interop/cpp/operators/operators.carbon +++ b/toolchain/check/testdata/interop/cpp/operators/operators.carbon @@ -1197,7 +1197,7 @@ fn F() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- import_unary_operators.carbon +// CHECK:STDOUT: --- import_unary_operators.carbon = $import_unary_operators // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1351,7 +1351,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_binary_operators.carbon +// CHECK:STDOUT: --- import_binary_operators.carbon = $import_binary_operators // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2216,7 +2216,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc45(%self.param: ref bool) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- multiple_calls.carbon +// CHECK:STDOUT: --- multiple_calls.carbon = $multiple_calls // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2398,7 +2398,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_rewrite_spaceship.carbon +// CHECK:STDOUT: --- fail_todo_rewrite_spaceship.carbon = $fail_todo_rewrite_spaceship // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2588,7 +2588,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc46(%self.param: ref bool) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_rewrite_equal.carbon +// CHECK:STDOUT: --- fail_todo_rewrite_equal.carbon = $fail_todo_rewrite_equal // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2737,7 +2737,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc16(%self.param: ref bool) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- import_single_namespace.carbon +// CHECK:STDOUT: --- import_single_namespace.carbon = $import_single_namespace // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2874,7 +2874,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_multiple_namespaces.carbon +// CHECK:STDOUT: --- import_multiple_namespaces.carbon = $import_multiple_namespaces // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -3071,7 +3071,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_import_operands_in_namespace_operator_in_global.carbon +// CHECK:STDOUT: --- fail_todo_import_operands_in_namespace_operator_in_global.carbon = $fail_todo_import_operands_in_namespace_operator_in_global // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -3185,7 +3185,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_inner_class.carbon +// CHECK:STDOUT: --- import_inner_class.carbon = $import_inner_class // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -3320,7 +3320,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_inner_class_in_namespace.carbon +// CHECK:STDOUT: --- import_inner_class_in_namespace.carbon = $import_inner_class_in_namespace // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -3464,7 +3464,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_member_add_with.carbon +// CHECK:STDOUT: --- import_member_add_with.carbon = $import_member_add_with // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -3602,7 +3602,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- indirect_template_instantiation.carbon +// CHECK:STDOUT: --- indirect_template_instantiation.carbon = $indirect_template_instantiation // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -3634,7 +3634,7 @@ fn F() { // CHECK:STDOUT: return %operator_Plus__carbon_thunk.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_overloading.carbon +// CHECK:STDOUT: --- import_overloading.carbon = $import_overloading // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/operators/ordered_with.carbon b/toolchain/check/testdata/interop/cpp/operators/ordered_with.carbon index 61be3b75fa67..907316a077f4 100644 --- a/toolchain/check/testdata/interop/cpp/operators/ordered_with.carbon +++ b/toolchain/check/testdata/interop/cpp/operators/ordered_with.carbon @@ -478,7 +478,7 @@ fn Test(missing_less: Cpp.MissingLess, OrderedWith(less_non_const, less_non_const); } -// CHECK:STDOUT: --- returns_bool.carbon +// CHECK:STDOUT: --- returns_bool.carbon = $returns_bool // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -721,7 +721,7 @@ fn Test(missing_less: Cpp.MissingLess, // CHECK:STDOUT: %specific_impl_fn.loc18_5.2 => constants.%Ordered.GreaterOrEquivalent // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- cross_type_ordering.carbon +// CHECK:STDOUT: --- cross_type_ordering.carbon = $cross_type_ordering // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/operators/spaceship.carbon b/toolchain/check/testdata/interop/cpp/operators/spaceship.carbon index 4ba1cf16fb21..08e2b25adf04 100644 --- a/toolchain/check/testdata/interop/cpp/operators/spaceship.carbon +++ b/toolchain/check/testdata/interop/cpp/operators/spaceship.carbon @@ -271,7 +271,7 @@ fn Test(returns_strong_ordering: Cpp.ReturnsStrongOrdering) { EqWith(returns_strong_ordering, returns_strong_ordering); } -// CHECK:STDOUT: --- fail_todo_spaceship_rewrites.carbon +// CHECK:STDOUT: --- fail_todo_spaceship_rewrites.carbon = $fail_todo_spaceship_rewrites // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/primitive_types/arithmetic.carbon b/toolchain/check/testdata/interop/cpp/primitive_types/arithmetic.carbon index 4c2a621c126f..656337825a3a 100644 --- a/toolchain/check/testdata/interop/cpp/primitive_types/arithmetic.carbon +++ b/toolchain/check/testdata/interop/cpp/primitive_types/arithmetic.carbon @@ -122,7 +122,7 @@ fn F() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- supported_types.carbon +// CHECK:STDOUT: --- supported_types.carbon = $supported_types // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -479,7 +479,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_unsupported_types.carbon +// CHECK:STDOUT: --- fail_todo_unsupported_types.carbon = $fail_todo_unsupported_types // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -534,7 +534,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- override_builtin.carbon +// CHECK:STDOUT: --- override_builtin.carbon = $override_builtin // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/primitive_types/long_and_long_long.darwin.carbon b/toolchain/check/testdata/interop/cpp/primitive_types/long_and_long_long.darwin.carbon index feb0d5ba124c..cf175add2f50 100644 --- a/toolchain/check/testdata/interop/cpp/primitive_types/long_and_long_long.darwin.carbon +++ b/toolchain/check/testdata/interop/cpp/primitive_types/long_and_long_long.darwin.carbon @@ -665,7 +665,7 @@ fn CopyUnsignedLong() { } -// CHECK:STDOUT: --- long.carbon +// CHECK:STDOUT: --- long.carbon = $long // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -861,7 +861,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- unsigned_long.carbon +// CHECK:STDOUT: --- unsigned_long.carbon = $unsigned_long // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1057,7 +1057,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- long_long.carbon +// CHECK:STDOUT: --- long_long.carbon = $long_long // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1399,7 +1399,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- copy_long.carbon +// CHECK:STDOUT: --- copy_long.carbon = $copy_long // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1508,7 +1508,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc9_3.2(%self.param: ref %Cpp.long) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- comparisons_homogeneous_long.carbon +// CHECK:STDOUT: --- comparisons_homogeneous_long.carbon = $comparisons_homogeneous_long // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1638,7 +1638,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- comparisons_heterogeneous_long_left_side.carbon +// CHECK:STDOUT: --- comparisons_heterogeneous_long_left_side.carbon = $comparisons_heterogeneous_long_left_side // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2114,7 +2114,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- comparisons_heterogeneous_long_right_side.carbon +// CHECK:STDOUT: --- comparisons_heterogeneous_long_right_side.carbon = $comparisons_heterogeneous_long_right_side // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2612,7 +2612,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- compound_assignment_homogeneous_long.carbon +// CHECK:STDOUT: --- compound_assignment_homogeneous_long.carbon = $compound_assignment_homogeneous_long // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -3077,7 +3077,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc9_3.2(%self.param: ref %Cpp.long) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- compound_assignment_hereogeneous_long_and_i64.carbon +// CHECK:STDOUT: --- compound_assignment_hereogeneous_long_and_i64.carbon = $compound_assignment_hereogeneous_long_and_i64 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -3491,7 +3491,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- compound_assignment_heterogeneous_long_and_int_literal.carbon +// CHECK:STDOUT: --- compound_assignment_heterogeneous_long_and_int_literal.carbon = $compound_assignment_heterogeneous_long_and_int_literal // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -3607,7 +3607,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8_3.2(%self.param: ref %Cpp.long) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- compound_assignment_heterogeneous_long_and_runtime_i64.carbon +// CHECK:STDOUT: --- compound_assignment_heterogeneous_long_and_runtime_i64.carbon = $compound_assignment_heterogeneous_long_and_runtime_i64 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -3759,7 +3759,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8(%self.param: ref %i64) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- increment_decrement_long.carbon +// CHECK:STDOUT: --- increment_decrement_long.carbon = $increment_decrement_long // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -3861,7 +3861,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8_3.2(%self.param: ref %Cpp.long) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- unsigned_long_long.carbon +// CHECK:STDOUT: --- unsigned_long_long.carbon = $unsigned_long_long // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -4197,7 +4197,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- copy_unsigned_long.carbon +// CHECK:STDOUT: --- copy_unsigned_long.carbon = $copy_unsigned_long // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 20b85cd213ca..aae4c3f902f0 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 @@ -758,7 +758,7 @@ fn CopyUnsignedLong() { } -// CHECK:STDOUT: --- long_long.carbon +// CHECK:STDOUT: --- long_long.carbon = $long_long // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -959,7 +959,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- unsigned_long_long.carbon +// CHECK:STDOUT: --- unsigned_long_long.carbon = $unsigned_long_long // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1160,7 +1160,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- long.carbon +// CHECK:STDOUT: --- long.carbon = $long // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1527,7 +1527,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- copy_long.carbon +// CHECK:STDOUT: --- copy_long.carbon = $copy_long // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1636,7 +1636,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc9_3.2(%self.param: ref %Cpp.long) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- comparisons_homogeneous_long.carbon +// CHECK:STDOUT: --- comparisons_homogeneous_long.carbon = $comparisons_homogeneous_long // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1766,7 +1766,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- comparisons_heterogeneous_long_left_side.carbon +// CHECK:STDOUT: --- comparisons_heterogeneous_long_left_side.carbon = $comparisons_heterogeneous_long_left_side // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2223,7 +2223,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- comparisons_heterogeneous_long_right_side.carbon +// CHECK:STDOUT: --- comparisons_heterogeneous_long_right_side.carbon = $comparisons_heterogeneous_long_right_side // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2702,7 +2702,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- arithmetic_homogeneous_long.carbon +// CHECK:STDOUT: --- arithmetic_homogeneous_long.carbon = $arithmetic_homogeneous_long // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2919,7 +2919,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- compound_assignment_homogeneous_long.carbon +// CHECK:STDOUT: --- compound_assignment_homogeneous_long.carbon = $compound_assignment_homogeneous_long // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -3384,7 +3384,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc9_3.2(%self.param: ref %Cpp.long) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- compound_assignment_hereogeneous_long_and_i32.carbon +// CHECK:STDOUT: --- compound_assignment_hereogeneous_long_and_i32.carbon = $compound_assignment_hereogeneous_long_and_i32 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -3860,7 +3860,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc9_3.2(%self.param: ref %Cpp.long) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- compound_assignment_heterogeneous_long_and_int_literal.carbon +// CHECK:STDOUT: --- compound_assignment_heterogeneous_long_and_int_literal.carbon = $compound_assignment_heterogeneous_long_and_int_literal // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -3976,7 +3976,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8_3.2(%self.param: ref %Cpp.long) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- compound_assignment_heterogeneous_long_and_runtime_i32.carbon +// CHECK:STDOUT: --- compound_assignment_heterogeneous_long_and_runtime_i32.carbon = $compound_assignment_heterogeneous_long_and_runtime_i32 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -4131,7 +4131,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8_3.2(%self.param: ref %Cpp.long) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- increment_decrement_long.carbon +// CHECK:STDOUT: --- increment_decrement_long.carbon = $increment_decrement_long // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -4233,7 +4233,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8_3.2(%self.param: ref %Cpp.long) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- unsigned_long.carbon +// CHECK:STDOUT: --- unsigned_long.carbon = $unsigned_long // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -4596,7 +4596,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- copy_unsigned_long.carbon +// CHECK:STDOUT: --- copy_unsigned_long.carbon = $copy_unsigned_long // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 7b938cba9ecb..3973af98fe00 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 @@ -686,7 +686,7 @@ fn CopyUnsignedLongLong() { } -// CHECK:STDOUT: --- long.carbon +// CHECK:STDOUT: --- long.carbon = $long // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -887,7 +887,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- unsigned_long.carbon +// CHECK:STDOUT: --- unsigned_long.carbon = $unsigned_long // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1088,7 +1088,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- long_long.carbon +// CHECK:STDOUT: --- long_long.carbon = $long_long // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1432,7 +1432,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- copy_long_long.carbon +// CHECK:STDOUT: --- copy_long_long.carbon = $copy_long_long // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1541,7 +1541,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc9_3.2(%self.param: ref %Cpp.long_long) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- comparisons_homogeneous_long_long.carbon +// CHECK:STDOUT: --- comparisons_homogeneous_long_long.carbon = $comparisons_homogeneous_long_long // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1671,7 +1671,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- comparisons_heterogeneous_long_long_left_side.carbon +// CHECK:STDOUT: --- comparisons_heterogeneous_long_long_left_side.carbon = $comparisons_heterogeneous_long_long_left_side // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2128,7 +2128,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- comparisons_heterogeneous_long_long_right_side.carbon +// CHECK:STDOUT: --- comparisons_heterogeneous_long_long_right_side.carbon = $comparisons_heterogeneous_long_long_right_side // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2607,7 +2607,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- compound_assignment_homogeneous_long_long.carbon +// CHECK:STDOUT: --- compound_assignment_homogeneous_long_long.carbon = $compound_assignment_homogeneous_long_long // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -3072,7 +3072,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc9_3.2(%self.param: ref %Cpp.long_long) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- compound_assignment_hereogeneous_long_long_and_i64.carbon +// CHECK:STDOUT: --- compound_assignment_hereogeneous_long_long_and_i64.carbon = $compound_assignment_hereogeneous_long_long_and_i64 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -3548,7 +3548,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc9_3.2(%self.param: ref %Cpp.long_long) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- compound_assignment_heterogeneous_long_long_and_int_literal.carbon +// CHECK:STDOUT: --- compound_assignment_heterogeneous_long_long_and_int_literal.carbon = $compound_assignment_heterogeneous_long_long_and_int_literal // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -3664,7 +3664,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8_3.2(%self.param: ref %Cpp.long_long) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- compound_assignment_heterogeneous_long_long_and_runtime_i64.carbon +// CHECK:STDOUT: --- compound_assignment_heterogeneous_long_long_and_runtime_i64.carbon = $compound_assignment_heterogeneous_long_long_and_runtime_i64 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -3819,7 +3819,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8_3.2(%self.param: ref %Cpp.long_long) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- increment_decrement_long_long.carbon +// CHECK:STDOUT: --- increment_decrement_long_long.carbon = $increment_decrement_long_long // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -3921,7 +3921,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8_3.2(%self.param: ref %Cpp.long_long) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- unsigned_long_long.carbon +// CHECK:STDOUT: --- unsigned_long_long.carbon = $unsigned_long_long // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -4285,7 +4285,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- copy_unsigned_long_long.carbon +// CHECK:STDOUT: --- copy_unsigned_long_long.carbon = $copy_unsigned_long_long // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 fb9395561f7e..1ab164360d2a 100644 --- a/toolchain/check/testdata/interop/cpp/primitive_types/void_pointer.carbon +++ b/toolchain/check/testdata/interop/cpp/primitive_types/void_pointer.carbon @@ -144,7 +144,7 @@ fn F(input: Cpp.void*) { //@dump-sem-ir-end } -// CHECK:STDOUT: --- implicit_as_from_cpp_class_pointer_to_void_pointer.carbon +// CHECK:STDOUT: --- implicit_as_from_cpp_class_pointer_to_void_pointer.carbon = $implicit_as_from_cpp_class_pointer_to_void_pointer // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -200,7 +200,7 @@ fn F(input: Cpp.void*) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- implicit_as_from_carbon_class_pointer_to_void_pointer.carbon +// CHECK:STDOUT: --- implicit_as_from_carbon_class_pointer_to_void_pointer.carbon = $implicit_as_from_carbon_class_pointer_to_void_pointer // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -254,7 +254,7 @@ fn F(input: Cpp.void*) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- explicit_as_from_cpp_class_pointer_to_void_pointer.carbon +// CHECK:STDOUT: --- explicit_as_from_cpp_class_pointer_to_void_pointer.carbon = $explicit_as_from_cpp_class_pointer_to_void_pointer // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -323,7 +323,7 @@ fn F(input: Cpp.void*) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- explicit_as_from_carbon_class_pointer_to_void_pointer.carbon +// CHECK:STDOUT: --- explicit_as_from_carbon_class_pointer_to_void_pointer.carbon = $explicit_as_from_carbon_class_pointer_to_void_pointer // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -390,7 +390,7 @@ fn F(input: Cpp.void*) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_explicit_as_from_void_pointer_to_cpp_class_pointer.carbon +// CHECK:STDOUT: --- fail_explicit_as_from_void_pointer_to_cpp_class_pointer.carbon = $fail_explicit_as_from_void_pointer_to_cpp_class_pointer // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -430,7 +430,7 @@ fn F(input: Cpp.void*) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_explicit_as_from_void_pointer_to_carbon_class_pointer.carbon +// CHECK:STDOUT: --- fail_explicit_as_from_void_pointer_to_carbon_class_pointer.carbon = $fail_explicit_as_from_void_pointer_to_carbon_class_pointer // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -459,7 +459,7 @@ fn F(input: Cpp.void*) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- unsafe_as_from_void_pointer_to_cpp_class_pointer.carbon +// CHECK:STDOUT: --- unsafe_as_from_void_pointer_to_cpp_class_pointer.carbon = $unsafe_as_from_void_pointer_to_cpp_class_pointer // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -519,7 +519,7 @@ fn F(input: Cpp.void*) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- unsafe_as_from_void_pointer_to_carbon_class_pointer.carbon +// CHECK:STDOUT: --- unsafe_as_from_void_pointer_to_carbon_class_pointer.carbon = $unsafe_as_from_void_pointer_to_carbon_class_pointer // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/range_for.carbon b/toolchain/check/testdata/interop/cpp/range_for.carbon index 7694574152a6..5bccb246e04d 100644 --- a/toolchain/check/testdata/interop/cpp/range_for.carbon +++ b/toolchain/check/testdata/interop/cpp/range_for.carbon @@ -940,7 +940,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, Test(end_function_deleted); } -// CHECK:STDOUT: --- methods_return_same_type.carbon +// CHECK:STDOUT: --- methods_return_same_type.carbon = $methods_return_same_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1643,7 +1643,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %SelfDestruct.specific_fn.5 => constants.%SelfDestruct.specific_fn.a15 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- methods_return_different_types.carbon +// CHECK:STDOUT: --- methods_return_different_types.carbon = $methods_return_different_types // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2349,7 +2349,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %SelfDestruct.specific_fn.6 => constants.%SelfDestruct.specific_fn.825 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- method_overloads.carbon +// CHECK:STDOUT: --- method_overloads.carbon = $method_overloads // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -2850,7 +2850,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %SelfDestruct.specific_fn.5 => constants.%SelfDestruct.specific_fn.ddf // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- adl_return_same_types.carbon +// CHECK:STDOUT: --- adl_return_same_types.carbon = $adl_return_same_types // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -3352,7 +3352,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %SelfDestruct.specific_fn.5 => constants.%SelfDestruct.specific_fn.c59 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_adl_returns_same_types_mutable.carbon +// CHECK:STDOUT: --- fail_todo_adl_returns_same_types_mutable.carbon = $fail_todo_adl_returns_same_types_mutable // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -3856,7 +3856,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %SelfDestruct.specific_fn.5 => constants.%SelfDestruct.specific_fn.e1d // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- adl_returns_different_types.carbon +// CHECK:STDOUT: --- adl_returns_different_types.carbon = $adl_returns_different_types // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -4391,7 +4391,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %SelfDestruct.specific_fn.6 => constants.%SelfDestruct.specific_fn.6b7 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_adl_returns_different_types_mutable.carbon +// CHECK:STDOUT: --- fail_todo_adl_returns_different_types_mutable.carbon = $fail_todo_adl_returns_different_types_mutable // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -4742,7 +4742,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %r.patt.loc69_84.2 => constants.%r.patt // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_adl_overloads.carbon +// CHECK:STDOUT: --- fail_todo_adl_overloads.carbon = $fail_todo_adl_overloads // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/stdlib/initializer_list.carbon b/toolchain/check/testdata/interop/cpp/stdlib/initializer_list.carbon index da21ec2f4496..32093d3b183d 100644 --- a/toolchain/check/testdata/interop/cpp/stdlib/initializer_list.carbon +++ b/toolchain/check/testdata/interop/cpp/stdlib/initializer_list.carbon @@ -50,7 +50,7 @@ fn F() { } //@dump-sem-ir-end -// CHECK:STDOUT: --- convert.carbon +// CHECK:STDOUT: --- convert.carbon = $convert // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/stdlib/string_view.carbon b/toolchain/check/testdata/interop/cpp/stdlib/string_view.carbon index f7897fdec026..3378d9b06b33 100644 --- a/toolchain/check/testdata/interop/cpp/stdlib/string_view.carbon +++ b/toolchain/check/testdata/interop/cpp/stdlib/string_view.carbon @@ -72,7 +72,7 @@ fn StarstWith(a: str, b: str) -> bool { } //@dump-sem-ir-end -// CHECK:STDOUT: --- pass_and_return.carbon +// CHECK:STDOUT: --- pass_and_return.carbon = $pass_and_return // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -162,7 +162,7 @@ fn StarstWith(a: str, b: str) -> bool { // CHECK:STDOUT: return %.loc14 to %return.param // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- call_base_method.carbon +// CHECK:STDOUT: --- call_base_method.carbon = $call_base_method // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/template/alias_template.carbon b/toolchain/check/testdata/interop/cpp/template/alias_template.carbon index d622db5413e3..a78164236432 100644 --- a/toolchain/check/testdata/interop/cpp/template/alias_template.carbon +++ b/toolchain/check/testdata/interop/cpp/template/alias_template.carbon @@ -31,7 +31,7 @@ var b2: Cpp.Second(Cpp.A, Cpp.B) = Cpp.B.B(); var a2: Cpp.Second(Cpp.B, Cpp.A) = Cpp.A.A(); //@dump-sem-ir-end -// CHECK:STDOUT: --- use_alias_template.carbon +// CHECK:STDOUT: --- use_alias_template.carbon = $use_alias_template // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/template/argument_count.carbon b/toolchain/check/testdata/interop/cpp/template/argument_count.carbon index 6fa7290e9ec5..4f4c28e163bf 100644 --- a/toolchain/check/testdata/interop/cpp/template/argument_count.carbon +++ b/toolchain/check/testdata/interop/cpp/template/argument_count.carbon @@ -146,7 +146,7 @@ var too_few: Cpp.FixedSizePack(Cpp.A, Cpp.A).Inner(Cpp.B); // CHECK:STDERR: var too_many: Cpp.FixedSizePack(Cpp.A, Cpp.A).Inner(Cpp.B, Cpp.B, Cpp.B); -// CHECK:STDOUT: --- valid.carbon +// CHECK:STDOUT: --- valid.carbon = $valid // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -194,7 +194,7 @@ var too_many: Cpp.FixedSizePack(Cpp.A, Cpp.A).Inner(Cpp.B, Cpp.B, Cpp.B); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- pack.carbon +// CHECK:STDOUT: --- pack.carbon = $pack // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/template/class_template.carbon b/toolchain/check/testdata/interop/cpp/template/class_template.carbon index 7df386b988bc..42c19f5e8ba9 100644 --- a/toolchain/check/testdata/interop/cpp/template/class_template.carbon +++ b/toolchain/check/testdata/interop/cpp/template/class_template.carbon @@ -30,7 +30,7 @@ import Cpp library "class_template.h"; var a: Cpp.A = Cpp.X(Cpp.A, Cpp.B).f({} as Cpp.B); //@dump-sem-ir-end -// CHECK:STDOUT: --- use_class_template.carbon +// CHECK:STDOUT: --- use_class_template.carbon = $use_class_template // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/template/concept.carbon b/toolchain/check/testdata/interop/cpp/template/concept.carbon index 1506e7c2c1f1..bbd0557eb466 100644 --- a/toolchain/check/testdata/interop/cpp/template/concept.carbon +++ b/toolchain/check/testdata/interop/cpp/template/concept.carbon @@ -33,7 +33,7 @@ var x1: X(Cpp.IsLarge(Cpp.Small)) = X(false).Make(); var x2: X(Cpp.IsLarge(Cpp.Large)) = X(true).Make(); //@dump-sem-ir-end -// CHECK:STDOUT: --- use_concept.carbon +// CHECK:STDOUT: --- use_concept.carbon = $use_concept // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/template/generic_call.carbon b/toolchain/check/testdata/interop/cpp/template/generic_call.carbon index 45a564fc2786..38027763cabc 100644 --- a/toolchain/check/testdata/interop/cpp/template/generic_call.carbon +++ b/toolchain/check/testdata/interop/cpp/template/generic_call.carbon @@ -33,7 +33,7 @@ fn G() { F({} as Cpp.X); } -// CHECK:STDOUT: --- generic_call.carbon +// CHECK:STDOUT: --- generic_call.carbon = $generic_call // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 b379e82b6540..c70574941bf2 100644 --- a/toolchain/check/testdata/interop/cpp/template/non_type_param.carbon +++ b/toolchain/check/testdata/interop/cpp/template/non_type_param.carbon @@ -191,7 +191,7 @@ fn G() -> i32 { return Cpp.X(i32, i32).n(1, 2); } -// CHECK:STDOUT: --- valid.carbon +// CHECK:STDOUT: --- valid.carbon = $valid // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -222,7 +222,7 @@ fn G() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- dependent.carbon +// CHECK:STDOUT: --- dependent.carbon = $dependent // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 ea73be4f32d1..fa3e5ab36980 100644 --- a/toolchain/check/testdata/interop/cpp/template/template_template_param.carbon +++ b/toolchain/check/testdata/interop/cpp/template/template_template_param.carbon @@ -103,7 +103,7 @@ import Cpp library "templates.h"; // CHECK:STDERR: var x: Cpp.TwoTemplates(Cpp.A, true); -// CHECK:STDOUT: --- valid.carbon +// CHECK:STDOUT: --- valid.carbon = $valid // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -151,7 +151,7 @@ var x: Cpp.TwoTemplates(Cpp.A, true); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_template_mismatch.carbon +// CHECK:STDOUT: --- fail_template_mismatch.carbon = $fail_template_mismatch // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: %x.var: ref = var_storage %x.var_patt [concrete = ] diff --git a/toolchain/check/testdata/interop/cpp/template/type_param.carbon b/toolchain/check/testdata/interop/cpp/template/type_param.carbon index 3bf997bb9673..dbb3cc7df571 100644 --- a/toolchain/check/testdata/interop/cpp/template/type_param.carbon +++ b/toolchain/check/testdata/interop/cpp/template/type_param.carbon @@ -72,7 +72,7 @@ import Cpp library "templates.h"; // CHECK:STDERR: var x: Cpp.TwoTypes(Cpp.A, {}); -// CHECK:STDOUT: --- valid.carbon +// CHECK:STDOUT: --- valid.carbon = $valid // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -120,7 +120,7 @@ var x: Cpp.TwoTypes(Cpp.A, {}); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- char.carbon +// CHECK:STDOUT: --- char.carbon = $char.2 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/template/var_template.carbon b/toolchain/check/testdata/interop/cpp/template/var_template.carbon index ff09f418ae72..b0eeb1811fc9 100644 --- a/toolchain/check/testdata/interop/cpp/template/var_template.carbon +++ b/toolchain/check/testdata/interop/cpp/template/var_template.carbon @@ -34,7 +34,7 @@ let pwa: Cpp.A* = &Cpp.Wrap.r#var(Cpp.A); let pwb: Cpp.B* = &Cpp.Wrap.r#var(Cpp.B); //@dump-sem-ir-end -// CHECK:STDOUT: --- use_var_template.carbon +// CHECK:STDOUT: --- use_var_template.carbon = $use_var_template // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/type_alias/import.carbon b/toolchain/check/testdata/interop/cpp/type_alias/import.carbon index a03fbfd5da56..136e6de55d82 100644 --- a/toolchain/check/testdata/interop/cpp/type_alias/import.carbon +++ b/toolchain/check/testdata/interop/cpp/type_alias/import.carbon @@ -49,7 +49,7 @@ fn H(var c: Cpp.C, var d: Cpp.D) { //@dump-sem-ir-end } -// CHECK:STDOUT: --- use_i32_typedef.carbon +// CHECK:STDOUT: --- use_i32_typedef.carbon = $use_i32_typedef // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -182,7 +182,7 @@ fn H(var c: Cpp.C, var d: Cpp.D) { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8(%self.param: ref %i32) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- use_class_typedef.carbon +// CHECK:STDOUT: --- use_class_typedef.carbon = $use_class_typedef // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/var/import/global.carbon b/toolchain/check/testdata/interop/cpp/var/import/global.carbon index c7907d27ad6c..2a7a4b8056d9 100644 --- a/toolchain/check/testdata/interop/cpp/var/import/global.carbon +++ b/toolchain/check/testdata/interop/cpp/var/import/global.carbon @@ -80,7 +80,7 @@ fn MyF() { let unused local: Cpp.UnusupportedType = Cpp.unsupported_global; } -// CHECK:STDOUT: --- import_global_scope.carbon +// CHECK:STDOUT: --- import_global_scope.carbon = $import_global_scope // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -196,7 +196,7 @@ fn MyF() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_import_unsupported_type.carbon +// CHECK:STDOUT: --- fail_import_unsupported_type.carbon = $fail_import_unsupported_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/interop/cpp/var/import/namespace.carbon b/toolchain/check/testdata/interop/cpp/var/import/namespace.carbon index 566175734294..35154aad8b56 100644 --- a/toolchain/check/testdata/interop/cpp/var/import/namespace.carbon +++ b/toolchain/check/testdata/interop/cpp/var/import/namespace.carbon @@ -45,7 +45,7 @@ fn F() { } //@dump-sem-ir-end -// CHECK:STDOUT: --- type_in_namespace.carbon +// CHECK:STDOUT: --- type_in_namespace.carbon = $type_in_namespace // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/lambda/lambda.carbon b/toolchain/check/testdata/lambda/lambda.carbon index 5dd3befbda1f..e1ae1c1e1cd2 100644 --- a/toolchain/check/testdata/lambda/lambda.carbon +++ b/toolchain/check/testdata/lambda/lambda.carbon @@ -506,7 +506,14 @@ fn F() { (fn => 0); } -// CHECK:STDOUT: --- empty.carbon +// --- dependent_terse_return.carbon +library "[[@TEST_NAME]]"; + +fn F() { + (fn [T: Core.Copy](x: T) => x); +} + +// CHECK:STDOUT: --- empty.carbon = $empty // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -529,7 +536,7 @@ fn F() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- identity.carbon +// CHECK:STDOUT: --- identity.carbon = $identity // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -675,7 +682,7 @@ fn F() { // CHECK:STDOUT: return %Int.as.Copy.impl.Op.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- terse_identity.carbon +// CHECK:STDOUT: --- terse_identity.carbon = $terse_identity // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -858,7 +865,7 @@ fn F() { // CHECK:STDOUT: return %.loc12_36.1 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- generic_identity.carbon +// CHECK:STDOUT: --- generic_identity.carbon = $generic_identity // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1119,7 +1126,7 @@ fn F() { // CHECK:STDOUT: %specific_impl_fn.loc5_60.2 => constants.%bool.as.Copy.impl.Op // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- generic_nested.carbon +// CHECK:STDOUT: --- generic_nested.carbon = $generic_nested // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1614,7 +1621,7 @@ fn F() { // CHECK:STDOUT: %specific_impl_fn.loc8_16.2 => constants.%bool.as.Copy.impl.Op // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- control_flow.carbon +// CHECK:STDOUT: --- control_flow.carbon = $control_flow // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/let/compile_time_bindings.carbon b/toolchain/check/testdata/let/compile_time_bindings.carbon index ffd5faca0310..fb96d27935ff 100644 --- a/toolchain/check/testdata/let/compile_time_bindings.carbon +++ b/toolchain/check/testdata/let/compile_time_bindings.carbon @@ -237,7 +237,7 @@ impl i32 as Empty { let generic Zero: i32 = 0; } -// CHECK:STDOUT: --- fail_let_after.carbon +// CHECK:STDOUT: --- fail_let_after.carbon = $fail_let_after // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -318,7 +318,7 @@ impl i32 as Empty { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_let_before.carbon +// CHECK:STDOUT: --- fail_let_before.carbon = $fail_let_before // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -399,7 +399,7 @@ impl i32 as Empty { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_multiple_lets.carbon +// CHECK:STDOUT: --- fail_multiple_lets.carbon = $fail_multiple_lets // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -483,7 +483,7 @@ impl i32 as Empty { // CHECK:STDOUT: %b.loc15_17.1 => constants.%b // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_invalid_let_after.carbon +// CHECK:STDOUT: --- fail_invalid_let_after.carbon = $fail_invalid_let_after // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -549,7 +549,7 @@ impl i32 as Empty { // CHECK:STDOUT: return %.loc5_26 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_use_in_function.carbon +// CHECK:STDOUT: --- fail_todo_use_in_function.carbon = $fail_todo_use_in_function // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -559,7 +559,7 @@ impl i32 as Empty { // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> out %return.param: %i32; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_use_in_block.carbon +// CHECK:STDOUT: --- fail_todo_use_in_block.carbon = $fail_todo_use_in_block // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -569,7 +569,7 @@ impl i32 as Empty { // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> out %return.param: %i32; // CHECK:STDOUT: -// CHECK:STDOUT: --- return_in_interface.carbon +// CHECK:STDOUT: --- return_in_interface.carbon = $return_in_interface // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -664,7 +664,7 @@ impl i32 as Empty { // CHECK:STDOUT: %return.patt.loc6_10.2 => constants.%return.patt // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_return_in_class.carbon +// CHECK:STDOUT: --- fail_return_in_class.carbon = $fail_return_in_class // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -733,7 +733,7 @@ impl i32 as Empty { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_return_in_package_scope.carbon +// CHECK:STDOUT: --- fail_return_in_package_scope.carbon = $fail_return_in_package_scope // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -789,7 +789,7 @@ impl i32 as Empty { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_use_in_impl.carbon +// CHECK:STDOUT: --- fail_use_in_impl.carbon = $fail_use_in_impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/let/convert.carbon b/toolchain/check/testdata/let/convert.carbon index 13e817f7f979..5390724ad588 100644 --- a/toolchain/check/testdata/let/convert.carbon +++ b/toolchain/check/testdata/let/convert.carbon @@ -50,7 +50,7 @@ fn G() { n = 1; } -// CHECK:STDOUT: --- convert.carbon +// CHECK:STDOUT: --- convert.carbon = $convert // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/let/fail_duplicate_decl.carbon b/toolchain/check/testdata/let/fail_duplicate_decl.carbon index fe163e11f37e..a6594651de10 100644 --- a/toolchain/check/testdata/let/fail_duplicate_decl.carbon +++ b/toolchain/check/testdata/let/fail_duplicate_decl.carbon @@ -28,7 +28,7 @@ fn F() { let unused a: i32 = 2; } -// CHECK:STDOUT: --- fail_duplicate_decl.carbon +// CHECK:STDOUT: --- fail_duplicate_decl.carbon = $fail_duplicate_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/let/fail_generic.carbon b/toolchain/check/testdata/let/fail_generic.carbon index 9f5a37adb7e7..95fc8d1ab431 100644 --- a/toolchain/check/testdata/let/fail_generic.carbon +++ b/toolchain/check/testdata/let/fail_generic.carbon @@ -28,7 +28,7 @@ fn F(unused a: i32) -> i32 { return x; } -// CHECK:STDOUT: --- fail_generic.carbon +// CHECK:STDOUT: --- fail_generic.carbon = $fail_generic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/let/fail_generic_import.carbon b/toolchain/check/testdata/let/fail_generic_import.carbon index 1521dc20562f..a79ee5a2a43f 100644 --- a/toolchain/check/testdata/let/fail_generic_import.carbon +++ b/toolchain/check/testdata/let/fail_generic_import.carbon @@ -40,7 +40,7 @@ impl package Implicit; // CHECK:STDERR: let a: T = 0; -// CHECK:STDOUT: --- fail_implicit.carbon +// CHECK:STDOUT: --- fail_implicit.carbon = $fail_implicit // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -84,7 +84,7 @@ let a: T = 0; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_implicit.impl.carbon +// CHECK:STDOUT: --- fail_implicit.impl.carbon = $fail_implicit.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/let/fail_missing_value.carbon b/toolchain/check/testdata/let/fail_missing_value.carbon index db5b3a63dc4f..547206d5a0db 100644 --- a/toolchain/check/testdata/let/fail_missing_value.carbon +++ b/toolchain/check/testdata/let/fail_missing_value.carbon @@ -33,7 +33,7 @@ fn F() { let unused n: i32; } -// CHECK:STDOUT: --- fail_missing_value.carbon +// CHECK:STDOUT: --- fail_missing_value.carbon = $fail_missing_value // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/let/fail_modifiers.carbon b/toolchain/check/testdata/let/fail_modifiers.carbon index 665a822ea9c2..100632a9fdde 100644 --- a/toolchain/check/testdata/let/fail_modifiers.carbon +++ b/toolchain/check/testdata/let/fail_modifiers.carbon @@ -114,7 +114,7 @@ protected private let h: i32 = 1; // CHECK:STDERR: protected protected let i: i32 = 1; -// CHECK:STDOUT: --- fail_modifiers.carbon +// CHECK:STDOUT: --- fail_modifiers.carbon = $fail_modifiers // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/let/fail_use_in_init.carbon b/toolchain/check/testdata/let/fail_use_in_init.carbon index de12cd57be27..b24de42d69ea 100644 --- a/toolchain/check/testdata/let/fail_use_in_init.carbon +++ b/toolchain/check/testdata/let/fail_use_in_init.carbon @@ -31,7 +31,7 @@ fn F() { let unused a: i32 = a; } -// CHECK:STDOUT: --- fail_use_in_init.carbon +// CHECK:STDOUT: --- fail_use_in_init.carbon = $fail_use_in_init // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/let/generic.carbon b/toolchain/check/testdata/let/generic.carbon index 205f19257336..584923acd90a 100644 --- a/toolchain/check/testdata/let/generic.carbon +++ b/toolchain/check/testdata/let/generic.carbon @@ -48,11 +48,11 @@ fn F(a: i32) -> i32 { return x; } -// CHECK:STDOUT: --- fail_todo_type.carbon +// CHECK:STDOUT: --- fail_todo_type.carbon = $fail_todo_type // CHECK:STDOUT: // CHECK:STDOUT: fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_assignment.carbon +// CHECK:STDOUT: --- fail_todo_assignment.carbon = $fail_todo_assignment // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/let/generic_import.carbon b/toolchain/check/testdata/let/generic_import.carbon index ea83111b4386..a881435e5b0d 100644 --- a/toolchain/check/testdata/let/generic_import.carbon +++ b/toolchain/check/testdata/let/generic_import.carbon @@ -46,7 +46,7 @@ var a: T*; // CHECK:STDERR: var b: T = *a; -// CHECK:STDOUT: --- fail_implicit.carbon +// CHECK:STDOUT: --- fail_implicit.carbon = $fail_implicit // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -90,7 +90,7 @@ var b: T = *a; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_implicit.impl.carbon +// CHECK:STDOUT: --- fail_implicit.impl.carbon = $fail_implicit.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/let/global.carbon b/toolchain/check/testdata/let/global.carbon index e80ddd62df7b..ad248b0076ce 100644 --- a/toolchain/check/testdata/let/global.carbon +++ b/toolchain/check/testdata/let/global.carbon @@ -16,7 +16,7 @@ let n: i32 = 1; fn F() -> i32 { return n; } -// CHECK:STDOUT: --- global.carbon +// CHECK:STDOUT: --- global.carbon = $global // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/let/import.carbon b/toolchain/check/testdata/let/import.carbon index 820ea44abab6..2194a9cf52a5 100644 --- a/toolchain/check/testdata/let/import.carbon +++ b/toolchain/check/testdata/let/import.carbon @@ -36,7 +36,7 @@ import Other; let b: () = Other.a; -// CHECK:STDOUT: --- implicit.carbon +// CHECK:STDOUT: --- implicit.carbon = $implicit // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -68,7 +68,7 @@ let b: () = Other.a; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- implicit.impl.carbon +// CHECK:STDOUT: --- implicit.impl.carbon = $implicit.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -106,7 +106,7 @@ let b: () = Other.a; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- other.carbon +// CHECK:STDOUT: --- other.carbon = $other // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -138,7 +138,7 @@ let b: () = Other.a; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_other.carbon +// CHECK:STDOUT: --- import_other.carbon = $import_other // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/let/import_access.carbon b/toolchain/check/testdata/let/import_access.carbon index 87d8e08a4e50..d75626098f9e 100644 --- a/toolchain/check/testdata/let/import_access.carbon +++ b/toolchain/check/testdata/let/import_access.carbon @@ -61,7 +61,7 @@ import Test library "def"; // CHECK:STDERR: let v2: () = Test.v; -// CHECK:STDOUT: --- def.carbon +// CHECK:STDOUT: --- def.carbon = $def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -93,7 +93,7 @@ let v2: () = Test.v; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- def.impl.carbon +// CHECK:STDOUT: --- def.impl.carbon = $def.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -131,7 +131,7 @@ let v2: () = Test.v; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_local_def.carbon +// CHECK:STDOUT: --- fail_local_def.carbon = $fail_local_def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -163,7 +163,7 @@ let v2: () = Test.v; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_other_def.carbon +// CHECK:STDOUT: --- fail_other_def.carbon = $fail_other_def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/let/lifetime.carbon b/toolchain/check/testdata/let/lifetime.carbon index d832aa1fd05d..1be978b73098 100644 --- a/toolchain/check/testdata/let/lifetime.carbon +++ b/toolchain/check/testdata/let/lifetime.carbon @@ -27,7 +27,7 @@ fn F() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- extend.carbon +// CHECK:STDOUT: --- extend.carbon = $extend // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/let/local.carbon b/toolchain/check/testdata/let/local.carbon index fd3a7383caf5..e4fee2d8c049 100644 --- a/toolchain/check/testdata/let/local.carbon +++ b/toolchain/check/testdata/let/local.carbon @@ -43,7 +43,7 @@ fn CallF() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- local.carbon +// CHECK:STDOUT: --- local.carbon = $local // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -86,7 +86,7 @@ fn CallF() { // CHECK:STDOUT: return %Int.as.Copy.impl.Op.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_symbolic.carbon +// CHECK:STDOUT: --- fail_todo_symbolic.carbon = $fail_todo_symbolic // CHECK:STDOUT: // CHECK:STDOUT: fn @CallF(); // CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/ref.carbon b/toolchain/check/testdata/let/ref.carbon index 3692aadff98f..8ae11f4f7346 100644 --- a/toolchain/check/testdata/let/ref.carbon +++ b/toolchain/check/testdata/let/ref.carbon @@ -56,7 +56,7 @@ fn F() { let unused ref a: i32 = G(); } -// CHECK:STDOUT: --- local.carbon +// CHECK:STDOUT: --- local.carbon = $local // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/let/shadowed_decl.carbon b/toolchain/check/testdata/let/shadowed_decl.carbon index a04f485c2fd1..b3dd3675bb4e 100644 --- a/toolchain/check/testdata/let/shadowed_decl.carbon +++ b/toolchain/check/testdata/let/shadowed_decl.carbon @@ -18,7 +18,7 @@ fn F(unused a: i32) -> i32 { return a; } -// CHECK:STDOUT: --- shadowed_decl.carbon +// CHECK:STDOUT: --- shadowed_decl.carbon = $shadowed_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/main_run/no_return.carbon b/toolchain/check/testdata/main_run/no_return.carbon index b4572effb9cd..55621eded224 100644 --- a/toolchain/check/testdata/main_run/no_return.carbon +++ b/toolchain/check/testdata/main_run/no_return.carbon @@ -24,7 +24,7 @@ library "[[@TEST_NAME]]"; // TODO: Switch a proper type for argv once we require one. fn Run(unused argc: i32, unused argv: i32*) {} -// CHECK:STDOUT: --- no_params.carbon +// CHECK:STDOUT: --- no_params.carbon = $no_params // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -53,7 +53,7 @@ fn Run(unused argc: i32, unused argv: i32*) {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- with_params.carbon +// CHECK:STDOUT: --- with_params.carbon = $with_params // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/main_run/return_i32.carbon b/toolchain/check/testdata/main_run/return_i32.carbon index f673f4f0779c..f0ddaf49e9ee 100644 --- a/toolchain/check/testdata/main_run/return_i32.carbon +++ b/toolchain/check/testdata/main_run/return_i32.carbon @@ -24,7 +24,7 @@ library "[[@TEST_NAME]]"; // TODO: Switch a proper type for argv once we require one. fn Run(unused argc: i32, unused argv: i32*) -> i32 { return 0; } -// CHECK:STDOUT: --- no_params.carbon +// CHECK:STDOUT: --- no_params.carbon = $no_params // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -99,7 +99,7 @@ fn Run(unused argc: i32, unused argv: i32*) -> i32 { return 0; } // CHECK:STDOUT: return %.loc4_27 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- with_params.carbon +// CHECK:STDOUT: --- with_params.carbon = $with_params // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/match_first/basic.carbon b/toolchain/check/testdata/match_first/basic.carbon index 3d0c72b50015..a20fd264fbc5 100644 --- a/toolchain/check/testdata/match_first/basic.carbon +++ b/toolchain/check/testdata/match_first/basic.carbon @@ -512,7 +512,7 @@ final match_first { //@dump-sem-ir-end } -// CHECK:STDOUT: --- decl.carbon +// CHECK:STDOUT: --- decl.carbon = $decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -540,7 +540,7 @@ final match_first { // CHECK:STDOUT: witness = %Z.impl_witness // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- definition.carbon +// CHECK:STDOUT: --- definition.carbon = $definition // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -570,7 +570,7 @@ final match_first { // CHECK:STDOUT: witness = %Z.impl_witness // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- redecl_defined.carbon +// CHECK:STDOUT: --- redecl_defined.carbon = $redecl_defined // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -598,7 +598,7 @@ final match_first { // CHECK:STDOUT: witness = %Z.impl_witness // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- final_block_redecl.carbon +// CHECK:STDOUT: --- final_block_redecl.carbon = $final_block_redecl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -626,7 +626,7 @@ final match_first { // CHECK:STDOUT: witness = %Z.impl_witness // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- final_block_decl.carbon +// CHECK:STDOUT: --- final_block_decl.carbon = $final_block_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -654,7 +654,7 @@ final match_first { // CHECK:STDOUT: witness = %Z.impl_witness // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- final_block_defined.carbon +// CHECK:STDOUT: --- final_block_defined.carbon = $final_block_defined // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/named_constraint/basic.carbon b/toolchain/check/testdata/named_constraint/basic.carbon index d2e8e84338e3..cb8c09aff76b 100644 --- a/toolchain/check/testdata/named_constraint/basic.carbon +++ b/toolchain/check/testdata/named_constraint/basic.carbon @@ -60,7 +60,7 @@ constraint Declared {} // CHECK:STDERR: constraint Declared {} -// CHECK:STDOUT: --- definition.carbon +// CHECK:STDOUT: --- definition.carbon = $definition // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -87,7 +87,7 @@ constraint Declared {} // CHECK:STDOUT: // CHECK:STDOUT: specific @Declared.WithSelf(constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- forward_declaration.carbon +// CHECK:STDOUT: --- forward_declaration.carbon = $forward_declaration // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/named_constraint/convert.carbon b/toolchain/check/testdata/named_constraint/convert.carbon index 441a2374ff61..6ec6274997bf 100644 --- a/toolchain/check/testdata/named_constraint/convert.carbon +++ b/toolchain/check/testdata/named_constraint/convert.carbon @@ -59,7 +59,7 @@ fn G(generic T: Z) { F(C); } -// CHECK:STDOUT: --- type_and_with_named_constraint_self.carbon +// CHECK:STDOUT: --- type_and_with_named_constraint_self.carbon = $type_and_with_named_constraint_self // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -129,7 +129,7 @@ fn G(generic T: Z) { // CHECK:STDOUT: %T.loc8_15.1 => constants.%T.f45530.2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- compatible_constraints.carbon +// CHECK:STDOUT: --- compatible_constraints.carbon = $compatible_constraints // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/named_constraint/empty.carbon b/toolchain/check/testdata/named_constraint/empty.carbon index 793a8cb206f9..87a0767f1d33 100644 --- a/toolchain/check/testdata/named_constraint/empty.carbon +++ b/toolchain/check/testdata/named_constraint/empty.carbon @@ -31,7 +31,7 @@ fn G(generic T: Z, generic U: type, generic V: Empty) { } //@dump-sem-ir-end -// CHECK:STDOUT: --- empty.carbon +// CHECK:STDOUT: --- empty.carbon = $empty // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/named_constraint/empty_generic.carbon b/toolchain/check/testdata/named_constraint/empty_generic.carbon index c9a9b5016c9f..60a92402e172 100644 --- a/toolchain/check/testdata/named_constraint/empty_generic.carbon +++ b/toolchain/check/testdata/named_constraint/empty_generic.carbon @@ -26,7 +26,7 @@ fn G(generic T: Z, generic U: Empty(T), generic V: type) { } //@dump-sem-ir-end -// CHECK:STDOUT: --- empty_generic.carbon +// CHECK:STDOUT: --- empty_generic.carbon = $empty_generic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/named_constraint/extend_name_lookup.carbon b/toolchain/check/testdata/named_constraint/extend_name_lookup.carbon index 59ad8891e5dd..aa8491152bd1 100644 --- a/toolchain/check/testdata/named_constraint/extend_name_lookup.carbon +++ b/toolchain/check/testdata/named_constraint/extend_name_lookup.carbon @@ -102,7 +102,7 @@ fn F(generic T: type where .Self impls W) { T.YF(); } -// CHECK:STDOUT: --- facet_type_extends_and_constraint_extends.carbon +// CHECK:STDOUT: --- facet_type_extends_and_constraint_extends.carbon = $facet_type_extends_and_constraint_extends // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -193,7 +193,7 @@ fn F(generic T: type where .Self impls W) { // CHECK:STDOUT: %T.loc12_15.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- facet_type_does_not_extend_and_constraint_extends.carbon +// CHECK:STDOUT: --- facet_type_does_not_extend_and_constraint_extends.carbon = $facet_type_does_not_extend_and_constraint_extends // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/named_constraint/extend_require_call.carbon b/toolchain/check/testdata/named_constraint/extend_require_call.carbon index fa7d9f8d1167..c0a393dea734 100644 --- a/toolchain/check/testdata/named_constraint/extend_require_call.carbon +++ b/toolchain/check/testdata/named_constraint/extend_require_call.carbon @@ -22,7 +22,7 @@ constraint C { } //@dump-sem-ir-end -// CHECK:STDOUT: --- extend_require_call.carbon +// CHECK:STDOUT: --- extend_require_call.carbon = $extend_require_call // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/named_constraint/generic.carbon b/toolchain/check/testdata/named_constraint/generic.carbon index fded4ea00827..10d8b5e508bf 100644 --- a/toolchain/check/testdata/named_constraint/generic.carbon +++ b/toolchain/check/testdata/named_constraint/generic.carbon @@ -97,7 +97,7 @@ constraint Generic(T: type) {} // CHECK:STDERR: fn F(unused generic T: Generic((), ())) {} -// CHECK:STDOUT: --- generic.carbon +// CHECK:STDOUT: --- generic.carbon = $generic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/named_constraint/import_constraint_decl.carbon b/toolchain/check/testdata/named_constraint/import_constraint_decl.carbon index 34bef1746541..f7963241e74c 100644 --- a/toolchain/check/testdata/named_constraint/import_constraint_decl.carbon +++ b/toolchain/check/testdata/named_constraint/import_constraint_decl.carbon @@ -68,7 +68,7 @@ impl C as B; // This requires that B is complete. impl C as B {} -// CHECK:STDOUT: --- a.impl.carbon +// CHECK:STDOUT: --- a.impl.carbon = $a.impl // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Main.A = import_ref Main//a, A, unloaded @@ -82,7 +82,7 @@ impl C as B {} // CHECK:STDOUT: %default.import.loc2_17.2 = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- b.impl.carbon +// CHECK:STDOUT: --- b.impl.carbon = $b.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/named_constraint/import_type_and.carbon b/toolchain/check/testdata/named_constraint/import_type_and.carbon index b4edeb0cb947..5bba759cbd26 100644 --- a/toolchain/check/testdata/named_constraint/import_type_and.carbon +++ b/toolchain/check/testdata/named_constraint/import_type_and.carbon @@ -29,7 +29,7 @@ impl library "[[@TEST_NAME]]"; fn F(generic _: N) {} -// CHECK:STDOUT: --- import.carbon +// CHECK:STDOUT: --- import.carbon = $import // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -144,7 +144,7 @@ fn F(generic _: N) {} // CHECK:STDOUT: %Self.as_type.loc9_11.2 => constants.%Self.as_type.138 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import.impl.carbon +// CHECK:STDOUT: --- import.impl.carbon = $import.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/named_constraint/require.carbon b/toolchain/check/testdata/named_constraint/require.carbon index 4cf1953ec488..55ddb1b21d6b 100644 --- a/toolchain/check/testdata/named_constraint/require.carbon +++ b/toolchain/check/testdata/named_constraint/require.carbon @@ -879,7 +879,7 @@ constraint N { require impls Z where .Z1 = .Z2 and .Z2 = .Z1; } -// CHECK:STDOUT: --- extend.carbon +// CHECK:STDOUT: --- extend.carbon = $extend // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1010,7 +1010,7 @@ constraint N { // CHECK:STDOUT: %Self.as_type.loc9_18.2 => constants.%T.as_type // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- extend_with_self.carbon +// CHECK:STDOUT: --- extend_with_self.carbon = $extend_with_self // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1181,7 +1181,7 @@ constraint N { // CHECK:STDOUT: %Y.type.loc9_30.2 => constants.%Y.type.7e4 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- implicit_self_impls.carbon +// CHECK:STDOUT: --- implicit_self_impls.carbon = $implicit_self_impls // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1241,7 +1241,7 @@ constraint N { // CHECK:STDOUT: %Self.as_type.loc9_11.2 => constants.%T.as_type // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- explicit_self_impls.carbon +// CHECK:STDOUT: --- explicit_self_impls.carbon = $explicit_self_impls // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1303,7 +1303,7 @@ constraint N { // CHECK:STDOUT: %Self.as_type.loc9_11.2 => constants.%T.as_type // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- explicit_self_specific_impls.carbon +// CHECK:STDOUT: --- explicit_self_specific_impls.carbon = $explicit_self_specific_impls // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1363,7 +1363,7 @@ constraint N { // CHECK:STDOUT: %C.loc9_17.2 => constants.%C.f15 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- require_impls_where.carbon +// CHECK:STDOUT: --- require_impls_where.carbon = $require_impls_where // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1452,7 +1452,7 @@ constraint N { // CHECK:STDOUT: %Y_where.type.loc7_19.2 => constants.%Y_where.type.11e // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_require_impls_incomplete_constraint.carbon +// CHECK:STDOUT: --- fail_require_impls_incomplete_constraint.carbon = $fail_require_impls_incomplete_constraint // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1478,7 +1478,7 @@ constraint N { // CHECK:STDOUT: // CHECK:STDOUT: specific @Z.WithSelf(constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_require_impls_without_self.carbon +// CHECK:STDOUT: --- fail_require_impls_without_self.carbon = $fail_require_impls_without_self // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1534,7 +1534,7 @@ constraint N { // CHECK:STDOUT: // CHECK:STDOUT: specific @Z.WithSelf(constants.%T, constants.%Self.22b) {} // CHECK:STDOUT: -// CHECK:STDOUT: --- require_self_in_requirement.carbon +// CHECK:STDOUT: --- require_self_in_requirement.carbon = $require_self_in_requirement // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1624,7 +1624,7 @@ constraint N { // CHECK:STDOUT: %Y_where.type.loc10_19.3 => constants.%Y_where.type.4d3 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- require_with_period_self_impls.carbon +// CHECK:STDOUT: --- require_with_period_self_impls.carbon = $require_with_period_self_impls // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1724,7 +1724,7 @@ constraint N { // CHECK:STDOUT: %Z_where.type.loc10_19.2 => constants.%Z_where.type.8a6 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- require_with_specific_period_self.carbon +// CHECK:STDOUT: --- require_with_specific_period_self.carbon = $require_with_specific_period_self // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/namespace/add_to_import.carbon b/toolchain/check/testdata/namespace/add_to_import.carbon index 668a31dc4892..cfe4e98ec10e 100644 --- a/toolchain/check/testdata/namespace/add_to_import.carbon +++ b/toolchain/check/testdata/namespace/add_to_import.carbon @@ -26,7 +26,7 @@ fn NS.A() -> i32 { return 0; } var a: i32 = NS.A(); -// CHECK:STDOUT: --- implicit.carbon +// CHECK:STDOUT: --- implicit.carbon = $implicit // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [concrete] { @@ -44,7 +44,7 @@ var a: i32 = NS.A(); // CHECK:STDOUT: %NS: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- implicit.impl.carbon +// CHECK:STDOUT: --- implicit.impl.carbon = $implicit.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/namespace/alias.carbon b/toolchain/check/testdata/namespace/alias.carbon index da9c8887ec15..fb5d2aa4fc5b 100644 --- a/toolchain/check/testdata/namespace/alias.carbon +++ b/toolchain/check/testdata/namespace/alias.carbon @@ -24,7 +24,7 @@ alias C = NS.A; fn D() -> i32 { return C(); } -// CHECK:STDOUT: --- alias.carbon +// CHECK:STDOUT: --- alias.carbon = $alias // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/namespace/fail_conflict_after_merge.carbon b/toolchain/check/testdata/namespace/fail_conflict_after_merge.carbon index cf01163ae45d..7582ea239135 100644 --- a/toolchain/check/testdata/namespace/fail_conflict_after_merge.carbon +++ b/toolchain/check/testdata/namespace/fail_conflict_after_merge.carbon @@ -60,7 +60,7 @@ namespace NS; // CHECK:STDERR: fn NS(); -// CHECK:STDOUT: --- namespace.carbon +// CHECK:STDOUT: --- namespace.carbon = $namespace // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [concrete] { @@ -78,7 +78,7 @@ fn NS(); // CHECK:STDOUT: %NS: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_conflict.carbon +// CHECK:STDOUT: --- fail_conflict.carbon = $fail_conflict // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_first.carbon b/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_first.carbon index e8ff0a8ebb0d..a94a7bb89a1a 100644 --- a/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_first.carbon +++ b/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_first.carbon @@ -40,7 +40,7 @@ fn NS(); fn NS.Foo(); -// CHECK:STDOUT: --- namespace.carbon +// CHECK:STDOUT: --- namespace.carbon = $namespace // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [concrete] { @@ -58,7 +58,7 @@ fn NS.Foo(); // CHECK:STDOUT: %NS: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_conflict.carbon +// CHECK:STDOUT: --- fail_conflict.carbon = $fail_conflict // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_nested.carbon b/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_nested.carbon index c6aebbad2b64..f400ba3c2f7d 100644 --- a/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_nested.carbon +++ b/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_nested.carbon @@ -46,7 +46,7 @@ namespace Other; // CHECK:STDERR: fn Other.Nested.F(); -// CHECK:STDOUT: --- fn.carbon +// CHECK:STDOUT: --- fn.carbon = $fn // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [concrete] { @@ -64,7 +64,7 @@ fn Other.Nested.F(); // CHECK:STDOUT: %Nested: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_conflict.carbon +// CHECK:STDOUT: --- fail_conflict.carbon = $fail_conflict // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_second.carbon b/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_second.carbon index 02fc1afd8325..d88aea0db9ec 100644 --- a/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_second.carbon +++ b/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_second.carbon @@ -53,7 +53,7 @@ namespace NS; // CHECK:STDERR: fn NS.Foo(); -// CHECK:STDOUT: --- fn.carbon +// CHECK:STDOUT: --- fn.carbon = $fn // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -79,7 +79,7 @@ fn NS.Foo(); // CHECK:STDOUT: // CHECK:STDOUT: fn @NS(); // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_conflict.carbon +// CHECK:STDOUT: --- fail_conflict.carbon = $fail_conflict // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_first.carbon b/toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_first.carbon index 19a6f834b2a0..616f7de30d33 100644 --- a/toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_first.carbon +++ b/toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_first.carbon @@ -47,7 +47,7 @@ import library "fn"; fn NS.Bar() {} -// CHECK:STDOUT: --- namespace.carbon +// CHECK:STDOUT: --- namespace.carbon = $namespace // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -79,7 +79,7 @@ fn NS.Bar() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fn.carbon +// CHECK:STDOUT: --- fn.carbon = $fn // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -108,7 +108,7 @@ fn NS.Bar() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_conflict.carbon +// CHECK:STDOUT: --- fail_conflict.carbon = $fail_conflict // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_second.carbon b/toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_second.carbon index 639404f31458..5bec5f78cfed 100644 --- a/toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_second.carbon +++ b/toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_second.carbon @@ -47,7 +47,7 @@ import library "namespace"; fn NS.Bar() {} -// CHECK:STDOUT: --- fn.carbon +// CHECK:STDOUT: --- fn.carbon = $fn // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -76,7 +76,7 @@ fn NS.Bar() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- namespace.carbon +// CHECK:STDOUT: --- namespace.carbon = $namespace // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -108,7 +108,7 @@ fn NS.Bar() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_conflict.carbon +// CHECK:STDOUT: --- fail_conflict.carbon = $fail_conflict // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/namespace/fail_decl_in_alias.carbon b/toolchain/check/testdata/namespace/fail_decl_in_alias.carbon index 312f2f5b9590..18641e0a03ae 100644 --- a/toolchain/check/testdata/namespace/fail_decl_in_alias.carbon +++ b/toolchain/check/testdata/namespace/fail_decl_in_alias.carbon @@ -32,7 +32,7 @@ alias ns = NS; // CHECK:STDERR: fn ns.A() -> i32 { return 0; } -// CHECK:STDOUT: --- fail_decl_in_alias.carbon +// CHECK:STDOUT: --- fail_decl_in_alias.carbon = $fail_decl_in_alias // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/namespace/fail_duplicate.carbon b/toolchain/check/testdata/namespace/fail_duplicate.carbon index d0ae524e22d1..3166d1818831 100644 --- a/toolchain/check/testdata/namespace/fail_duplicate.carbon +++ b/toolchain/check/testdata/namespace/fail_duplicate.carbon @@ -30,7 +30,7 @@ fn Foo.Baz() { fn Foo.Baz() { } -// CHECK:STDOUT: --- fail_duplicate.carbon +// CHECK:STDOUT: --- fail_duplicate.carbon = $fail_duplicate // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/namespace/fail_modifiers.carbon b/toolchain/check/testdata/namespace/fail_modifiers.carbon index 787c62a9d749..fc0fc3fd9b92 100644 --- a/toolchain/check/testdata/namespace/fail_modifiers.carbon +++ b/toolchain/check/testdata/namespace/fail_modifiers.carbon @@ -83,7 +83,7 @@ impl namespace B; // CHECK:STDERR: extern namespace C; -// CHECK:STDOUT: --- fail_modifiers.carbon +// CHECK:STDOUT: --- fail_modifiers.carbon = $fail_modifiers // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [concrete] { diff --git a/toolchain/check/testdata/namespace/fail_not_top_level.carbon b/toolchain/check/testdata/namespace/fail_not_top_level.carbon index 3aff9e63a9f3..47c53de1c7dd 100644 --- a/toolchain/check/testdata/namespace/fail_not_top_level.carbon +++ b/toolchain/check/testdata/namespace/fail_not_top_level.carbon @@ -48,7 +48,7 @@ interface I { fn N.I() {} } -// CHECK:STDOUT: --- fail_not_top_level.carbon +// CHECK:STDOUT: --- fail_not_top_level.carbon = $fail_not_top_level // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/namespace/fail_params.carbon b/toolchain/check/testdata/namespace/fail_params.carbon index 75d6c323bde8..234c413dc2d5 100644 --- a/toolchain/check/testdata/namespace/fail_params.carbon +++ b/toolchain/check/testdata/namespace/fail_params.carbon @@ -58,7 +58,7 @@ namespace D; // CHECK:STDERR: fn D(unused T: type).F() {} -// CHECK:STDOUT: --- fail_params.carbon +// CHECK:STDOUT: --- fail_params.carbon = $fail_params // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/namespace/fail_unresolved_scope.carbon b/toolchain/check/testdata/namespace/fail_unresolved_scope.carbon index 604d89ac0198..bc3db3a43484 100644 --- a/toolchain/check/testdata/namespace/fail_unresolved_scope.carbon +++ b/toolchain/check/testdata/namespace/fail_unresolved_scope.carbon @@ -21,7 +21,7 @@ fn Foo.Baz() { } -// CHECK:STDOUT: --- fail_unresolved_scope.carbon +// CHECK:STDOUT: --- fail_unresolved_scope.carbon = $fail_unresolved_scope // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/namespace/function.carbon b/toolchain/check/testdata/namespace/function.carbon index 16eb396441af..cc0f62c80ea7 100644 --- a/toolchain/check/testdata/namespace/function.carbon +++ b/toolchain/check/testdata/namespace/function.carbon @@ -25,7 +25,7 @@ fn Bar() { Foo.Baz(); } -// CHECK:STDOUT: --- function.carbon +// CHECK:STDOUT: --- function.carbon = $function // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/namespace/imported.carbon b/toolchain/check/testdata/namespace/imported.carbon index e9963d0b1c55..cca4f0972f34 100644 --- a/toolchain/check/testdata/namespace/imported.carbon +++ b/toolchain/check/testdata/namespace/imported.carbon @@ -32,7 +32,7 @@ var b: () = NS.ChildNS.B(); var package_a: () = package.NS.A(); var package_b: () = package.NS.ChildNS.B(); -// CHECK:STDOUT: --- implicit.carbon +// CHECK:STDOUT: --- implicit.carbon = $implicit // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -70,7 +70,7 @@ var package_b: () = package.NS.ChildNS.B(); // CHECK:STDOUT: // CHECK:STDOUT: fn @B(); // CHECK:STDOUT: -// CHECK:STDOUT: --- implicit.impl.carbon +// CHECK:STDOUT: --- implicit.impl.carbon = $implicit.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/namespace/imported_indirect.carbon b/toolchain/check/testdata/namespace/imported_indirect.carbon index 725501216c20..1a1ed7dda7a4 100644 --- a/toolchain/check/testdata/namespace/imported_indirect.carbon +++ b/toolchain/check/testdata/namespace/imported_indirect.carbon @@ -104,7 +104,7 @@ import Same library "b"; // CHECK:STDERR: fn G() { Same.F(); } -// CHECK:STDOUT: --- a.carbon +// CHECK:STDOUT: --- a.carbon = $a // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -132,7 +132,7 @@ fn G() { Same.F(); } // CHECK:STDOUT: // CHECK:STDOUT: class @C; // CHECK:STDOUT: -// CHECK:STDOUT: --- b.carbon +// CHECK:STDOUT: --- b.carbon = $b // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -183,7 +183,7 @@ fn G() { Same.F(); } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> out %return.param: %C; // CHECK:STDOUT: -// CHECK:STDOUT: --- c.carbon +// CHECK:STDOUT: --- c.carbon = $c // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Same.A: = import_ref Same//b, A, loaded @@ -212,7 +212,7 @@ fn G() { Same.F(); } // CHECK:STDOUT: %C: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- d.carbon +// CHECK:STDOUT: --- d.carbon = $d // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -254,7 +254,7 @@ fn G() { Same.F(); } // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- e.carbon +// CHECK:STDOUT: --- e.carbon = $e // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -320,7 +320,7 @@ fn G() { Same.F(); } // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_named_indirectly_same_package.carbon +// CHECK:STDOUT: --- fail_named_indirectly_same_package.carbon = $fail_named_indirectly_same_package // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -367,7 +367,7 @@ fn G() { Same.F(); } // CHECK:STDOUT: // CHECK:STDOUT: fn @F [from "b.carbon"]; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_named_indirectly_different_package.carbon +// CHECK:STDOUT: --- fail_named_indirectly_different_package.carbon = $fail_named_indirectly_different_package // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/namespace/merging.carbon b/toolchain/check/testdata/namespace/merging.carbon index aaf1cfbbbe22..be8a9dca8660 100644 --- a/toolchain/check/testdata/namespace/merging.carbon +++ b/toolchain/check/testdata/namespace/merging.carbon @@ -50,7 +50,7 @@ fn Run() { NS.C(); } -// CHECK:STDOUT: --- a.carbon +// CHECK:STDOUT: --- a.carbon = $a // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -82,7 +82,7 @@ fn Run() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- b.carbon +// CHECK:STDOUT: --- b.carbon = $b // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -127,7 +127,7 @@ fn Run() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- c.carbon +// CHECK:STDOUT: --- c.carbon = $c // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/namespace/merging_with_indirections.carbon b/toolchain/check/testdata/namespace/merging_with_indirections.carbon index 7de0a7f3be27..8ec2b0a2ce50 100644 --- a/toolchain/check/testdata/namespace/merging_with_indirections.carbon +++ b/toolchain/check/testdata/namespace/merging_with_indirections.carbon @@ -45,7 +45,7 @@ fn Run() { a = Other.F(); } -// CHECK:STDOUT: --- a.carbon +// CHECK:STDOUT: --- a.carbon = $a // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -81,7 +81,7 @@ fn Run() { // CHECK:STDOUT: .Self = constants.%A // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- b.carbon +// CHECK:STDOUT: --- b.carbon = $b // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -162,7 +162,7 @@ fn Run() { // CHECK:STDOUT: return %.loc8_28 to %return.param // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- main.carbon +// CHECK:STDOUT: --- main.carbon = $main // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/namespace/nested.carbon b/toolchain/check/testdata/namespace/nested.carbon index bab6032f2b6f..298479f1f71b 100644 --- a/toolchain/check/testdata/namespace/nested.carbon +++ b/toolchain/check/testdata/namespace/nested.carbon @@ -22,7 +22,7 @@ fn Foo.Bar.Baz() { Foo.Bar.Wiz(); } -// CHECK:STDOUT: --- nested.carbon +// CHECK:STDOUT: --- nested.carbon = $nested // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/namespace/shadow.carbon b/toolchain/check/testdata/namespace/shadow.carbon index 21c37929f002..873c8f202044 100644 --- a/toolchain/check/testdata/namespace/shadow.carbon +++ b/toolchain/check/testdata/namespace/shadow.carbon @@ -31,7 +31,7 @@ fn N.M.B() -> i32 { return 0; } -// CHECK:STDOUT: --- shadow.carbon +// CHECK:STDOUT: --- shadow.carbon = $shadow // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/namespace/unqualified_lookup.carbon b/toolchain/check/testdata/namespace/unqualified_lookup.carbon index 9f3d129c3410..8141dfbe114a 100644 --- a/toolchain/check/testdata/namespace/unqualified_lookup.carbon +++ b/toolchain/check/testdata/namespace/unqualified_lookup.carbon @@ -34,7 +34,7 @@ fn OuterN.InnerN.CallABC() { C(); } -// CHECK:STDOUT: --- unqualified_lookup.carbon +// CHECK:STDOUT: --- unqualified_lookup.carbon = $unqualified_lookup // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/builtin/and.carbon b/toolchain/check/testdata/operators/builtin/and.carbon index 0d3c8215fa40..7cd6d530de37 100644 --- a/toolchain/check/testdata/operators/builtin/and.carbon +++ b/toolchain/check/testdata/operators/builtin/and.carbon @@ -30,7 +30,7 @@ fn PartialConstant(x: bool) { var unused a: if false and x then bool else () = (); } -// CHECK:STDOUT: --- and.carbon +// CHECK:STDOUT: --- and.carbon = $and // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/builtin/assignment.carbon b/toolchain/check/testdata/operators/builtin/assignment.carbon index 695110d81a59..bb5be5cca99a 100644 --- a/toolchain/check/testdata/operators/builtin/assignment.carbon +++ b/toolchain/check/testdata/operators/builtin/assignment.carbon @@ -30,7 +30,7 @@ fn Main() { *(if true then p else &a) = 10; } -// CHECK:STDOUT: --- assignment.carbon +// CHECK:STDOUT: --- assignment.carbon = $assignment // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/builtin/fail_and_or_not_in_function.carbon b/toolchain/check/testdata/operators/builtin/fail_and_or_not_in_function.carbon index a8d1e9607a80..8e0eb51aeedd 100644 --- a/toolchain/check/testdata/operators/builtin/fail_and_or_not_in_function.carbon +++ b/toolchain/check/testdata/operators/builtin/fail_and_or_not_in_function.carbon @@ -122,7 +122,7 @@ fn F() { } } -// CHECK:STDOUT: --- fail_and.carbon +// CHECK:STDOUT: --- fail_and.carbon = $fail_and // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -160,9 +160,9 @@ fn F() { // CHECK:STDOUT: return %type.as.Copy.impl.Op.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_and_val.carbon +// CHECK:STDOUT: --- fail_and_val.carbon = $fail_and_val // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_or.carbon +// CHECK:STDOUT: --- fail_or.carbon = $fail_or // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -200,9 +200,9 @@ fn F() { // CHECK:STDOUT: return %type.as.Copy.impl.Op.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_or_val.carbon +// CHECK:STDOUT: --- fail_or_val.carbon = $fail_or_val // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_nested.carbon +// CHECK:STDOUT: --- fail_nested.carbon = $fail_nested // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 ed049d2881d7..e5b5f0ea294b 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 @@ -60,7 +60,7 @@ fn KnownValueButNonConstantCondition(x: bool) { var unused d: if x or true then bool else (); } -// CHECK:STDOUT: --- fail_non_constant_result.carbon +// CHECK:STDOUT: --- fail_non_constant_result.carbon = $fail_non_constant_result // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -182,7 +182,7 @@ fn KnownValueButNonConstantCondition(x: bool) { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_despite_known_result.carbon +// CHECK:STDOUT: --- fail_despite_known_result.carbon = $fail_despite_known_result // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/builtin/fail_assignment_to_error.carbon b/toolchain/check/testdata/operators/builtin/fail_assignment_to_error.carbon index c0f016edc49c..0289c5694a79 100644 --- a/toolchain/check/testdata/operators/builtin/fail_assignment_to_error.carbon +++ b/toolchain/check/testdata/operators/builtin/fail_assignment_to_error.carbon @@ -29,7 +29,7 @@ fn Main() { *also_undeclared = 42; } -// CHECK:STDOUT: --- fail_assignment_to_error.carbon +// CHECK:STDOUT: --- fail_assignment_to_error.carbon = $fail_assignment_to_error // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 2f843beb6bf6..58cf4693705d 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 @@ -79,7 +79,7 @@ fn Main() { (if true then a else a) = 10; } -// CHECK:STDOUT: --- fail_assignment_to_non_assignable.carbon +// CHECK:STDOUT: --- fail_assignment_to_non_assignable.carbon = $fail_assignment_to_non_assignable // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 d4385f869f0b..75a5678cd684 100644 --- a/toolchain/check/testdata/operators/builtin/fail_redundant_compound_access.carbon +++ b/toolchain/check/testdata/operators/builtin/fail_redundant_compound_access.carbon @@ -36,7 +36,7 @@ fn Main() { a = a.(F)(); } -// CHECK:STDOUT: --- fail_redundant_compound_access.carbon +// CHECK:STDOUT: --- fail_redundant_compound_access.carbon = $fail_redundant_compound_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/builtin/fail_type_mismatch.carbon b/toolchain/check/testdata/operators/builtin/fail_type_mismatch.carbon index 19dab190d89e..6b29920ee81d 100644 --- a/toolchain/check/testdata/operators/builtin/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/operators/builtin/fail_type_mismatch.carbon @@ -27,7 +27,7 @@ fn Main() { var unused x: bool = not 12; } -// CHECK:STDOUT: --- fail_type_mismatch.carbon +// CHECK:STDOUT: --- fail_type_mismatch.carbon = $fail_type_mismatch // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 44d0d83c2850..64d6d056ae09 100644 --- a/toolchain/check/testdata/operators/builtin/fail_type_mismatch_assignment.carbon +++ b/toolchain/check/testdata/operators/builtin/fail_type_mismatch_assignment.carbon @@ -28,7 +28,7 @@ fn Main() { a = 5.6; } -// CHECK:STDOUT: --- fail_type_mismatch_assignment.carbon +// CHECK:STDOUT: --- fail_type_mismatch_assignment.carbon = $fail_type_mismatch_assignment // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/builtin/fail_type_mismatch_once.carbon b/toolchain/check/testdata/operators/builtin/fail_type_mismatch_once.carbon index 212194cd0f30..0cfb744a68d5 100644 --- a/toolchain/check/testdata/operators/builtin/fail_type_mismatch_once.carbon +++ b/toolchain/check/testdata/operators/builtin/fail_type_mismatch_once.carbon @@ -27,7 +27,7 @@ fn Main() -> i32 { return {} + 3.4 + 12; } -// CHECK:STDOUT: --- fail_type_mismatch_once.carbon +// CHECK:STDOUT: --- fail_type_mismatch_once.carbon = $fail_type_mismatch_once // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/builtin/fail_unimplemented_op.carbon b/toolchain/check/testdata/operators/builtin/fail_unimplemented_op.carbon index fe996c028bfc..f164875cdcb6 100644 --- a/toolchain/check/testdata/operators/builtin/fail_unimplemented_op.carbon +++ b/toolchain/check/testdata/operators/builtin/fail_unimplemented_op.carbon @@ -25,7 +25,7 @@ fn Main() -> i32 { return {} + 34; } -// CHECK:STDOUT: --- fail_unimplemented_op.carbon +// CHECK:STDOUT: --- fail_unimplemented_op.carbon = $fail_unimplemented_op // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/builtin/or.carbon b/toolchain/check/testdata/operators/builtin/or.carbon index ac75c6605b61..d1ea31db2971 100644 --- a/toolchain/check/testdata/operators/builtin/or.carbon +++ b/toolchain/check/testdata/operators/builtin/or.carbon @@ -30,7 +30,7 @@ fn PartialConstant(x: bool) { var unused a: if true or x then bool else () = true; } -// CHECK:STDOUT: --- or.carbon +// CHECK:STDOUT: --- or.carbon = $or // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/builtin/unary_op.carbon b/toolchain/check/testdata/operators/builtin/unary_op.carbon index 12ad23d33d60..718d6bff4805 100644 --- a/toolchain/check/testdata/operators/builtin/unary_op.carbon +++ b/toolchain/check/testdata/operators/builtin/unary_op.carbon @@ -24,7 +24,7 @@ fn Constant() { var unused b: if not false then bool else () = true; } -// CHECK:STDOUT: --- unary_op.carbon +// CHECK:STDOUT: --- unary_op.carbon = $unary_op // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/overloaded/add.carbon b/toolchain/check/testdata/operators/overloaded/add.carbon index a4b94906e8e7..15505df78dc9 100644 --- a/toolchain/check/testdata/operators/overloaded/add.carbon +++ b/toolchain/check/testdata/operators/overloaded/add.carbon @@ -39,7 +39,7 @@ fn TestAssign(a: C*, b: C) { //@dump-sem-ir-end } -// CHECK:STDOUT: --- add.carbon +// CHECK:STDOUT: --- add.carbon = $add // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/overloaded/bit_and.carbon b/toolchain/check/testdata/operators/overloaded/bit_and.carbon index 408e3c83d1f6..0b2aa0a68236 100644 --- a/toolchain/check/testdata/operators/overloaded/bit_and.carbon +++ b/toolchain/check/testdata/operators/overloaded/bit_and.carbon @@ -39,7 +39,7 @@ fn TestAssign(a: C*, b: C) { //@dump-sem-ir-end } -// CHECK:STDOUT: --- bit_and.carbon +// CHECK:STDOUT: --- bit_and.carbon = $bit_and // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/overloaded/bit_complement.carbon b/toolchain/check/testdata/operators/overloaded/bit_complement.carbon index 3cb6bef6aa7e..d2245a31bfa2 100644 --- a/toolchain/check/testdata/operators/overloaded/bit_complement.carbon +++ b/toolchain/check/testdata/operators/overloaded/bit_complement.carbon @@ -30,7 +30,7 @@ fn TestOp(a: C) -> C { //@dump-sem-ir-end } -// CHECK:STDOUT: --- bit_complement.carbon +// CHECK:STDOUT: --- bit_complement.carbon = $bit_complement // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/overloaded/bit_or.carbon b/toolchain/check/testdata/operators/overloaded/bit_or.carbon index 1ac8e5afa6b6..89affb8da4bd 100644 --- a/toolchain/check/testdata/operators/overloaded/bit_or.carbon +++ b/toolchain/check/testdata/operators/overloaded/bit_or.carbon @@ -39,7 +39,7 @@ fn TestAssign(a: C*, b: C) { //@dump-sem-ir-end } -// CHECK:STDOUT: --- bit_or.carbon +// CHECK:STDOUT: --- bit_or.carbon = $bit_or // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/overloaded/bit_xor.carbon b/toolchain/check/testdata/operators/overloaded/bit_xor.carbon index c043822ab7fb..18659cfd2f8a 100644 --- a/toolchain/check/testdata/operators/overloaded/bit_xor.carbon +++ b/toolchain/check/testdata/operators/overloaded/bit_xor.carbon @@ -39,7 +39,7 @@ fn TestAssign(a: C*, b: C) { //@dump-sem-ir-end } -// CHECK:STDOUT: --- bit_xor.carbon +// CHECK:STDOUT: --- bit_xor.carbon = $bit_xor // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/overloaded/dec.carbon b/toolchain/check/testdata/operators/overloaded/dec.carbon index 002708ff4639..733be3411d6f 100644 --- a/toolchain/check/testdata/operators/overloaded/dec.carbon +++ b/toolchain/check/testdata/operators/overloaded/dec.carbon @@ -29,7 +29,7 @@ fn TestOp() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- dec.carbon +// CHECK:STDOUT: --- dec.carbon = $dec // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/overloaded/div.carbon b/toolchain/check/testdata/operators/overloaded/div.carbon index 5e93c0054b8d..0121ca6eace5 100644 --- a/toolchain/check/testdata/operators/overloaded/div.carbon +++ b/toolchain/check/testdata/operators/overloaded/div.carbon @@ -39,7 +39,7 @@ fn TestAssign(a: C*, b: C) { //@dump-sem-ir-end } -// CHECK:STDOUT: --- div.carbon +// CHECK:STDOUT: --- div.carbon = $div // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 3ee5f89a367f..7d287d55c3b2 100644 --- a/toolchain/check/testdata/operators/overloaded/fail_assign_non_ref.carbon +++ b/toolchain/check/testdata/operators/overloaded/fail_assign_non_ref.carbon @@ -52,7 +52,7 @@ fn TestAddAssignNonRef(a: C, b: C) { a += b; } -// CHECK:STDOUT: --- fail_assign_non_ref.carbon +// CHECK:STDOUT: --- fail_assign_non_ref.carbon = $fail_assign_non_ref // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/overloaded/fail_error_recovery.carbon b/toolchain/check/testdata/operators/overloaded/fail_error_recovery.carbon index fde2ec1cd3bd..87802948cf7b 100644 --- a/toolchain/check/testdata/operators/overloaded/fail_error_recovery.carbon +++ b/toolchain/check/testdata/operators/overloaded/fail_error_recovery.carbon @@ -35,7 +35,7 @@ fn G(n: i32) { n + undeclared; } -// CHECK:STDOUT: --- fail_error_recovery.carbon +// CHECK:STDOUT: --- fail_error_recovery.carbon = $fail_error_recovery // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/overloaded/fail_no_impl.carbon b/toolchain/check/testdata/operators/overloaded/fail_no_impl.carbon index b9bdd4ffb1bf..25ca9c22d05a 100644 --- a/toolchain/check/testdata/operators/overloaded/fail_no_impl.carbon +++ b/toolchain/check/testdata/operators/overloaded/fail_no_impl.carbon @@ -62,7 +62,7 @@ fn TestRef(b: C) { ++a; } -// CHECK:STDOUT: --- fail_no_impl.carbon +// CHECK:STDOUT: --- fail_no_impl.carbon = $fail_no_impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/overloaded/implicit_as.carbon b/toolchain/check/testdata/operators/overloaded/implicit_as.carbon index 848de02152ba..ed6d5e04cb26 100644 --- a/toolchain/check/testdata/operators/overloaded/implicit_as.carbon +++ b/toolchain/check/testdata/operators/overloaded/implicit_as.carbon @@ -36,7 +36,7 @@ fn Test() { } -// CHECK:STDOUT: --- implicit_as.carbon +// CHECK:STDOUT: --- implicit_as.carbon = $implicit_as // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/overloaded/inc.carbon b/toolchain/check/testdata/operators/overloaded/inc.carbon index 40718d4c35d8..e8f502435541 100644 --- a/toolchain/check/testdata/operators/overloaded/inc.carbon +++ b/toolchain/check/testdata/operators/overloaded/inc.carbon @@ -29,7 +29,7 @@ fn TestOp() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- inc.carbon +// CHECK:STDOUT: --- inc.carbon = $inc // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/overloaded/index.carbon b/toolchain/check/testdata/operators/overloaded/index.carbon index d79493112655..700b702fdb07 100644 --- a/toolchain/check/testdata/operators/overloaded/index.carbon +++ b/toolchain/check/testdata/operators/overloaded/index.carbon @@ -119,7 +119,7 @@ fn F() { } -// CHECK:STDOUT: --- fail_wrong_index_with.carbon +// CHECK:STDOUT: --- fail_wrong_index_with.carbon = $fail_wrong_index_with // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -140,7 +140,7 @@ fn F() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_missing_index_with.carbon +// CHECK:STDOUT: --- fail_missing_index_with.carbon = $fail_missing_index_with // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/overloaded/index_with_prelude.carbon b/toolchain/check/testdata/operators/overloaded/index_with_prelude.carbon index a05d917b5098..4184b6037688 100644 --- a/toolchain/check/testdata/operators/overloaded/index_with_prelude.carbon +++ b/toolchain/check/testdata/operators/overloaded/index_with_prelude.carbon @@ -93,7 +93,7 @@ let x: i32 = c[0]; -// CHECK:STDOUT: --- overloaded_index.carbon +// CHECK:STDOUT: --- overloaded_index.carbon = $overloaded_index // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -312,7 +312,7 @@ let x: i32 = c[0]; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- overloaded_builtin.carbon +// CHECK:STDOUT: --- overloaded_builtin.carbon = $overloaded_builtin // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -523,7 +523,7 @@ let x: i32 = c[0]; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_invalid_subscript_type.carbon +// CHECK:STDOUT: --- fail_invalid_subscript_type.carbon = $fail_invalid_subscript_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -719,7 +719,7 @@ let x: i32 = c[0]; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_index_with_not_implemented.carbon +// CHECK:STDOUT: --- fail_index_with_not_implemented.carbon = $fail_index_with_not_implemented // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/overloaded/indirect_index_with.carbon b/toolchain/check/testdata/operators/overloaded/indirect_index_with.carbon index 4b435f3f184c..502c29c2bcc2 100644 --- a/toolchain/check/testdata/operators/overloaded/indirect_index_with.carbon +++ b/toolchain/check/testdata/operators/overloaded/indirect_index_with.carbon @@ -136,7 +136,7 @@ fn F(c: C, s: SubscriptType, v: Copyable) { //@dump-sem-ir-end } -// CHECK:STDOUT: --- types.carbon +// CHECK:STDOUT: --- types.carbon = $types.2 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -263,7 +263,7 @@ fn F(c: C, s: SubscriptType, v: Copyable) { // CHECK:STDOUT: return %.loc19_12 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- ref_copyable.carbon +// CHECK:STDOUT: --- ref_copyable.carbon = $ref_copyable // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -350,7 +350,7 @@ fn F(c: C, s: SubscriptType, v: Copyable) { // CHECK:STDOUT: return %C.as.IndirectIndexWith.impl.Ref.call.loc9 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- ref_non_copyable.carbon +// CHECK:STDOUT: --- ref_non_copyable.carbon = $ref_non_copyable // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -409,7 +409,7 @@ fn F(c: C, s: SubscriptType, v: Copyable) { // CHECK:STDOUT: return %CNonCopy.as.IndirectIndexWith.impl.Ref.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- at_from_blanket_impl.carbon +// CHECK:STDOUT: --- at_from_blanket_impl.carbon = $at_from_blanket_impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -497,7 +497,7 @@ fn F(c: C, s: SubscriptType, v: Copyable) { // CHECK:STDOUT: return %T.as_type.as.IndexWith.impl.At.call to %return.param // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- subscript_copyable.carbon +// CHECK:STDOUT: --- subscript_copyable.carbon = $subscript_copyable // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -543,7 +543,7 @@ fn F(c: C, s: SubscriptType, v: Copyable) { // CHECK:STDOUT: return %Copyable.as.Copy.impl.Op.call to %return.param // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- subscript_non_copyable.carbon +// CHECK:STDOUT: --- subscript_non_copyable.carbon = $subscript_non_copyable // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -575,7 +575,7 @@ fn F(c: C, s: SubscriptType, v: Copyable) { // CHECK:STDOUT: return %CNonCopy.as.IndirectIndexWith.impl.Ref.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- subscript_assign.carbon +// CHECK:STDOUT: --- subscript_assign.carbon = $subscript_assign // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/overloaded/left_shift.carbon b/toolchain/check/testdata/operators/overloaded/left_shift.carbon index 303a504d14d1..d7fa4d5b3d99 100644 --- a/toolchain/check/testdata/operators/overloaded/left_shift.carbon +++ b/toolchain/check/testdata/operators/overloaded/left_shift.carbon @@ -39,7 +39,7 @@ fn TestAssign(a: C*, b: C) { //@dump-sem-ir-end } -// CHECK:STDOUT: --- left_shift.carbon +// CHECK:STDOUT: --- left_shift.carbon = $left_shift // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/overloaded/mod.carbon b/toolchain/check/testdata/operators/overloaded/mod.carbon index eaaca222d99f..18629e3b0b1b 100644 --- a/toolchain/check/testdata/operators/overloaded/mod.carbon +++ b/toolchain/check/testdata/operators/overloaded/mod.carbon @@ -39,7 +39,7 @@ fn TestAssign(a: C*, b: C) { //@dump-sem-ir-end } -// CHECK:STDOUT: --- mod.carbon +// CHECK:STDOUT: --- mod.carbon = $mod // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/overloaded/mul.carbon b/toolchain/check/testdata/operators/overloaded/mul.carbon index a0083cdc445e..66ed36191c97 100644 --- a/toolchain/check/testdata/operators/overloaded/mul.carbon +++ b/toolchain/check/testdata/operators/overloaded/mul.carbon @@ -39,7 +39,7 @@ fn TestAssign(a: C*, b: C) { //@dump-sem-ir-end } -// CHECK:STDOUT: --- mul.carbon +// CHECK:STDOUT: --- mul.carbon = $mul // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/overloaded/negate.carbon b/toolchain/check/testdata/operators/overloaded/negate.carbon index 354b871d97c9..cfb7ba334995 100644 --- a/toolchain/check/testdata/operators/overloaded/negate.carbon +++ b/toolchain/check/testdata/operators/overloaded/negate.carbon @@ -30,7 +30,7 @@ fn TestOp(a: C) -> C { //@dump-sem-ir-end } -// CHECK:STDOUT: --- negate.carbon +// CHECK:STDOUT: --- negate.carbon = $negate // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/overloaded/right_shift.carbon b/toolchain/check/testdata/operators/overloaded/right_shift.carbon index 8dae0bd034d0..03de5163d78d 100644 --- a/toolchain/check/testdata/operators/overloaded/right_shift.carbon +++ b/toolchain/check/testdata/operators/overloaded/right_shift.carbon @@ -39,7 +39,7 @@ fn TestAssign(a: C*, b: C) { //@dump-sem-ir-end } -// CHECK:STDOUT: --- right_shift.carbon +// CHECK:STDOUT: --- right_shift.carbon = $right_shift // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/overloaded/string_indexing.carbon b/toolchain/check/testdata/operators/overloaded/string_indexing.carbon index 1706acf08057..e6f3af0745f9 100644 --- a/toolchain/check/testdata/operators/overloaded/string_indexing.carbon +++ b/toolchain/check/testdata/operators/overloaded/string_indexing.carbon @@ -97,7 +97,7 @@ fn TestStringIndexing() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- fail_wrong_type.carbon +// CHECK:STDOUT: --- fail_wrong_type.carbon = $fail_wrong_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -122,7 +122,7 @@ fn TestStringIndexing() { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- test_string_indexing.carbon +// CHECK:STDOUT: --- test_string_indexing.carbon = $test_string_indexing // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/operators/overloaded/sub.carbon b/toolchain/check/testdata/operators/overloaded/sub.carbon index 410ab3bc686c..d79577591afc 100644 --- a/toolchain/check/testdata/operators/overloaded/sub.carbon +++ b/toolchain/check/testdata/operators/overloaded/sub.carbon @@ -39,7 +39,7 @@ fn TestAssign(a: C*, b: C) { //@dump-sem-ir-end } -// CHECK:STDOUT: --- sub.carbon +// CHECK:STDOUT: --- sub.carbon = $sub // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/package_expr/syntax.carbon b/toolchain/check/testdata/package_expr/syntax.carbon index 058645dc79c0..83f4e43c8a94 100644 --- a/toolchain/check/testdata/package_expr/syntax.carbon +++ b/toolchain/check/testdata/package_expr/syntax.carbon @@ -45,7 +45,7 @@ fn Main() { package.NS.C.Foo(); } -// CHECK:STDOUT: --- global.carbon +// CHECK:STDOUT: --- global.carbon = $global // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -150,7 +150,7 @@ fn Main() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- inside_fn.carbon +// CHECK:STDOUT: --- inside_fn.carbon = $inside_fn // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -317,7 +317,7 @@ fn Main() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- namespace.carbon +// CHECK:STDOUT: --- namespace.carbon = $namespace // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/packages/cross_package_export.carbon b/toolchain/check/testdata/packages/cross_package_export.carbon index db45cbb9ddbf..c4518c458a63 100644 --- a/toolchain/check/testdata/packages/cross_package_export.carbon +++ b/toolchain/check/testdata/packages/cross_package_export.carbon @@ -207,7 +207,7 @@ import Other library "conflict"; alias C = Other.C; -// CHECK:STDOUT: --- base.carbon +// CHECK:STDOUT: --- base.carbon = $base // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -239,7 +239,7 @@ alias C = Other.C; // CHECK:STDOUT: .x = %field_decl // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- conflict.carbon +// CHECK:STDOUT: --- conflict.carbon = $conflict // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -259,7 +259,7 @@ alias C = Other.C; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- export_import.carbon +// CHECK:STDOUT: --- export_import.carbon = $export_import // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Other.C = import_ref Other//base, C, unloaded @@ -272,7 +272,7 @@ alias C = Other.C; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- export_import_copy.carbon +// CHECK:STDOUT: --- export_import_copy.carbon = $export_import_copy // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Other.C = import_ref Other//base, C, unloaded @@ -285,7 +285,7 @@ alias C = Other.C; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- export_import_indirect.carbon +// CHECK:STDOUT: --- export_import_indirect.carbon = $export_import_indirect // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Other.C = import_ref Other//base, C, unloaded @@ -298,7 +298,7 @@ alias C = Other.C; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- export_name.carbon +// CHECK:STDOUT: --- export_name.carbon = $export_name // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -331,7 +331,7 @@ alias C = Other.C; // CHECK:STDOUT: .x = imports.%Other.import_ref.d09 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- export_name_copy.carbon +// CHECK:STDOUT: --- export_name_copy.carbon = $export_name_copy // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -364,7 +364,7 @@ alias C = Other.C; // CHECK:STDOUT: .x = imports.%Other.import_ref.d09 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- export_name_indirect.carbon +// CHECK:STDOUT: --- export_name_indirect.carbon = $export_name_indirect // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -397,7 +397,7 @@ alias C = Other.C; // CHECK:STDOUT: .x = imports.%Other.import_ref.82f // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_export_import.carbon +// CHECK:STDOUT: --- use_export_import.carbon = $use_export_import // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -466,7 +466,7 @@ alias C = Other.C; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_export_import_with_copy.carbon +// CHECK:STDOUT: --- use_export_import_with_copy.carbon = $use_export_import_with_copy // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -536,7 +536,7 @@ alias C = Other.C; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_export_import_indirect.carbon +// CHECK:STDOUT: --- use_export_import_indirect.carbon = $use_export_import_indirect // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -606,7 +606,7 @@ alias C = Other.C; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_export_name.carbon +// CHECK:STDOUT: --- use_export_name.carbon = $use_export_name // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -674,7 +674,7 @@ alias C = Other.C; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_export_name_with_copy.carbon +// CHECK:STDOUT: --- use_export_name_with_copy.carbon = $use_export_name_with_copy // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -743,7 +743,7 @@ alias C = Other.C; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_export_name_indirect.carbon +// CHECK:STDOUT: --- use_export_name_indirect.carbon = $use_export_name_indirect // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -811,7 +811,7 @@ alias C = Other.C; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_export_all.carbon +// CHECK:STDOUT: --- use_export_all.carbon = $use_export_all // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -885,7 +885,7 @@ alias C = Other.C; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- unused_conflict_on_export_import.carbon +// CHECK:STDOUT: --- unused_conflict_on_export_import.carbon = $unused_conflict_on_export_import // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Other: = namespace file.%Other.import, [concrete] { @@ -902,7 +902,7 @@ alias C = Other.C; // CHECK:STDOUT: %Other.import = import Other // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- unused_conflict_on_export_name.carbon +// CHECK:STDOUT: --- unused_conflict_on_export_name.carbon = $unused_conflict_on_export_name // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Other: = namespace file.%Other.import, [concrete] { @@ -918,7 +918,7 @@ alias C = Other.C; // CHECK:STDOUT: %Other.import = import Other // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_conflict_on_export_import.carbon +// CHECK:STDOUT: --- fail_conflict_on_export_import.carbon = $fail_conflict_on_export_import // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -949,7 +949,7 @@ alias C = Other.C; // CHECK:STDOUT: // CHECK:STDOUT: fn @C [from "conflict.carbon"]; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_conflict_on_export_name.carbon +// CHECK:STDOUT: --- fail_conflict_on_export_name.carbon = $fail_conflict_on_export_name // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/packages/cross_package_import.carbon b/toolchain/check/testdata/packages/cross_package_import.carbon index 1b1300db5c38..dcd6e8917790 100644 --- a/toolchain/check/testdata/packages/cross_package_import.carbon +++ b/toolchain/check/testdata/packages/cross_package_import.carbon @@ -245,7 +245,7 @@ import Other library "other_fn_use"; // CHECK:STDERR: fn UseF() { Other.F(); } -// CHECK:STDOUT: --- other_fn.carbon +// CHECK:STDOUT: --- other_fn.carbon = $other_fn // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -265,7 +265,7 @@ fn UseF() { Other.F(); } // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- other_fn_extern.carbon +// CHECK:STDOUT: --- other_fn_extern.carbon = $other_fn_extern // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -282,7 +282,7 @@ fn UseF() { Other.F(); } // CHECK:STDOUT: // CHECK:STDOUT: extern fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: --- other_fn_conflict.carbon +// CHECK:STDOUT: --- other_fn_conflict.carbon = $other_fn_conflict // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -317,7 +317,7 @@ fn UseF() { Other.F(); } // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- other_fn2.carbon +// CHECK:STDOUT: --- other_fn2.carbon = $other_fn2 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -337,7 +337,7 @@ fn UseF() { Other.F(); } // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- other_fn_use.carbon +// CHECK:STDOUT: --- other_fn_use.carbon = $other_fn_use // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -370,7 +370,7 @@ fn UseF() { Other.F(); } // CHECK:STDOUT: // CHECK:STDOUT: fn @F [from "other_fn.carbon"]; // CHECK:STDOUT: -// CHECK:STDOUT: --- main_other_ns.carbon +// CHECK:STDOUT: --- main_other_ns.carbon = $main_other_ns // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { @@ -379,7 +379,7 @@ fn UseF() { Other.F(); } // CHECK:STDOUT: %Other: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- main_use_other.carbon +// CHECK:STDOUT: --- main_use_other.carbon = $main_use_other // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -427,7 +427,7 @@ fn UseF() { Other.F(); } // CHECK:STDOUT: // CHECK:STDOUT: fn @F2 [from "other_fn2.carbon"]; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_main_use_other_extern.carbon +// CHECK:STDOUT: --- fail_todo_main_use_other_extern.carbon = $fail_todo_main_use_other_extern // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -466,7 +466,7 @@ fn UseF() { Other.F(); } // CHECK:STDOUT: // CHECK:STDOUT: fn @F [from "other_fn.carbon"]; // CHECK:STDOUT: -// CHECK:STDOUT: --- main_unused_other_ambiguous.carbon +// CHECK:STDOUT: --- main_unused_other_ambiguous.carbon = $main_unused_other_ambiguous // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Other: = namespace file.%Other.import, [concrete] { @@ -482,7 +482,7 @@ fn UseF() { Other.F(); } // CHECK:STDOUT: %Other.import = import Other // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_main_use_other_ambiguous.carbon +// CHECK:STDOUT: --- fail_main_use_other_ambiguous.carbon = $fail_main_use_other_ambiguous // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -521,7 +521,7 @@ fn UseF() { Other.F(); } // CHECK:STDOUT: // CHECK:STDOUT: fn @F [from "other_fn.carbon"]; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_main_namespace_conflict.carbon +// CHECK:STDOUT: --- fail_main_namespace_conflict.carbon = $fail_main_namespace_conflict // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -556,7 +556,7 @@ fn UseF() { Other.F(); } // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_main_reopen_other.carbon +// CHECK:STDOUT: --- fail_main_reopen_other.carbon = $fail_main_reopen_other // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -588,7 +588,7 @@ fn UseF() { Other.F(); } // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_main_reopen_other_nested.carbon +// CHECK:STDOUT: --- fail_main_reopen_other_nested.carbon = $fail_main_reopen_other_nested // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -619,7 +619,7 @@ fn UseF() { Other.F(); } // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_main_add_to_other.carbon +// CHECK:STDOUT: --- fail_main_add_to_other.carbon = $fail_main_add_to_other // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -647,7 +647,7 @@ fn UseF() { Other.F(); } // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_use_other_fn_use.carbon +// CHECK:STDOUT: --- fail_use_other_fn_use.carbon = $fail_use_other_fn_use // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/packages/explicit_imports.carbon b/toolchain/check/testdata/packages/explicit_imports.carbon index 347e66900d35..d78d76236775 100644 --- a/toolchain/check/testdata/packages/explicit_imports.carbon +++ b/toolchain/check/testdata/packages/explicit_imports.carbon @@ -42,26 +42,26 @@ library "[[@TEST_NAME]]"; import library "main_lib_api"; -// CHECK:STDOUT: --- api.carbon +// CHECK:STDOUT: --- api.carbon = $api // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- api_lib.carbon +// CHECK:STDOUT: --- api_lib.carbon = $api_lib // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- same_package.carbon +// CHECK:STDOUT: --- same_package.carbon = $same_package // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- different_package.carbon +// CHECK:STDOUT: --- different_package.carbon = $different_package // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Api: = namespace file.%Api.import, [concrete] { @@ -77,13 +77,13 @@ import library "main_lib_api"; // CHECK:STDOUT: %Api.import = import Api // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- main_lib_api.carbon +// CHECK:STDOUT: --- main_lib_api.carbon = $main_lib_api // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- main_import.carbon +// CHECK:STDOUT: --- main_import.carbon = $main_import // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} diff --git a/toolchain/check/testdata/packages/export_import.carbon b/toolchain/check/testdata/packages/export_import.carbon index fca7ade2bfe7..ab3457cdab2b 100644 --- a/toolchain/check/testdata/packages/export_import.carbon +++ b/toolchain/check/testdata/packages/export_import.carbon @@ -201,7 +201,7 @@ fn F() -> Poison; // CHECK:STDERR: export Poison; -// CHECK:STDOUT: --- base.carbon +// CHECK:STDOUT: --- base.carbon = $base // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -233,7 +233,7 @@ export Poison; // CHECK:STDOUT: .x = %field_decl // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- export.carbon +// CHECK:STDOUT: --- export.carbon = $export // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Main.C = import_ref Main//base, C, unloaded @@ -246,7 +246,7 @@ export Poison; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- export_copy.carbon +// CHECK:STDOUT: --- export_copy.carbon = $export_copy // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Main.C = import_ref Main//base, C, unloaded @@ -259,7 +259,7 @@ export Poison; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- non_export.carbon +// CHECK:STDOUT: --- non_export.carbon = $non_export // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Main.C = import_ref Main//base, C, unloaded @@ -272,7 +272,7 @@ export Poison; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- export_export.carbon +// CHECK:STDOUT: --- export_export.carbon = $export_export // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Main.C = import_ref Main//base, C, unloaded @@ -285,7 +285,7 @@ export Poison; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_then_export.carbon +// CHECK:STDOUT: --- import_then_export.carbon = $import_then_export // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Main.C = import_ref Main//base, C, unloaded @@ -298,13 +298,13 @@ export Poison; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- export_in_impl.carbon +// CHECK:STDOUT: --- export_in_impl.carbon = $export_in_impl // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_export.carbon +// CHECK:STDOUT: --- use_export.carbon = $use_export // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -365,9 +365,9 @@ export Poison; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_export_in_impl.impl.carbon +// CHECK:STDOUT: --- fail_export_in_impl.impl.carbon = $fail_export_in_impl.impl // CHECK:STDOUT: -// CHECK:STDOUT: --- export_export.impl.carbon +// CHECK:STDOUT: --- export_export.impl.carbon = $export_export.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -429,7 +429,7 @@ export Poison; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_export_export.carbon +// CHECK:STDOUT: --- use_export_export.carbon = $use_export_export // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -490,7 +490,7 @@ export Poison; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_import_then_export.carbon +// CHECK:STDOUT: --- use_import_then_export.carbon = $use_import_then_export // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -551,7 +551,7 @@ export Poison; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_import_when_export.carbon +// CHECK:STDOUT: --- use_import_when_export.carbon = $use_import_when_export // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -612,7 +612,7 @@ export Poison; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_base_and_export.carbon +// CHECK:STDOUT: --- use_base_and_export.carbon = $use_base_and_export // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -673,7 +673,7 @@ export Poison; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_export_and_base.carbon +// CHECK:STDOUT: --- use_export_and_base.carbon = $use_export_and_base // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -734,7 +734,7 @@ export Poison; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_export_copy.carbon +// CHECK:STDOUT: --- use_export_copy.carbon = $use_export_copy // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -795,7 +795,7 @@ export Poison; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_use_non_export.carbon +// CHECK:STDOUT: --- fail_use_non_export.carbon = $fail_use_non_export // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { @@ -807,7 +807,7 @@ export Poison; // CHECK:STDOUT: %Local: = alias_binding Local, %C.ref [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_non_export_then_base.carbon +// CHECK:STDOUT: --- use_non_export_then_base.carbon = $use_non_export_then_base // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -868,7 +868,7 @@ export Poison; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- indirect_use_non_export_then_base.carbon +// CHECK:STDOUT: --- indirect_use_non_export_then_base.carbon = $indirect_use_non_export_then_base // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -931,7 +931,7 @@ export Poison; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_export_poisoned.carbon +// CHECK:STDOUT: --- fail_export_poisoned.carbon = $fail_export_poisoned // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/packages/export_mixed.carbon b/toolchain/check/testdata/packages/export_mixed.carbon index 5729a5f9122c..0d63e5a15348 100644 --- a/toolchain/check/testdata/packages/export_mixed.carbon +++ b/toolchain/check/testdata/packages/export_mixed.carbon @@ -120,7 +120,7 @@ import library "export_import"; var c: C = {.x = ()}; var d: D = {.y = ()}; -// CHECK:STDOUT: --- base.carbon +// CHECK:STDOUT: --- base.carbon = $base // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -171,7 +171,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: .y = %field_decl // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- export_import.carbon +// CHECK:STDOUT: --- export_import.carbon = $export_import // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Main.C = import_ref Main//base, C, unloaded @@ -186,7 +186,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- export_import_then_name.carbon +// CHECK:STDOUT: --- export_import_then_name.carbon = $export_import_then_name // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -221,7 +221,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: .x = imports.%Main.import_ref.14f // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- export_name.carbon +// CHECK:STDOUT: --- export_name.carbon = $export_name // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -256,7 +256,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: .x = imports.%Main.import_ref.14f // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- export_name_then_import.carbon +// CHECK:STDOUT: --- export_name_then_import.carbon = $export_name_then_import // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Main.C = import_ref Main//export_name, C, unloaded @@ -269,7 +269,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_export_import_then_name.carbon +// CHECK:STDOUT: --- use_export_import_then_name.carbon = $use_export_import_then_name // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -330,7 +330,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_export_name_then_import.carbon +// CHECK:STDOUT: --- use_export_name_then_import.carbon = $use_export_name_then_import // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -391,7 +391,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_both.carbon +// CHECK:STDOUT: --- use_both.carbon = $use_both // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -452,7 +452,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_nonexport_use_both.carbon +// CHECK:STDOUT: --- fail_nonexport_use_both.carbon = $fail_nonexport_use_both // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -490,7 +490,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_both_reversed.carbon +// CHECK:STDOUT: --- use_both_reversed.carbon = $use_both_reversed // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -551,7 +551,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_both_and_export_import.carbon +// CHECK:STDOUT: --- use_both_and_export_import.carbon = $use_both_and_export_import // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/packages/export_name.carbon b/toolchain/check/testdata/packages/export_name.carbon index 032a70cf2dd4..b6476f2e53f8 100644 --- a/toolchain/check/testdata/packages/export_name.carbon +++ b/toolchain/check/testdata/packages/export_name.carbon @@ -228,7 +228,7 @@ import library "base"; // CHECK:STDERR: private export C; -// CHECK:STDOUT: --- base.carbon +// CHECK:STDOUT: --- base.carbon = $base // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -282,7 +282,7 @@ private export C; // CHECK:STDOUT: .y = %field_decl // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- export.carbon +// CHECK:STDOUT: --- export.carbon = $export // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -336,7 +336,7 @@ private export C; // CHECK:STDOUT: .y = imports.%Main.import_ref.565 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- not_reexporting.carbon +// CHECK:STDOUT: --- not_reexporting.carbon = $not_reexporting // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Main.C = import_ref Main//export, C, unloaded @@ -355,7 +355,7 @@ private export C; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- export_export.carbon +// CHECK:STDOUT: --- export_export.carbon = $export_export // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -409,13 +409,13 @@ private export C; // CHECK:STDOUT: .y = imports.%Main.import_ref.5a3 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- export_in_impl.carbon +// CHECK:STDOUT: --- export_in_impl.carbon = $export_in_impl // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_export.carbon +// CHECK:STDOUT: --- use_export.carbon = $use_export // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -522,7 +522,7 @@ private export C; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- export_export.impl.carbon +// CHECK:STDOUT: --- export_export.impl.carbon = $export_export.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -630,7 +630,7 @@ private export C; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_export_export.carbon +// CHECK:STDOUT: --- use_export_export.carbon = $use_export_export // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -737,7 +737,7 @@ private export C; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_export_ns.carbon +// CHECK:STDOUT: --- fail_export_ns.carbon = $fail_export_ns // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Main.C = import_ref Main//base, C, unloaded @@ -756,7 +756,7 @@ private export C; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_export_decl.carbon +// CHECK:STDOUT: --- fail_export_decl.carbon = $fail_export_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -780,7 +780,7 @@ private export C; // CHECK:STDOUT: .Self = constants.%Local // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_export_member.carbon +// CHECK:STDOUT: --- fail_export_member.carbon = $fail_export_member // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -818,7 +818,7 @@ private export C; // CHECK:STDOUT: .x = imports.%Main.import_ref.14f // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_both.carbon +// CHECK:STDOUT: --- import_both.carbon = $import_both // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -925,7 +925,7 @@ private export C; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_both_reversed.carbon +// CHECK:STDOUT: --- import_both_reversed.carbon = $import_both_reversed // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1032,7 +1032,7 @@ private export C; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_use_not_reexporting.carbon +// CHECK:STDOUT: --- fail_use_not_reexporting.carbon = $fail_use_not_reexporting // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { @@ -1049,7 +1049,7 @@ private export C; // CHECK:STDOUT: %NSLocal: = alias_binding NSLocal, %NSC.ref [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- repeat_export.carbon +// CHECK:STDOUT: --- repeat_export.carbon = $repeat_export // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1088,7 +1088,7 @@ private export C; // CHECK:STDOUT: .x = imports.%Main.import_ref.14f // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_repeat_export.carbon +// CHECK:STDOUT: --- use_repeat_export.carbon = $use_repeat_export // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1149,7 +1149,7 @@ private export C; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_modifiers.carbon +// CHECK:STDOUT: --- fail_modifiers.carbon = $fail_modifiers // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/packages/fail_api_not_found.carbon b/toolchain/check/testdata/packages/fail_api_not_found.carbon index 3e0492bf613b..c48074ce1a85 100644 --- a/toolchain/check/testdata/packages/fail_api_not_found.carbon +++ b/toolchain/check/testdata/packages/fail_api_not_found.carbon @@ -44,7 +44,7 @@ impl package Foo library "[[@TEST_NAME]]"; // CHECK:STDERR: impl library "[[@TEST_NAME]]"; -// CHECK:STDOUT: --- fail_no_api.impl.carbon +// CHECK:STDOUT: --- fail_no_api.impl.carbon = $fail_no_api.impl // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { @@ -53,7 +53,7 @@ impl library "[[@TEST_NAME]]"; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_no_api_lib.impl.carbon +// CHECK:STDOUT: --- fail_no_api_lib.impl.carbon = $fail_no_api_lib.impl // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { @@ -62,7 +62,7 @@ impl library "[[@TEST_NAME]]"; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_no_api_main_lib.impl.carbon +// CHECK:STDOUT: --- fail_no_api_main_lib.impl.carbon = $fail_no_api_main_lib.impl // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { diff --git a/toolchain/check/testdata/packages/fail_conflict_no_namespaces.carbon b/toolchain/check/testdata/packages/fail_conflict_no_namespaces.carbon index 9a75f15e863f..e8aa790a243d 100644 --- a/toolchain/check/testdata/packages/fail_conflict_no_namespaces.carbon +++ b/toolchain/check/testdata/packages/fail_conflict_no_namespaces.carbon @@ -44,7 +44,7 @@ package Example library "[[@TEST_NAME]]"; import library "fn"; import library "var"; -// CHECK:STDOUT: --- fn.carbon +// CHECK:STDOUT: --- fn.carbon = $fn // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -70,7 +70,7 @@ import library "var"; // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(); // CHECK:STDOUT: -// CHECK:STDOUT: --- var.carbon +// CHECK:STDOUT: --- var.carbon = $var // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -132,7 +132,7 @@ import library "var"; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_conflict.carbon +// CHECK:STDOUT: --- fail_conflict.carbon = $fail_conflict // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Example.Foo = import_ref Example//fn, Foo, unloaded diff --git a/toolchain/check/testdata/packages/fail_cycle.carbon b/toolchain/check/testdata/packages/fail_cycle.carbon index 40acc2f57fda..5ec955fb63a4 100644 --- a/toolchain/check/testdata/packages/fail_cycle.carbon +++ b/toolchain/check/testdata/packages/fail_cycle.carbon @@ -75,7 +75,7 @@ package CycleChild; // CHECK:STDERR: import B; -// CHECK:STDOUT: --- fail_a.carbon +// CHECK:STDOUT: --- fail_a.carbon = $fail_a // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %B: = namespace file.%B.import, [concrete] { @@ -90,7 +90,7 @@ import B; // CHECK:STDOUT: %B.import = import B // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_b.carbon +// CHECK:STDOUT: --- fail_b.carbon = $fail_b // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %C: = namespace file.%C.import, [concrete] { @@ -105,7 +105,7 @@ import B; // CHECK:STDOUT: %C.import = import C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_c.carbon +// CHECK:STDOUT: --- fail_c.carbon = $fail_c // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %A: = namespace file.%A.import, [concrete] { @@ -120,7 +120,7 @@ import B; // CHECK:STDOUT: %A.import = import A // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_c.impl.carbon +// CHECK:STDOUT: --- fail_c.impl.carbon = $fail_c.impl // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { @@ -129,7 +129,7 @@ import B; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_cycle_child.carbon +// CHECK:STDOUT: --- fail_cycle_child.carbon = $fail_cycle_child // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %B: = namespace file.%B.import, [concrete] { diff --git a/toolchain/check/testdata/packages/fail_duplicate_api.carbon b/toolchain/check/testdata/packages/fail_duplicate_api.carbon index 6fd00cf4ff82..55f198ebfb05 100644 --- a/toolchain/check/testdata/packages/fail_duplicate_api.carbon +++ b/toolchain/check/testdata/packages/fail_duplicate_api.carbon @@ -63,49 +63,49 @@ package Package library "lib"; // CHECK:STDERR: package Package library "lib"; -// CHECK:STDOUT: --- main1.carbon +// CHECK:STDOUT: --- main1.carbon = $main1 // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_main2.carbon +// CHECK:STDOUT: --- fail_main2.carbon = $fail_main2 // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- main_lib1.carbon +// CHECK:STDOUT: --- main_lib1.carbon = $main_lib1 // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_main_lib2.carbon +// CHECK:STDOUT: --- fail_main_lib2.carbon = $fail_main_lib2 // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- package1.carbon +// CHECK:STDOUT: --- package1.carbon = $package1 // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_package2.carbon +// CHECK:STDOUT: --- fail_package2.carbon = $fail_package2 // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- package_lib1.carbon +// CHECK:STDOUT: --- package_lib1.carbon = $package_lib1 // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_package_lib2.carbon +// CHECK:STDOUT: --- fail_package_lib2.carbon = $fail_package_lib2 // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} diff --git a/toolchain/check/testdata/packages/fail_export_name_member.carbon b/toolchain/check/testdata/packages/fail_export_name_member.carbon index d5d210f86ce4..89c950a4bd06 100644 --- a/toolchain/check/testdata/packages/fail_export_name_member.carbon +++ b/toolchain/check/testdata/packages/fail_export_name_member.carbon @@ -43,7 +43,7 @@ import library "a"; // CHECK:STDERR: export C.n; -// CHECK:STDOUT: --- a.carbon +// CHECK:STDOUT: --- a.carbon = $a // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -75,7 +75,7 @@ export C.n; // CHECK:STDOUT: .n = %field_decl // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_b.carbon +// CHECK:STDOUT: --- fail_b.carbon = $fail_b // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/packages/fail_export_name_params.carbon b/toolchain/check/testdata/packages/fail_export_name_params.carbon index 88457b2c8eaf..b08556be91ad 100644 --- a/toolchain/check/testdata/packages/fail_export_name_params.carbon +++ b/toolchain/check/testdata/packages/fail_export_name_params.carbon @@ -36,7 +36,7 @@ export C1; // CHECK:STDERR: export C2(T: type); -// CHECK:STDOUT: --- a.carbon +// CHECK:STDOUT: --- a.carbon = $a // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -99,7 +99,7 @@ export C2(T: type); // CHECK:STDOUT: %T.loc5_11.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_b.carbon +// CHECK:STDOUT: --- fail_b.carbon = $fail_b // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/packages/fail_extension.carbon b/toolchain/check/testdata/packages/fail_extension.carbon index 6b3c3e280c4e..7f21d5a7d7b5 100644 --- a/toolchain/check/testdata/packages/fail_extension.carbon +++ b/toolchain/check/testdata/packages/fail_extension.carbon @@ -112,25 +112,25 @@ package SwappedExt; impl package SwappedExt; -// CHECK:STDOUT: --- fail_main.incorrect +// CHECK:STDOUT: --- fail_main.incorrect = $fail_main // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_main_redundant_with_swapped_ext.impl.carbon +// CHECK:STDOUT: --- fail_main_redundant_with_swapped_ext.impl.carbon = $fail_main_redundant_with_swapped_ext.impl // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_main_lib.incorrect +// CHECK:STDOUT: --- fail_main_lib.incorrect = $fail_main_lib // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_main_lib.impl.incorrect +// CHECK:STDOUT: --- fail_main_lib.impl.incorrect = $fail_main_lib.impl // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} @@ -138,13 +138,13 @@ impl package SwappedExt; // CHECK:STDOUT: %default.import.loc9_24.2 = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_package.incorrect +// CHECK:STDOUT: --- fail_package.incorrect = $fail_package // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_package_impl.incorrect +// CHECK:STDOUT: --- fail_package_impl.incorrect = $fail_package_impl // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} @@ -152,13 +152,13 @@ impl package SwappedExt; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_package_lib.incorrect +// CHECK:STDOUT: --- fail_package_lib.incorrect = $fail_package_lib // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_package_lib.impl.incorrect +// CHECK:STDOUT: --- fail_package_lib.impl.incorrect = $fail_package_lib.impl // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} @@ -166,13 +166,13 @@ impl package SwappedExt; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_swapped_ext.impl.carbon +// CHECK:STDOUT: --- fail_swapped_ext.impl.carbon = $fail_swapped_ext.impl // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_swapped_ext.carbon +// CHECK:STDOUT: --- fail_swapped_ext.carbon = $fail_swapped_ext // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} diff --git a/toolchain/check/testdata/packages/fail_import_default.carbon b/toolchain/check/testdata/packages/fail_import_default.carbon index ab54130e99a4..20a2afa2f10f 100644 --- a/toolchain/check/testdata/packages/fail_import_default.carbon +++ b/toolchain/check/testdata/packages/fail_import_default.carbon @@ -62,13 +62,13 @@ library "[[@TEST_NAME]]"; // CHECK:STDERR: import library default; -// CHECK:STDOUT: --- fail_default_api.carbon +// CHECK:STDOUT: --- fail_default_api.carbon = $fail_default_api // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_default.impl.carbon +// CHECK:STDOUT: --- fail_default.impl.carbon = $fail_default.impl // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} @@ -76,13 +76,13 @@ import library default; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_main_import_default.carbon +// CHECK:STDOUT: --- fail_main_import_default.carbon = $fail_main_import_default // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_main_lib_import_default.carbon +// CHECK:STDOUT: --- fail_main_lib_import_default.carbon = $fail_main_lib_import_default // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} diff --git a/toolchain/check/testdata/packages/fail_import_invalid.carbon b/toolchain/check/testdata/packages/fail_import_invalid.carbon index d1ffdfb7a995..9926d4365c51 100644 --- a/toolchain/check/testdata/packages/fail_import_invalid.carbon +++ b/toolchain/check/testdata/packages/fail_import_invalid.carbon @@ -124,37 +124,37 @@ package NotFound; // CHECK:STDERR: import ImportNotFound; -// CHECK:STDOUT: --- fail_main.carbon +// CHECK:STDOUT: --- fail_main.carbon = $fail_main // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_not_main.carbon +// CHECK:STDOUT: --- fail_not_main.carbon = $fail_not_main // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_this.carbon +// CHECK:STDOUT: --- fail_this.carbon = $fail_this // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_this_lib.carbon +// CHECK:STDOUT: --- fail_this_lib.carbon = $fail_this_lib // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- implicit.carbon +// CHECK:STDOUT: --- implicit.carbon = $implicit // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_implicit.impl.carbon +// CHECK:STDOUT: --- fail_implicit.impl.carbon = $fail_implicit.impl // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} @@ -162,13 +162,13 @@ import ImportNotFound; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- implicit_lib.carbon +// CHECK:STDOUT: --- implicit_lib.carbon = $implicit_lib // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_implicit_lib.impl.carbon +// CHECK:STDOUT: --- fail_implicit_lib.impl.carbon = $fail_implicit_lib.impl // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} @@ -176,7 +176,7 @@ import ImportNotFound; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_not_found.carbon +// CHECK:STDOUT: --- fail_not_found.carbon = $fail_not_found // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %ImportNotFound: = namespace file.%ImportNotFound.import, [concrete] { diff --git a/toolchain/check/testdata/packages/fail_import_repeat.carbon b/toolchain/check/testdata/packages/fail_import_repeat.carbon index b3ce4f918cf7..147a09dc9555 100644 --- a/toolchain/check/testdata/packages/fail_import_repeat.carbon +++ b/toolchain/check/testdata/packages/fail_import_repeat.carbon @@ -82,25 +82,25 @@ import library default; // CHECK:STDERR: import library default; -// CHECK:STDOUT: --- api.carbon +// CHECK:STDOUT: --- api.carbon = $api // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- api_lib.carbon +// CHECK:STDOUT: --- api_lib.carbon = $api_lib // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- main_lib.carbon +// CHECK:STDOUT: --- main_lib.carbon = $main_lib // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_import.carbon +// CHECK:STDOUT: --- fail_import.carbon = $fail_import // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Api: = namespace file.%Api.import, [concrete] { @@ -117,7 +117,7 @@ import library default; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_default_import.carbon +// CHECK:STDOUT: --- fail_default_import.carbon = $fail_default_import // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} diff --git a/toolchain/check/testdata/packages/fail_import_type_error.carbon b/toolchain/check/testdata/packages/fail_import_type_error.carbon index 8017b8859ada..27e43ca00f3a 100644 --- a/toolchain/check/testdata/packages/fail_import_type_error.carbon +++ b/toolchain/check/testdata/packages/fail_import_type_error.carbon @@ -56,7 +56,7 @@ var b: i32 = b_ref; var c: i32 = c_ref; var d: i32 = d_ref; -// CHECK:STDOUT: --- fail_implicit.carbon +// CHECK:STDOUT: --- fail_implicit.carbon = $fail_implicit // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -127,7 +127,7 @@ var d: i32 = d_ref; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- implicit.impl.carbon +// CHECK:STDOUT: --- implicit.impl.carbon = $implicit.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 4bd53b003ffd..89e3b0b47662 100644 --- a/toolchain/check/testdata/packages/fail_name_with_import_failure.carbon +++ b/toolchain/check/testdata/packages/fail_name_with_import_failure.carbon @@ -25,7 +25,7 @@ impl package Implicit; var a: () = A(); -// CHECK:STDOUT: --- fail_implicit.impl.carbon +// CHECK:STDOUT: --- fail_implicit.impl.carbon = $fail_implicit.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/packages/implicit_imports_empty.carbon b/toolchain/check/testdata/packages/implicit_imports_empty.carbon index c866eb6ce483..7dd979585923 100644 --- a/toolchain/check/testdata/packages/implicit_imports_empty.carbon +++ b/toolchain/check/testdata/packages/implicit_imports_empty.carbon @@ -51,25 +51,25 @@ library "[[@TEST_NAME]]"; impl library "[[@TEST_NAME]]"; -// CHECK:STDOUT: --- api_only.carbon +// CHECK:STDOUT: --- api_only.carbon = $api_only // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- api_only_lib.carbon +// CHECK:STDOUT: --- api_only_lib.carbon = $api_only_lib // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- with_impl.carbon +// CHECK:STDOUT: --- with_impl.carbon = $with_impl // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- with_impl.impl.carbon +// CHECK:STDOUT: --- with_impl.impl.carbon = $with_impl.impl // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} @@ -77,7 +77,7 @@ impl library "[[@TEST_NAME]]"; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- with_impl_extra.impl.carbon +// CHECK:STDOUT: --- with_impl_extra.impl.carbon = $with_impl_extra.impl // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} @@ -85,13 +85,13 @@ impl library "[[@TEST_NAME]]"; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- with_impl_lib.carbon +// CHECK:STDOUT: --- with_impl_lib.carbon = $with_impl_lib // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- with_impl_lib.impl.carbon +// CHECK:STDOUT: --- with_impl_lib.impl.carbon = $with_impl_lib.impl // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} @@ -99,19 +99,19 @@ impl library "[[@TEST_NAME]]"; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- main.carbon +// CHECK:STDOUT: --- main.carbon = $main // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- main_lib.carbon +// CHECK:STDOUT: --- main_lib.carbon = $main_lib // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- main_lib.impl.carbon +// CHECK:STDOUT: --- main_lib.impl.carbon = $main_lib.impl // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} diff --git a/toolchain/check/testdata/packages/implicit_imports_entities.carbon b/toolchain/check/testdata/packages/implicit_imports_entities.carbon index 013a0b4ff5ba..83dcce6d0d24 100644 --- a/toolchain/check/testdata/packages/implicit_imports_entities.carbon +++ b/toolchain/check/testdata/packages/implicit_imports_entities.carbon @@ -176,7 +176,7 @@ impl library "[[@TEST_NAME]]"; // CHECK:STDERR: import Other library "o1"; -// CHECK:STDOUT: --- c1.carbon +// CHECK:STDOUT: --- c1.carbon = $c1 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -200,7 +200,7 @@ import Other library "o1"; // CHECK:STDOUT: .Self = constants.%C1 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- c2.carbon +// CHECK:STDOUT: --- c2.carbon = $c2 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -224,7 +224,7 @@ import Other library "o1"; // CHECK:STDOUT: .Self = constants.%C2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- ns.carbon +// CHECK:STDOUT: --- ns.carbon = $ns // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -251,7 +251,7 @@ import Other library "o1"; // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- o1.carbon +// CHECK:STDOUT: --- o1.carbon = $o1 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -275,7 +275,7 @@ import Other library "o1"; // CHECK:STDOUT: .Self = constants.%O1 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- o2.carbon +// CHECK:STDOUT: --- o2.carbon = $o2 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -299,7 +299,7 @@ import Other library "o1"; // CHECK:STDOUT: .Self = constants.%O2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- local_other.carbon +// CHECK:STDOUT: --- local_other.carbon = $local_other // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -323,7 +323,7 @@ import Other library "o1"; // CHECK:STDOUT: .Self = constants.%Other // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- mix_current_package.carbon +// CHECK:STDOUT: --- mix_current_package.carbon = $mix_current_package // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Main.C1 = import_ref Main//c1, C1, unloaded @@ -336,7 +336,7 @@ import Other library "o1"; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- mix_current_package.impl.carbon +// CHECK:STDOUT: --- mix_current_package.impl.carbon = $mix_current_package.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -416,7 +416,7 @@ import Other library "o1"; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- dup_c1.carbon +// CHECK:STDOUT: --- dup_c1.carbon = $dup_c1 // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Main.C1 = import_ref Main//c1, C1, unloaded @@ -429,7 +429,7 @@ import Other library "o1"; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- dup_c1.impl.carbon +// CHECK:STDOUT: --- dup_c1.impl.carbon = $dup_c1.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -481,7 +481,7 @@ import Other library "o1"; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_ns.carbon +// CHECK:STDOUT: --- use_ns.carbon = $use_ns // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Main.NS: = import_ref Main//ns, NS, loaded @@ -498,7 +498,7 @@ import Other library "o1"; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_ns.impl.carbon +// CHECK:STDOUT: --- use_ns.impl.carbon = $use_ns.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -557,7 +557,7 @@ import Other library "o1"; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- mix_other.carbon +// CHECK:STDOUT: --- mix_other.carbon = $mix_other // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Other: = namespace file.%Other.import, [concrete] { @@ -572,7 +572,7 @@ import Other library "o1"; // CHECK:STDOUT: %Other.import = import Other // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- mix_other.impl.carbon +// CHECK:STDOUT: --- mix_other.impl.carbon = $mix_other.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -664,7 +664,7 @@ import Other library "o1"; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- dup_o1.carbon +// CHECK:STDOUT: --- dup_o1.carbon = $dup_o1 // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Other: = namespace file.%Other.import, [concrete] { @@ -679,7 +679,7 @@ import Other library "o1"; // CHECK:STDOUT: %Other.import = import Other // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- dup_o1.impl.carbon +// CHECK:STDOUT: --- dup_o1.impl.carbon = $dup_o1.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -739,7 +739,7 @@ import Other library "o1"; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_conflict.carbon +// CHECK:STDOUT: --- import_conflict.carbon = $import_conflict // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Other: = namespace file.%Other.import, [concrete] { @@ -754,7 +754,7 @@ import Other library "o1"; // CHECK:STDOUT: %Other.import = import Other // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_import_conflict.impl.carbon +// CHECK:STDOUT: --- fail_import_conflict.impl.carbon = $fail_import_conflict.impl // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Other: = namespace file.%Other.import, [concrete] { @@ -771,7 +771,7 @@ import Other library "o1"; // CHECK:STDOUT: %Other.import = import Other // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_conflict_reverse.carbon +// CHECK:STDOUT: --- import_conflict_reverse.carbon = $import_conflict_reverse // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Main.Other = import_ref Main//local_other, Other, unloaded @@ -784,7 +784,7 @@ import Other library "o1"; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_import_conflict_reverse.impl.carbon +// CHECK:STDOUT: --- fail_import_conflict_reverse.impl.carbon = $fail_import_conflict_reverse.impl // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Other: = namespace file.%Other.import, [concrete] { diff --git a/toolchain/check/testdata/packages/implicit_imports_prelude.carbon b/toolchain/check/testdata/packages/implicit_imports_prelude.carbon index eed6fb5187bf..9bc56441715c 100644 --- a/toolchain/check/testdata/packages/implicit_imports_prelude.carbon +++ b/toolchain/check/testdata/packages/implicit_imports_prelude.carbon @@ -26,7 +26,7 @@ impl library "[[@TEST_NAME]]"; var b: i32 = a; -// CHECK:STDOUT: --- lib.carbon +// CHECK:STDOUT: --- lib.carbon = $lib // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -97,7 +97,7 @@ var b: i32 = a; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- lib.impl.carbon +// CHECK:STDOUT: --- lib.impl.carbon = $lib.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/packages/loaded_global.carbon b/toolchain/check/testdata/packages/loaded_global.carbon index a360e10f0b6d..4f865bfcd2fb 100644 --- a/toolchain/check/testdata/packages/loaded_global.carbon +++ b/toolchain/check/testdata/packages/loaded_global.carbon @@ -42,7 +42,7 @@ var b: () = B(); var package_b: () = package.B(); -// CHECK:STDOUT: --- implicit.carbon +// CHECK:STDOUT: --- implicit.carbon = $implicit // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -59,7 +59,7 @@ var package_b: () = package.B(); // CHECK:STDOUT: // CHECK:STDOUT: fn @A(); // CHECK:STDOUT: -// CHECK:STDOUT: --- implicit.impl.carbon +// CHECK:STDOUT: --- implicit.impl.carbon = $implicit.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -122,7 +122,7 @@ var package_b: () = package.B(); // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- same_package.carbon +// CHECK:STDOUT: --- same_package.carbon = $same_package // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -139,7 +139,7 @@ var package_b: () = package.B(); // CHECK:STDOUT: // CHECK:STDOUT: fn @B(); // CHECK:STDOUT: -// CHECK:STDOUT: --- same_package_importer.carbon +// CHECK:STDOUT: --- same_package_importer.carbon = $same_package_importer // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/packages/missing_prelude.carbon b/toolchain/check/testdata/packages/missing_prelude.carbon index 982e45c5cfc2..750137d5317d 100644 --- a/toolchain/check/testdata/packages/missing_prelude.carbon +++ b/toolchain/check/testdata/packages/missing_prelude.carbon @@ -166,7 +166,7 @@ class Core { let n: type = i32; -// CHECK:STDOUT: --- fail_missing_prelude.carbon +// CHECK:STDOUT: --- fail_missing_prelude.carbon = $fail_missing_prelude // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -191,13 +191,13 @@ let n: type = i32; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- prelude_empty.carbon +// CHECK:STDOUT: --- prelude_empty.carbon = $prelude_empty // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_missing_prelude_member.carbon +// CHECK:STDOUT: --- fail_missing_prelude_member.carbon = $fail_missing_prelude_member // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -231,7 +231,7 @@ let n: type = i32; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- prelude_fake_int.carbon +// CHECK:STDOUT: --- prelude_fake_int.carbon = $prelude_fake_int // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -426,7 +426,7 @@ let n: type = i32; // CHECK:STDOUT: %return.patt.loc9_20.2 => constants.%return.patt.b39 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_use_fake_int.carbon +// CHECK:STDOUT: --- fail_use_fake_int.carbon = $fail_use_fake_int // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -659,7 +659,7 @@ let n: type = i32; // CHECK:STDOUT: %assoc0 => constants.%assoc0.839 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- prelude_use_in_prelude.carbon +// CHECK:STDOUT: --- prelude_use_in_prelude.carbon = $prelude_use_in_prelude // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -760,7 +760,7 @@ let n: type = i32; // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_prelude_as_namespace.carbon +// CHECK:STDOUT: --- fail_prelude_as_namespace.carbon = $fail_prelude_as_namespace // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -851,7 +851,7 @@ let n: type = i32; // CHECK:STDOUT: %N.loc28_31.1 => constants.%N // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_prelude_as_class.carbon +// CHECK:STDOUT: --- fail_prelude_as_class.carbon = $fail_prelude_as_class // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/packages/raw_core.carbon b/toolchain/check/testdata/packages/raw_core.carbon index 2ee6d8c42d00..5bd2f1e1c49f 100644 --- a/toolchain/check/testdata/packages/raw_core.carbon +++ b/toolchain/check/testdata/packages/raw_core.carbon @@ -60,7 +60,7 @@ class r#Core { var c: r#Core = {.n = 0 as Core.Int(32)}; -// CHECK:STDOUT: --- package_raw_core.carbon +// CHECK:STDOUT: --- package_raw_core.carbon = $package_raw_core // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -86,7 +86,7 @@ var c: r#Core = {.n = 0 as Core.Int(32)}; // CHECK:STDOUT: // CHECK:STDOUT: fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: --- import_raw_core.carbon +// CHECK:STDOUT: --- import_raw_core.carbon = $import_raw_core // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -149,7 +149,7 @@ var c: r#Core = {.n = 0 as Core.Int(32)}; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_raw_core_not_core.carbon +// CHECK:STDOUT: --- fail_raw_core_not_core.carbon = $fail_raw_core_not_core // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -200,7 +200,7 @@ var c: r#Core = {.n = 0 as Core.Int(32)}; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- class_raw_core.carbon +// CHECK:STDOUT: --- class_raw_core.carbon = $class_raw_core // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/packages/restricted_package_names.carbon b/toolchain/check/testdata/packages/restricted_package_names.carbon index 0b913eab09c5..c2554bb7d0f2 100644 --- a/toolchain/check/testdata/packages/restricted_package_names.carbon +++ b/toolchain/check/testdata/packages/restricted_package_names.carbon @@ -104,49 +104,49 @@ package r#Cpp; // CHECK:STDERR: package Cpp library "[[@TEST_NAME]]"; -// CHECK:STDOUT: --- lowercase_main.carbon +// CHECK:STDOUT: --- lowercase_main.carbon = $lowercase_main // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_main.carbon +// CHECK:STDOUT: --- fail_main.carbon = $fail_main // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_main_impl.carbon +// CHECK:STDOUT: --- fail_main_impl.carbon = $fail_main_impl // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_raw_main.carbon +// CHECK:STDOUT: --- fail_raw_main.carbon = $fail_raw_main // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_main_lib.carbon +// CHECK:STDOUT: --- fail_main_lib.carbon = $fail_main_lib // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- lowercase_cpp.carbon +// CHECK:STDOUT: --- lowercase_cpp.carbon = $lowercase_cpp // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_cpp.carbon +// CHECK:STDOUT: --- fail_cpp.carbon = $fail_cpp // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_cpp.impl.carbon +// CHECK:STDOUT: --- fail_cpp.impl.carbon = $fail_cpp.impl // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} @@ -154,13 +154,13 @@ package Cpp library "[[@TEST_NAME]]"; // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- raw_cpp.carbon +// CHECK:STDOUT: --- raw_cpp.carbon = $raw_cpp // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_cpp_lib.carbon +// CHECK:STDOUT: --- fail_cpp_lib.carbon = $fail_cpp_lib // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} diff --git a/toolchain/check/testdata/packages/unused_lazy_import.carbon b/toolchain/check/testdata/packages/unused_lazy_import.carbon index 7c45e3e35b31..226159329c19 100644 --- a/toolchain/check/testdata/packages/unused_lazy_import.carbon +++ b/toolchain/check/testdata/packages/unused_lazy_import.carbon @@ -22,7 +22,7 @@ fn A(); impl package Implicit; -// CHECK:STDOUT: --- implicit.carbon +// CHECK:STDOUT: --- implicit.carbon = $implicit // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -39,7 +39,7 @@ impl package Implicit; // CHECK:STDOUT: // CHECK:STDOUT: fn @A(); // CHECK:STDOUT: -// CHECK:STDOUT: --- implicit.impl.carbon +// CHECK:STDOUT: --- implicit.impl.carbon = $implicit.impl // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Implicit.A = import_ref Implicit//default, A, unloaded diff --git a/toolchain/check/testdata/patterns/expression.carbon b/toolchain/check/testdata/patterns/expression.carbon index 2be74cfe4b8b..0479b6bbec21 100644 --- a/toolchain/check/testdata/patterns/expression.carbon +++ b/toolchain/check/testdata/patterns/expression.carbon @@ -96,7 +96,7 @@ fn F() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- fail_todo_control_flow.carbon +// CHECK:STDOUT: --- fail_todo_control_flow.carbon = $fail_todo_control_flow // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/patterns/struct.carbon b/toolchain/check/testdata/patterns/struct.carbon index aeb59a8dd0c2..4872059f159a 100644 --- a/toolchain/check/testdata/patterns/struct.carbon +++ b/toolchain/check/testdata/patterns/struct.carbon @@ -320,7 +320,7 @@ library "[[@TEST_NAME]]"; let {.a = x: ()} = ((), ()); //@dump-sem-ir-end -// CHECK:STDOUT: --- empty.carbon +// CHECK:STDOUT: --- empty.carbon = $empty // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -344,7 +344,7 @@ let {.a = x: ()} = ((), ()); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- literal.carbon +// CHECK:STDOUT: --- literal.carbon = $literal // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -382,7 +382,7 @@ let {.a = x: ()} = ((), ()); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- literal_two_fields.carbon +// CHECK:STDOUT: --- literal_two_fields.carbon = $literal_two_fields // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -452,7 +452,7 @@ let {.a = x: ()} = ((), ()); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- literal_shorthand.carbon +// CHECK:STDOUT: --- literal_shorthand.carbon = $literal_shorthand // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -490,7 +490,7 @@ let {.a = x: ()} = ((), ()); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- literal_shorthand_two_fields.carbon +// CHECK:STDOUT: --- literal_shorthand_two_fields.carbon = $literal_shorthand_two_fields // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -560,7 +560,7 @@ let {.a = x: ()} = ((), ()); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- literal_mixed_syntax.carbon +// CHECK:STDOUT: --- literal_mixed_syntax.carbon = $literal_mixed_syntax // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -609,7 +609,7 @@ let {.a = x: ()} = ((), ()); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- nested.carbon +// CHECK:STDOUT: --- nested.carbon = $nested // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -721,7 +721,7 @@ let {.a = x: ()} = ((), ()); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- init_expr.carbon +// CHECK:STDOUT: --- init_expr.carbon = $init_expr // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -763,7 +763,7 @@ let {.a = x: ()} = ((), ()); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- init_expr_shorthand.carbon +// CHECK:STDOUT: --- init_expr_shorthand.carbon = $init_expr_shorthand // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -805,7 +805,7 @@ let {.a = x: ()} = ((), ()); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- ref_expr.carbon +// CHECK:STDOUT: --- ref_expr.carbon = $ref_expr // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -845,7 +845,7 @@ let {.a = x: ()} = ((), ()); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- ref_expr_shorthand.carbon +// CHECK:STDOUT: --- ref_expr_shorthand.carbon = $ref_expr_shorthand // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -885,7 +885,7 @@ let {.a = x: ()} = ((), ()); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- unordered.carbon +// CHECK:STDOUT: --- unordered.carbon = $unordered // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -955,7 +955,7 @@ let {.a = x: ()} = ((), ()); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- unordered_shorthand.carbon +// CHECK:STDOUT: --- unordered_shorthand.carbon = $unordered_shorthand // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1025,7 +1025,7 @@ let {.a = x: ()} = ((), ()); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- unordered_mixed_syntax.carbon +// CHECK:STDOUT: --- unordered_mixed_syntax.carbon = $unordered_mixed_syntax // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1095,9 +1095,9 @@ let {.a = x: ()} = ((), ()); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_underscore.carbon +// CHECK:STDOUT: --- fail_todo_underscore.carbon = $fail_todo_underscore // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_no_matching_field.carbon +// CHECK:STDOUT: --- fail_no_matching_field.carbon = $fail_no_matching_field // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1126,7 +1126,7 @@ let {.a = x: ()} = ((), ()); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_no_matching_field_ref.carbon +// CHECK:STDOUT: --- fail_no_matching_field_ref.carbon = $fail_no_matching_field_ref // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1153,7 +1153,7 @@ let {.a = x: ()} = ((), ()); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_unhandled_field.carbon +// CHECK:STDOUT: --- fail_unhandled_field.carbon = $fail_unhandled_field // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1184,7 +1184,7 @@ let {.a = x: ()} = ((), ()); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_duplicate_field_name.carbon +// CHECK:STDOUT: --- fail_duplicate_field_name.carbon = $fail_duplicate_field_name // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1211,7 +1211,7 @@ let {.a = x: ()} = ((), ()); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_duplicate_field_name_shorthand.carbon +// CHECK:STDOUT: --- fail_duplicate_field_name_shorthand.carbon = $fail_duplicate_field_name_shorthand // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1237,7 +1237,7 @@ let {.a = x: ()} = ((), ()); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_duplicate_field_name_mixed_syntax.carbon +// CHECK:STDOUT: --- fail_duplicate_field_name_mixed_syntax.carbon = $fail_duplicate_field_name_mixed_syntax // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1264,7 +1264,7 @@ let {.a = x: ()} = ((), ()); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- in_static_class_var.carbon +// CHECK:STDOUT: --- in_static_class_var.carbon = $in_static_class_var // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1324,7 +1324,7 @@ let {.a = x: ()} = ((), ()); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- in_class_let.carbon +// CHECK:STDOUT: --- in_class_let.carbon = $in_class_let // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1369,7 +1369,7 @@ let {.a = x: ()} = ((), ()); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_incorrect_field_type.carbon +// CHECK:STDOUT: --- fail_incorrect_field_type.carbon = $fail_incorrect_field_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1400,7 +1400,7 @@ let {.a = x: ()} = ((), ()); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_incorrect_scrutinee_type.carbon +// CHECK:STDOUT: --- fail_incorrect_scrutinee_type.carbon = $fail_incorrect_scrutinee_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/patterns/tuple.carbon b/toolchain/check/testdata/patterns/tuple.carbon index 77f9bdafd7a4..1a6309003a6b 100644 --- a/toolchain/check/testdata/patterns/tuple.carbon +++ b/toolchain/check/testdata/patterns/tuple.carbon @@ -121,7 +121,7 @@ class C { //@dump-sem-ir-end } -// CHECK:STDOUT: --- literal.carbon +// CHECK:STDOUT: --- literal.carbon = $literal // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -166,7 +166,7 @@ class C { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- init_expr.carbon +// CHECK:STDOUT: --- init_expr.carbon = $init_expr // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -215,7 +215,7 @@ class C { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- ref_expr.carbon +// CHECK:STDOUT: --- ref_expr.carbon = $ref_expr // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -262,7 +262,7 @@ class C { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- grouping_parens.carbon +// CHECK:STDOUT: --- grouping_parens.carbon = $grouping_parens // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -303,7 +303,7 @@ class C { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- one_tuple.carbon +// CHECK:STDOUT: --- one_tuple.carbon = $one_tuple // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -353,7 +353,7 @@ class C { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_in_class_var.carbon +// CHECK:STDOUT: --- fail_in_class_var.carbon = $fail_in_class_var // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -381,7 +381,7 @@ class C { // CHECK:STDOUT: .b = %field_decl.loc13_16 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_empty_in_class_var.carbon +// CHECK:STDOUT: --- fail_empty_in_class_var.carbon = $fail_empty_in_class_var // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -396,7 +396,7 @@ class C { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- in_static_class_var.carbon +// CHECK:STDOUT: --- in_static_class_var.carbon = $in_static_class_var // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -463,7 +463,7 @@ class C { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- in_class_let.carbon +// CHECK:STDOUT: --- in_class_let.carbon = $in_class_let // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -516,7 +516,7 @@ class C { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- empty_in_class_let.carbon +// CHECK:STDOUT: --- empty_in_class_let.carbon = $empty_in_class_let // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/patterns/underscore.carbon b/toolchain/check/testdata/patterns/underscore.carbon index c4135464a9db..6b4c49c070d5 100644 --- a/toolchain/check/testdata/patterns/underscore.carbon +++ b/toolchain/check/testdata/patterns/underscore.carbon @@ -121,7 +121,7 @@ fn F() -> {} { return _; } -// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: --- basic.carbon = $basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -241,7 +241,7 @@ fn F() -> {} { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- function.carbon +// CHECK:STDOUT: --- function.carbon = $function // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -316,7 +316,7 @@ fn F() -> {} { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- function_generic.carbon +// CHECK:STDOUT: --- function_generic.carbon = $function_generic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -394,7 +394,7 @@ fn F() -> {} { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_function_generic_undefined.carbon +// CHECK:STDOUT: --- fail_function_generic_undefined.carbon = $fail_function_generic_undefined // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -465,7 +465,7 @@ fn F() -> {} { // CHECK:STDOUT: %_.loc4_15.1 => constants.%empty_struct_type // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- function_implict.carbon +// CHECK:STDOUT: --- function_implict.carbon = $function_implict // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -542,7 +542,7 @@ fn F() -> {} { // CHECK:STDOUT: %_.loc6_7.1 => constants.%_ // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_class.carbon +// CHECK:STDOUT: --- fail_class.carbon = $fail_class // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -582,7 +582,7 @@ fn F() -> {} { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_use.carbon +// CHECK:STDOUT: --- fail_use.carbon = $fail_use // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/pointer/address_of_deref.carbon b/toolchain/check/testdata/pointer/address_of_deref.carbon index ee59c94abf2f..62ac70c6f0d3 100644 --- a/toolchain/check/testdata/pointer/address_of_deref.carbon +++ b/toolchain/check/testdata/pointer/address_of_deref.carbon @@ -17,7 +17,7 @@ fn F() -> i32 { return *&*&n; } -// CHECK:STDOUT: --- address_of_deref.carbon +// CHECK:STDOUT: --- address_of_deref.carbon = $address_of_deref // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/pointer/address_of_lvalue.carbon b/toolchain/check/testdata/pointer/address_of_lvalue.carbon index e5780d7f9e92..5f7004452036 100644 --- a/toolchain/check/testdata/pointer/address_of_lvalue.carbon +++ b/toolchain/check/testdata/pointer/address_of_lvalue.carbon @@ -24,7 +24,7 @@ fn F() { var unused t1: i32* = &t.1; } -// CHECK:STDOUT: --- address_of_lvalue.carbon +// CHECK:STDOUT: --- address_of_lvalue.carbon = $address_of_lvalue // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/pointer/arrow.carbon b/toolchain/check/testdata/pointer/arrow.carbon index 695c489286e2..5b60a1eb3b1b 100644 --- a/toolchain/check/testdata/pointer/arrow.carbon +++ b/toolchain/check/testdata/pointer/arrow.carbon @@ -27,7 +27,7 @@ fn Foo(ptr: C*) { ptr->field->field; } -// CHECK:STDOUT: --- arrow.carbon +// CHECK:STDOUT: --- arrow.carbon = $arrow // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/pointer/basic.carbon b/toolchain/check/testdata/pointer/basic.carbon index 503e7638b67d..a2cfea8329bc 100644 --- a/toolchain/check/testdata/pointer/basic.carbon +++ b/toolchain/check/testdata/pointer/basic.carbon @@ -19,7 +19,7 @@ fn F() -> i32 { return *p; } -// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: --- basic.carbon = $basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/pointer/convert_qualifiers.carbon b/toolchain/check/testdata/pointer/convert_qualifiers.carbon index 5b36d6442220..899a2f73d684 100644 --- a/toolchain/check/testdata/pointer/convert_qualifiers.carbon +++ b/toolchain/check/testdata/pointer/convert_qualifiers.carbon @@ -147,7 +147,7 @@ fn TakeNonConstConst(p: (const X*)*); // CHECK:STDERR: fn NonConstNonConst(p: X**) { TakeNonConstConst(p); } -// CHECK:STDOUT: --- same_or_added_qualifiers.carbon +// CHECK:STDOUT: --- same_or_added_qualifiers.carbon = $same_or_added_qualifiers // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -198,7 +198,7 @@ fn NonConstNonConst(p: X**) { TakeNonConstConst(p); } // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_todo_nested_qualifiers.carbon +// CHECK:STDOUT: --- fail_todo_nested_qualifiers.carbon = $fail_todo_nested_qualifiers // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/pointer/fail_address_of_error.carbon b/toolchain/check/testdata/pointer/fail_address_of_error.carbon index aa3f364a28de..dd2ce3fd74c6 100644 --- a/toolchain/check/testdata/pointer/fail_address_of_error.carbon +++ b/toolchain/check/testdata/pointer/fail_address_of_error.carbon @@ -35,7 +35,7 @@ fn Test() { &(&undeclared); } -// CHECK:STDOUT: --- fail_address_of_error.carbon +// CHECK:STDOUT: --- fail_address_of_error.carbon = $fail_address_of_error // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/pointer/fail_deref_error.carbon b/toolchain/check/testdata/pointer/fail_deref_error.carbon index 1c88a05c8f5d..e07f112ec7bb 100644 --- a/toolchain/check/testdata/pointer/fail_deref_error.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_error.carbon @@ -27,7 +27,7 @@ let n: i32 = *undeclared; // CHECK:STDERR: let n2: i32 = undeclared->foo; -// CHECK:STDOUT: --- fail_deref_error.carbon +// CHECK:STDOUT: --- fail_deref_error.carbon = $fail_deref_error // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/pointer/fail_deref_function.carbon b/toolchain/check/testdata/pointer/fail_deref_function.carbon index 32ecaeecc2c0..0838763da651 100644 --- a/toolchain/check/testdata/pointer/fail_deref_function.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_function.carbon @@ -31,7 +31,7 @@ fn A() { A->foo; } -// CHECK:STDOUT: --- fail_deref_function.carbon +// CHECK:STDOUT: --- fail_deref_function.carbon = $fail_deref_function // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/pointer/fail_deref_namespace.carbon b/toolchain/check/testdata/pointer/fail_deref_namespace.carbon index f3de06cd60d7..79470ea33ab0 100644 --- a/toolchain/check/testdata/pointer/fail_deref_namespace.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_namespace.carbon @@ -31,7 +31,7 @@ fn F() { A->foo; } -// CHECK:STDOUT: --- fail_deref_namespace.carbon +// CHECK:STDOUT: --- fail_deref_namespace.carbon = $fail_deref_namespace // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon b/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon index fdb07a2836bc..1ab1f2480748 100644 --- a/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon @@ -63,7 +63,7 @@ fn Deref(n: i32) { {}->foo; } -// CHECK:STDOUT: --- fail_deref_not_pointer.carbon +// CHECK:STDOUT: --- fail_deref_not_pointer.carbon = $fail_deref_not_pointer // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/pointer/fail_deref_type.carbon b/toolchain/check/testdata/pointer/fail_deref_type.carbon index 06e6aa954903..10420dbbdcb2 100644 --- a/toolchain/check/testdata/pointer/fail_deref_type.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_type.carbon @@ -31,7 +31,7 @@ var p: *i32; // CHECK:STDERR: var p2: i32->foo; -// CHECK:STDOUT: --- fail_deref_type.carbon +// CHECK:STDOUT: --- fail_deref_type.carbon = $fail_deref_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/pointer/fail_type_mismatch.carbon b/toolchain/check/testdata/pointer/fail_type_mismatch.carbon index 69a76bc6b026..a51c182d8ce1 100644 --- a/toolchain/check/testdata/pointer/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/pointer/fail_type_mismatch.carbon @@ -27,7 +27,7 @@ fn ConstMismatch(p: const {}*) -> const ({}*) { return p; } -// CHECK:STDOUT: --- fail_type_mismatch.carbon +// CHECK:STDOUT: --- fail_type_mismatch.carbon = $fail_type_mismatch // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/pointer/import.carbon b/toolchain/check/testdata/pointer/import.carbon index e27307ff26e4..24eb2213a74d 100644 --- a/toolchain/check/testdata/pointer/import.carbon +++ b/toolchain/check/testdata/pointer/import.carbon @@ -25,7 +25,7 @@ impl package Implicit; var a: i32* = a_ref; -// CHECK:STDOUT: --- implicit.carbon +// CHECK:STDOUT: --- implicit.carbon = $implicit // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -137,7 +137,7 @@ var a: i32* = a_ref; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- implicit.impl.carbon +// CHECK:STDOUT: --- implicit.impl.carbon = $implicit.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/pointer/nested_const.carbon b/toolchain/check/testdata/pointer/nested_const.carbon index a8f9c6502835..e526000676e2 100644 --- a/toolchain/check/testdata/pointer/nested_const.carbon +++ b/toolchain/check/testdata/pointer/nested_const.carbon @@ -18,7 +18,7 @@ fn F(p: const (const (const i32*)*)) -> const i32 { } -// CHECK:STDOUT: --- nested_const.carbon +// CHECK:STDOUT: --- nested_const.carbon = $nested_const // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/pointer/types.carbon b/toolchain/check/testdata/pointer/types.carbon index 069e1734ed9c..8f47a19766f5 100644 --- a/toolchain/check/testdata/pointer/types.carbon +++ b/toolchain/check/testdata/pointer/types.carbon @@ -20,7 +20,7 @@ fn ConstPtr(p: const i32*) -> (const i32)* { return p; } -// CHECK:STDOUT: --- types.carbon +// CHECK:STDOUT: --- types.carbon = $types // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/primitives/import_symbolic.carbon b/toolchain/check/testdata/primitives/import_symbolic.carbon index 754f87852546..8bf8dc402ada 100644 --- a/toolchain/check/testdata/primitives/import_symbolic.carbon +++ b/toolchain/check/testdata/primitives/import_symbolic.carbon @@ -194,7 +194,7 @@ fn F() -> u32 { //@dump-sem-ir-end } -// CHECK:STDOUT: --- import_bool.carbon +// CHECK:STDOUT: --- import_bool.carbon = $import_bool // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -243,7 +243,7 @@ fn F() -> u32 { // CHECK:STDOUT: return %bool.as.Copy.impl.Op.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_char.carbon +// CHECK:STDOUT: --- import_char.carbon = $import_char // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -293,7 +293,7 @@ fn F() -> u32 { // CHECK:STDOUT: return %char.as.Copy.impl.Op.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_char_literal.carbon +// CHECK:STDOUT: --- import_char_literal.carbon = $import_char_literal // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -342,7 +342,7 @@ fn F() -> u32 { // CHECK:STDOUT: return %Core.CharLiteral.as.Copy.impl.Op.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_float.carbon +// CHECK:STDOUT: --- import_float.carbon = $import_float // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -400,7 +400,7 @@ fn F() -> u32 { // CHECK:STDOUT: return %Float.as.Copy.impl.Op.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_float_literal.carbon +// CHECK:STDOUT: --- import_float_literal.carbon = $import_float_literal // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -449,7 +449,7 @@ fn F() -> u32 { // CHECK:STDOUT: return %Core.FloatLiteral.as.Copy.impl.Op.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_int.carbon +// CHECK:STDOUT: --- import_int.carbon = $import_int // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -507,7 +507,7 @@ fn F() -> u32 { // CHECK:STDOUT: return %Int.as.Copy.impl.Op.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_int_literal.carbon +// CHECK:STDOUT: --- import_int_literal.carbon = $import_int_literal // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -556,7 +556,7 @@ fn F() -> u32 { // CHECK:STDOUT: return %Core.IntLiteral.as.Copy.impl.Op.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- unsigned_uint.carbon +// CHECK:STDOUT: --- unsigned_uint.carbon = $unsigned_uint // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/primitives/numeric_literals.carbon b/toolchain/check/testdata/primitives/numeric_literals.carbon index 6ba650dc4b08..8410d132900d 100644 --- a/toolchain/check/testdata/primitives/numeric_literals.carbon +++ b/toolchain/check/testdata/primitives/numeric_literals.carbon @@ -169,7 +169,7 @@ library "[[@TEST_NAME]]"; // CHECK:STDERR: let e: f64 = 5.0e39999999999999999993; -// CHECK:STDOUT: --- literal_values.carbon +// CHECK:STDOUT: --- literal_values.carbon = $literal_values // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %int_8.b85: Core.IntLiteral = int_value 8 [concrete] diff --git a/toolchain/check/testdata/primitives/string_literals.carbon b/toolchain/check/testdata/primitives/string_literals.carbon index 2c421f31e030..8c28b2295ff8 100644 --- a/toolchain/check/testdata/primitives/string_literals.carbon +++ b/toolchain/check/testdata/primitives/string_literals.carbon @@ -125,7 +125,7 @@ This string contains 256 characters. Among them are: '''; //@dump-sem-ir-end -// CHECK:STDOUT: --- use_small_string.carbon +// CHECK:STDOUT: --- use_small_string.carbon = $use_small_string // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -156,7 +156,7 @@ This string contains 256 characters. Among them are: // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_overfill_small_string.carbon +// CHECK:STDOUT: --- fail_overfill_small_string.carbon = $fail_overfill_small_string // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/primitives/type_literals.carbon b/toolchain/check/testdata/primitives/type_literals.carbon index 580578756ae3..42df60f1a611 100644 --- a/toolchain/check/testdata/primitives/type_literals.carbon +++ b/toolchain/check/testdata/primitives/type_literals.carbon @@ -418,7 +418,7 @@ var test_char: char = (); // CHECK:STDERR: var test_str: str = (); -// CHECK:STDOUT: --- iN.carbon +// CHECK:STDOUT: --- iN.carbon = $iN // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -525,7 +525,7 @@ var test_str: str = (); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- uN.carbon +// CHECK:STDOUT: --- uN.carbon = $uN // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -632,7 +632,7 @@ var test_str: str = (); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fN.carbon +// CHECK:STDOUT: --- fN.carbon = $fN // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -739,7 +739,7 @@ var test_str: str = (); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- char.carbon +// CHECK:STDOUT: --- char.carbon = $char.2 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -782,7 +782,7 @@ var test_str: str = (); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- string.carbon +// CHECK:STDOUT: --- string.carbon = $string.2 // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -815,7 +815,7 @@ var test_str: str = (); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- type.carbon +// CHECK:STDOUT: --- type.carbon = $type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/return/code_after_return.carbon b/toolchain/check/testdata/return/code_after_return.carbon index 15cb97f2dbc7..e7ad9394bcca 100644 --- a/toolchain/check/testdata/return/code_after_return.carbon +++ b/toolchain/check/testdata/return/code_after_return.carbon @@ -17,7 +17,7 @@ fn Main() { var n: i32 = 1; } -// CHECK:STDOUT: --- code_after_return.carbon +// CHECK:STDOUT: --- code_after_return.carbon = $code_after_return // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/return/code_after_return_value.carbon b/toolchain/check/testdata/return/code_after_return_value.carbon index 2be38e6dcfdf..13b939f86dc2 100644 --- a/toolchain/check/testdata/return/code_after_return_value.carbon +++ b/toolchain/check/testdata/return/code_after_return_value.carbon @@ -24,7 +24,7 @@ fn F(unused b: bool) -> i32 { // Unreachable, no error on missing return. } -// CHECK:STDOUT: --- code_after_return_value.carbon +// CHECK:STDOUT: --- code_after_return_value.carbon = $code_after_return_value // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/return/fail_call_in_type.carbon b/toolchain/check/testdata/return/fail_call_in_type.carbon index a41068e8c7f9..8ec4e8203dd5 100644 --- a/toolchain/check/testdata/return/fail_call_in_type.carbon +++ b/toolchain/check/testdata/return/fail_call_in_type.carbon @@ -24,7 +24,7 @@ fn ReturnType() -> type { return i32; } // CHECK:STDERR: fn Six() -> ReturnType() { return 6; } -// CHECK:STDOUT: --- fail_call_in_type.carbon +// CHECK:STDOUT: --- fail_call_in_type.carbon = $fail_call_in_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/return/fail_error_in_type.carbon b/toolchain/check/testdata/return/fail_error_in_type.carbon index 629ab1873d8e..2132e5073c8d 100644 --- a/toolchain/check/testdata/return/fail_error_in_type.carbon +++ b/toolchain/check/testdata/return/fail_error_in_type.carbon @@ -20,7 +20,7 @@ // CHECK:STDERR: fn Six() -> x; -// CHECK:STDOUT: --- fail_error_in_type.carbon +// CHECK:STDOUT: --- fail_error_in_type.carbon = $fail_error_in_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/return/fail_let_in_type.carbon b/toolchain/check/testdata/return/fail_let_in_type.carbon index d73f4c2e7881..ab102c47f25e 100644 --- a/toolchain/check/testdata/return/fail_let_in_type.carbon +++ b/toolchain/check/testdata/return/fail_let_in_type.carbon @@ -61,7 +61,7 @@ let template z: type = i32; // CHECK:STDERR: fn FirstPerfectNumber() -> z { return 6; } -// CHECK:STDOUT: --- fail_let_in_type.carbon +// CHECK:STDOUT: --- fail_let_in_type.carbon = $fail_let_in_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/return/fail_missing_return.carbon b/toolchain/check/testdata/return/fail_missing_return.carbon index 70eed33be7f5..6ca550c9f4f0 100644 --- a/toolchain/check/testdata/return/fail_missing_return.carbon +++ b/toolchain/check/testdata/return/fail_missing_return.carbon @@ -22,7 +22,7 @@ fn Main() -> i32 { // CHECK:STDERR: } -// CHECK:STDOUT: --- fail_missing_return.carbon +// CHECK:STDOUT: --- fail_missing_return.carbon = $fail_missing_return // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/return/fail_missing_return_empty_tuple.carbon b/toolchain/check/testdata/return/fail_missing_return_empty_tuple.carbon index c1639afc7536..3590e41305af 100644 --- a/toolchain/check/testdata/return/fail_missing_return_empty_tuple.carbon +++ b/toolchain/check/testdata/return/fail_missing_return_empty_tuple.carbon @@ -22,7 +22,7 @@ fn F() -> () { // CHECK:STDERR: } -// CHECK:STDOUT: --- fail_missing_return_empty_tuple.carbon +// CHECK:STDOUT: --- fail_missing_return_empty_tuple.carbon = $fail_missing_return_empty_tuple // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/return/fail_return_var_no_returned_var.carbon b/toolchain/check/testdata/return/fail_return_var_no_returned_var.carbon index 6a3e37f1d8bc..a97c6c5503a7 100644 --- a/toolchain/check/testdata/return/fail_return_var_no_returned_var.carbon +++ b/toolchain/check/testdata/return/fail_return_var_no_returned_var.carbon @@ -23,7 +23,7 @@ fn Procedure() -> {} { return var; } -// CHECK:STDOUT: --- fail_return_var_no_returned_var.carbon +// CHECK:STDOUT: --- fail_return_var_no_returned_var.carbon = $fail_return_var_no_returned_var // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 5ef78ca56c70..9c00e37fc78c 100644 --- a/toolchain/check/testdata/return/fail_return_with_returned_var.carbon +++ b/toolchain/check/testdata/return/fail_return_with_returned_var.carbon @@ -45,7 +45,7 @@ fn G() -> C { return c; } -// CHECK:STDOUT: --- fail_return_with_returned_var.carbon +// CHECK:STDOUT: --- fail_return_with_returned_var.carbon = $fail_return_with_returned_var // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] 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 f96fad640a98..1da88078cad4 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 @@ -59,7 +59,7 @@ fn ForgotReturnType() { return var; } -// CHECK:STDOUT: --- fail_procedure_with_returned_var.carbon +// CHECK:STDOUT: --- fail_procedure_with_returned_var.carbon = $fail_procedure_with_returned_var // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -133,7 +133,7 @@ fn ForgotReturnType() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc16(%self.param: ref %empty_tuple.type) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_forgot_return_type.carbon +// CHECK:STDOUT: --- fail_forgot_return_type.carbon = $fail_forgot_return_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/return/fail_returned_var_shadow.carbon b/toolchain/check/testdata/return/fail_returned_var_shadow.carbon index 31bcc2289dee..c76aa70c081a 100644 --- a/toolchain/check/testdata/return/fail_returned_var_shadow.carbon +++ b/toolchain/check/testdata/return/fail_returned_var_shadow.carbon @@ -54,7 +54,7 @@ fn DifferentScopes() -> i32 { return 0; } -// CHECK:STDOUT: --- fail_returned_var_shadow.carbon +// CHECK:STDOUT: --- fail_returned_var_shadow.carbon = $fail_returned_var_shadow // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/return/fail_returned_var_type.carbon b/toolchain/check/testdata/return/fail_returned_var_type.carbon index 307015c5d043..2bef6b1a2463 100644 --- a/toolchain/check/testdata/return/fail_returned_var_type.carbon +++ b/toolchain/check/testdata/return/fail_returned_var_type.carbon @@ -29,7 +29,7 @@ fn Mismatch() -> i32 { return var; } -// CHECK:STDOUT: --- fail_returned_var_type.carbon +// CHECK:STDOUT: --- fail_returned_var_type.carbon = $fail_returned_var_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/return/fail_type_mismatch.carbon b/toolchain/check/testdata/return/fail_type_mismatch.carbon index 30fbce9012fe..2222482469c0 100644 --- a/toolchain/check/testdata/return/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/return/fail_type_mismatch.carbon @@ -27,7 +27,7 @@ fn Main() -> i32 { return 1.0; } -// CHECK:STDOUT: --- fail_type_mismatch.carbon +// CHECK:STDOUT: --- fail_type_mismatch.carbon = $fail_type_mismatch // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/return/fail_value_disallowed.carbon b/toolchain/check/testdata/return/fail_value_disallowed.carbon index 07695023a2d4..8347eb7606cd 100644 --- a/toolchain/check/testdata/return/fail_value_disallowed.carbon +++ b/toolchain/check/testdata/return/fail_value_disallowed.carbon @@ -27,7 +27,7 @@ fn Main() { return 0; } -// CHECK:STDOUT: --- fail_value_disallowed.carbon +// CHECK:STDOUT: --- fail_value_disallowed.carbon = $fail_value_disallowed // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/return/fail_value_missing.carbon b/toolchain/check/testdata/return/fail_value_missing.carbon index 1402d03e6449..334ad4847460 100644 --- a/toolchain/check/testdata/return/fail_value_missing.carbon +++ b/toolchain/check/testdata/return/fail_value_missing.carbon @@ -26,7 +26,7 @@ fn Main() -> i32 { return; } -// CHECK:STDOUT: --- fail_value_missing.carbon +// CHECK:STDOUT: --- fail_value_missing.carbon = $fail_value_missing // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/return/fail_var_in_type.carbon b/toolchain/check/testdata/return/fail_var_in_type.carbon index fb2b3a507d82..1c7af353a91b 100644 --- a/toolchain/check/testdata/return/fail_var_in_type.carbon +++ b/toolchain/check/testdata/return/fail_var_in_type.carbon @@ -22,7 +22,7 @@ var x: type = i32; // CHECK:STDERR: fn Six() -> x { return 6; } -// CHECK:STDOUT: --- fail_var_in_type.carbon +// CHECK:STDOUT: --- fail_var_in_type.carbon = $fail_var_in_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/return/import_convert_function.carbon b/toolchain/check/testdata/return/import_convert_function.carbon index 76733b3313c1..6bc073dd475d 100644 --- a/toolchain/check/testdata/return/import_convert_function.carbon +++ b/toolchain/check/testdata/return/import_convert_function.carbon @@ -48,7 +48,7 @@ fn F0(unused n: i32) -> P.D { } -// CHECK:STDOUT: --- library.carbon +// CHECK:STDOUT: --- library.carbon = $library // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -758,7 +758,7 @@ fn F0(unused n: i32) -> P.D { // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- user.carbon +// CHECK:STDOUT: --- user.carbon = $user // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/return/missing_return_no_return_type.carbon b/toolchain/check/testdata/return/missing_return_no_return_type.carbon index 3cb54acdf7a4..d99e9281b3b3 100644 --- a/toolchain/check/testdata/return/missing_return_no_return_type.carbon +++ b/toolchain/check/testdata/return/missing_return_no_return_type.carbon @@ -15,7 +15,7 @@ fn F() { } -// CHECK:STDOUT: --- missing_return_no_return_type.carbon +// CHECK:STDOUT: --- missing_return_no_return_type.carbon = $missing_return_no_return_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/return/no_value.carbon b/toolchain/check/testdata/return/no_value.carbon index 1f940d3ec019..9875a02738ce 100644 --- a/toolchain/check/testdata/return/no_value.carbon +++ b/toolchain/check/testdata/return/no_value.carbon @@ -16,7 +16,7 @@ fn Main() { return; } -// CHECK:STDOUT: --- no_value.carbon +// CHECK:STDOUT: --- no_value.carbon = $no_value // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/return/returned_var.carbon b/toolchain/check/testdata/return/returned_var.carbon index b4994a361b22..acef6806b2e8 100644 --- a/toolchain/check/testdata/return/returned_var.carbon +++ b/toolchain/check/testdata/return/returned_var.carbon @@ -27,7 +27,7 @@ fn G() -> i32 { return var; } -// CHECK:STDOUT: --- returned_var.carbon +// CHECK:STDOUT: --- returned_var.carbon = $returned_var // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/return/returned_var_scope.carbon b/toolchain/check/testdata/return/returned_var_scope.carbon index 85d5232354e9..eb529c0662ee 100644 --- a/toolchain/check/testdata/return/returned_var_scope.carbon +++ b/toolchain/check/testdata/return/returned_var_scope.carbon @@ -31,7 +31,7 @@ fn EnclosingButAfter(b: bool) -> i32 { return var; } -// CHECK:STDOUT: --- returned_var_scope.carbon +// CHECK:STDOUT: --- returned_var_scope.carbon = $returned_var_scope // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/return/struct.carbon b/toolchain/check/testdata/return/struct.carbon index a6b4e1ba3c28..f91c5ce8d596 100644 --- a/toolchain/check/testdata/return/struct.carbon +++ b/toolchain/check/testdata/return/struct.carbon @@ -16,7 +16,7 @@ fn Main() -> {.a: i32} { return {.a = 3}; } -// CHECK:STDOUT: --- struct.carbon +// CHECK:STDOUT: --- struct.carbon = $struct // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/return/tuple.carbon b/toolchain/check/testdata/return/tuple.carbon index 6bd166970f2c..1b1f5ce80c90 100644 --- a/toolchain/check/testdata/return/tuple.carbon +++ b/toolchain/check/testdata/return/tuple.carbon @@ -17,7 +17,7 @@ fn Main() -> (i32, i32) { return (15, 35); } -// CHECK:STDOUT: --- tuple.carbon +// CHECK:STDOUT: --- tuple.carbon = $tuple // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/return/val_form.carbon b/toolchain/check/testdata/return/val_form.carbon index 078965ce9b88..2b7e65c09c8c 100644 --- a/toolchain/check/testdata/return/val_form.carbon +++ b/toolchain/check/testdata/return/val_form.carbon @@ -43,7 +43,7 @@ fn F() ->? form(val C) { return {.a = 1}; } -// CHECK:STDOUT: --- param.carbon +// CHECK:STDOUT: --- param.carbon = $param // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/return/value.carbon b/toolchain/check/testdata/return/value.carbon index 58588baea031..c65f37c5deac 100644 --- a/toolchain/check/testdata/return/value.carbon +++ b/toolchain/check/testdata/return/value.carbon @@ -16,7 +16,7 @@ fn Main() -> i32 { return 0; } -// CHECK:STDOUT: --- value.carbon +// CHECK:STDOUT: --- value.carbon = $value // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/struct/empty.carbon b/toolchain/check/testdata/struct/empty.carbon index daf1043e5947..939baea7e4f1 100644 --- a/toolchain/check/testdata/struct/empty.carbon +++ b/toolchain/check/testdata/struct/empty.carbon @@ -15,7 +15,7 @@ var x: {} = {}; var y: {} = x; -// CHECK:STDOUT: --- empty.carbon +// CHECK:STDOUT: --- empty.carbon = $empty // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/struct/fail_access_into_invalid.carbon b/toolchain/check/testdata/struct/fail_access_into_invalid.carbon index bd7d57c4b838..12248b8eeb46 100644 --- a/toolchain/check/testdata/struct/fail_access_into_invalid.carbon +++ b/toolchain/check/testdata/struct/fail_access_into_invalid.carbon @@ -21,7 +21,7 @@ // CHECK:STDERR: fn F() { a.b; } -// CHECK:STDOUT: --- fail_access_into_invalid.carbon +// CHECK:STDOUT: --- fail_access_into_invalid.carbon = $fail_access_into_invalid // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/struct/fail_assign_empty.carbon b/toolchain/check/testdata/struct/fail_assign_empty.carbon index 4a6919d80ad2..f53265ed183e 100644 --- a/toolchain/check/testdata/struct/fail_assign_empty.carbon +++ b/toolchain/check/testdata/struct/fail_assign_empty.carbon @@ -22,7 +22,7 @@ // CHECK:STDERR: var x: {.a: i32} = {}; -// CHECK:STDOUT: --- fail_assign_empty.carbon +// CHECK:STDOUT: --- fail_assign_empty.carbon = $fail_assign_empty // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/struct/fail_assign_nested.carbon b/toolchain/check/testdata/struct/fail_assign_nested.carbon index 64e958f357f5..44d06ce32917 100644 --- a/toolchain/check/testdata/struct/fail_assign_nested.carbon +++ b/toolchain/check/testdata/struct/fail_assign_nested.carbon @@ -21,7 +21,7 @@ // CHECK:STDERR: var x: {.a: {}} = {.b = {}}; -// CHECK:STDOUT: --- fail_assign_nested.carbon +// CHECK:STDOUT: --- fail_assign_nested.carbon = $fail_assign_nested // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/struct/fail_assign_to_empty.carbon b/toolchain/check/testdata/struct/fail_assign_to_empty.carbon index f87e60b1a1a3..b19e1872fb8c 100644 --- a/toolchain/check/testdata/struct/fail_assign_to_empty.carbon +++ b/toolchain/check/testdata/struct/fail_assign_to_empty.carbon @@ -21,7 +21,7 @@ // CHECK:STDERR: var x: {} = {.a = 1}; -// CHECK:STDOUT: --- fail_assign_to_empty.carbon +// CHECK:STDOUT: --- fail_assign_to_empty.carbon = $fail_assign_to_empty // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/struct/fail_duplicate_name.carbon b/toolchain/check/testdata/struct/fail_duplicate_name.carbon index 6b4e59ad5171..eb672550957c 100644 --- a/toolchain/check/testdata/struct/fail_duplicate_name.carbon +++ b/toolchain/check/testdata/struct/fail_duplicate_name.carbon @@ -70,7 +70,7 @@ var x: {.a: i32} = {.a = 1, .a = 2}; // CHECK:STDERR: var y: {.b: i32, .c: i32} = {.b = 3, .b = 4}; -// CHECK:STDOUT: --- fail_duplicate_name.carbon +// CHECK:STDOUT: --- fail_duplicate_name.carbon = $fail_duplicate_name // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon b/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon index 37cf4e1d20cc..7a3ffc42c0a6 100644 --- a/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon +++ b/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon @@ -43,7 +43,7 @@ var x: {.a: i32} = {.b = 1}; // CHECK:STDERR: var y: {.b: i32} = x; -// CHECK:STDOUT: --- fail_field_name_mismatch.carbon +// CHECK:STDOUT: --- fail_field_name_mismatch.carbon = $fail_field_name_mismatch // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon b/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon index 6181ed69db0b..f8ffe030138d 100644 --- a/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon +++ b/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon @@ -21,7 +21,7 @@ // CHECK:STDERR: var x: {.a: i32} = {.b = 1.0}; -// CHECK:STDOUT: --- fail_field_type_mismatch.carbon +// CHECK:STDOUT: --- fail_field_type_mismatch.carbon = $fail_field_type_mismatch // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/struct/fail_member_access_type.carbon b/toolchain/check/testdata/struct/fail_member_access_type.carbon index ccbab1673044..4c1d8d5f61cc 100644 --- a/toolchain/check/testdata/struct/fail_member_access_type.carbon +++ b/toolchain/check/testdata/struct/fail_member_access_type.carbon @@ -22,7 +22,7 @@ var x: {.a: f64} = {.a = 4.0}; // CHECK:STDERR: var y: i32 = x.b; -// CHECK:STDOUT: --- fail_member_access_type.carbon +// CHECK:STDOUT: --- fail_member_access_type.carbon = $fail_member_access_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/struct/fail_member_of_function.carbon b/toolchain/check/testdata/struct/fail_member_of_function.carbon index 8a3e84dcf453..ba974fb636c2 100644 --- a/toolchain/check/testdata/struct/fail_member_of_function.carbon +++ b/toolchain/check/testdata/struct/fail_member_of_function.carbon @@ -23,7 +23,7 @@ fn A() { A.y; } -// CHECK:STDOUT: --- fail_member_of_function.carbon +// CHECK:STDOUT: --- fail_member_of_function.carbon = $fail_member_of_function // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/struct/fail_nested_incomplete.carbon b/toolchain/check/testdata/struct/fail_nested_incomplete.carbon index 91e5919271f7..b800ecf935e3 100644 --- a/toolchain/check/testdata/struct/fail_nested_incomplete.carbon +++ b/toolchain/check/testdata/struct/fail_nested_incomplete.carbon @@ -30,7 +30,7 @@ var s: {.a: Incomplete}; var p: Incomplete* = &s.a; -// CHECK:STDOUT: --- fail_nested_incomplete.carbon +// CHECK:STDOUT: --- fail_nested_incomplete.carbon = $fail_nested_incomplete // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/struct/fail_non_member_access.carbon b/toolchain/check/testdata/struct/fail_non_member_access.carbon index c925bddfd9e5..07360a30afda 100644 --- a/toolchain/check/testdata/struct/fail_non_member_access.carbon +++ b/toolchain/check/testdata/struct/fail_non_member_access.carbon @@ -22,7 +22,7 @@ var x: {.a: i32} = {.a = 4}; // CHECK:STDERR: var y: i32 = x.b; -// CHECK:STDOUT: --- fail_non_member_access.carbon +// CHECK:STDOUT: --- fail_non_member_access.carbon = $fail_non_member_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/struct/fail_too_few_values.carbon b/toolchain/check/testdata/struct/fail_too_few_values.carbon index 20a3dc88e178..2928e7c45e89 100644 --- a/toolchain/check/testdata/struct/fail_too_few_values.carbon +++ b/toolchain/check/testdata/struct/fail_too_few_values.carbon @@ -22,7 +22,7 @@ // CHECK:STDERR: var x: {.a: i32, .b: i32} = {.a = 1}; -// CHECK:STDOUT: --- fail_too_few_values.carbon +// CHECK:STDOUT: --- fail_too_few_values.carbon = $fail_too_few_values // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/struct/fail_type_assign.carbon b/toolchain/check/testdata/struct/fail_type_assign.carbon index 9efc1d3ebed4..0e840faac6f3 100644 --- a/toolchain/check/testdata/struct/fail_type_assign.carbon +++ b/toolchain/check/testdata/struct/fail_type_assign.carbon @@ -23,7 +23,7 @@ // CHECK:STDERR: var x: {.a: i32} = {.a: i32}; -// CHECK:STDOUT: --- fail_type_assign.carbon +// CHECK:STDOUT: --- fail_type_assign.carbon = $fail_type_assign // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/struct/fail_value_as_type.carbon b/toolchain/check/testdata/struct/fail_value_as_type.carbon index b8a360e4d3e0..9ce278153e78 100644 --- a/toolchain/check/testdata/struct/fail_value_as_type.carbon +++ b/toolchain/check/testdata/struct/fail_value_as_type.carbon @@ -25,7 +25,7 @@ // CHECK:STDERR: var x: {.a = 1}; -// CHECK:STDOUT: --- fail_value_as_type.carbon +// CHECK:STDOUT: --- fail_value_as_type.carbon = $fail_value_as_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/struct/import.carbon b/toolchain/check/testdata/struct/import.carbon index 52ab183878b9..3b9cab5bd306 100644 --- a/toolchain/check/testdata/struct/import.carbon +++ b/toolchain/check/testdata/struct/import.carbon @@ -88,7 +88,7 @@ fn F() -> {.x: i32} { //@dump-sem-ir-end } -// CHECK:STDOUT: --- implicit.impl.carbon +// CHECK:STDOUT: --- implicit.impl.carbon = $implicit.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -292,7 +292,7 @@ fn F() -> {.x: i32} { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_symbolic_decl.carbon +// CHECK:STDOUT: --- import_symbolic_decl.carbon = $import_symbolic_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/struct/literal_member_access.carbon b/toolchain/check/testdata/struct/literal_member_access.carbon index 7a61ae6a5b11..9e7f661f3aed 100644 --- a/toolchain/check/testdata/struct/literal_member_access.carbon +++ b/toolchain/check/testdata/struct/literal_member_access.carbon @@ -18,7 +18,7 @@ fn F() -> i32 { return {.a = 1, .b = G(), .c = 3}.b.y; } -// CHECK:STDOUT: --- literal_member_access.carbon +// CHECK:STDOUT: --- literal_member_access.carbon = $literal_member_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/struct/member_access.carbon b/toolchain/check/testdata/struct/member_access.carbon index 0d9c177d9ab9..6aa0bf689dae 100644 --- a/toolchain/check/testdata/struct/member_access.carbon +++ b/toolchain/check/testdata/struct/member_access.carbon @@ -16,7 +16,7 @@ var x: {.a: f64, .b: i32} = {.a = 0.0, .b = 1}; var y: i32 = x.b; var z: i32 = y; -// CHECK:STDOUT: --- member_access.carbon +// CHECK:STDOUT: --- member_access.carbon = $member_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/struct/nested_struct_in_place.carbon b/toolchain/check/testdata/struct/nested_struct_in_place.carbon index f23660c36c71..e29b0d79e95d 100644 --- a/toolchain/check/testdata/struct/nested_struct_in_place.carbon +++ b/toolchain/check/testdata/struct/nested_struct_in_place.carbon @@ -18,7 +18,7 @@ fn G() { var unused v: {.a: (i32, i32, i32), .b: (i32, i32, i32)} = {.a = F(), .b = F()}; } -// CHECK:STDOUT: --- nested_struct_in_place.carbon +// CHECK:STDOUT: --- nested_struct_in_place.carbon = $nested_struct_in_place // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/struct/one_entry.carbon b/toolchain/check/testdata/struct/one_entry.carbon index 2e4a3d2b44c4..6a4635375f68 100644 --- a/toolchain/check/testdata/struct/one_entry.carbon +++ b/toolchain/check/testdata/struct/one_entry.carbon @@ -15,7 +15,7 @@ var x: {.a: i32} = {.a = 4}; var y: {.a: i32} = x; -// CHECK:STDOUT: --- one_entry.carbon +// CHECK:STDOUT: --- one_entry.carbon = $one_entry // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/struct/partially_const.carbon b/toolchain/check/testdata/struct/partially_const.carbon index d9b8935e1cda..90591d64ae01 100644 --- a/toolchain/check/testdata/struct/partially_const.carbon +++ b/toolchain/check/testdata/struct/partially_const.carbon @@ -16,7 +16,7 @@ fn Make(n: i32) -> {.a: i32, .b: i32, .c: i32} { return {.a = 0, .b = n, .c = 0}; } -// CHECK:STDOUT: --- partially_const.carbon +// CHECK:STDOUT: --- partially_const.carbon = $partially_const // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/struct/reorder_fields.carbon b/toolchain/check/testdata/struct/reorder_fields.carbon index 104368e6ff90..e5e6f26f81a6 100644 --- a/toolchain/check/testdata/struct/reorder_fields.carbon +++ b/toolchain/check/testdata/struct/reorder_fields.carbon @@ -21,7 +21,7 @@ fn F() -> {.a: i32, .b: f64} { return y; } -// CHECK:STDOUT: --- reorder_fields.carbon +// CHECK:STDOUT: --- reorder_fields.carbon = $reorder_fields // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/struct/tuple_as_element.carbon b/toolchain/check/testdata/struct/tuple_as_element.carbon index ddbf8261eb1e..edfae8544872 100644 --- a/toolchain/check/testdata/struct/tuple_as_element.carbon +++ b/toolchain/check/testdata/struct/tuple_as_element.carbon @@ -15,7 +15,7 @@ var x: {.a: i32, .b: (i32,)} = {.a = 1, .b = (2,)}; var y: {.a: i32, .b: (i32,)} = x; -// CHECK:STDOUT: --- tuple_as_element.carbon +// CHECK:STDOUT: --- tuple_as_element.carbon = $tuple_as_element // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/struct/two_entries.carbon b/toolchain/check/testdata/struct/two_entries.carbon index c6413eb63dee..493cd4aa3bb8 100644 --- a/toolchain/check/testdata/struct/two_entries.carbon +++ b/toolchain/check/testdata/struct/two_entries.carbon @@ -18,7 +18,7 @@ let w: {.a: i32, .b: i32} = v; var x: {.a: i32, .b: i32} = {.a = 1, .b = 2}; var y: {.a: i32, .b: i32} = x; -// CHECK:STDOUT: --- two_entries.carbon +// CHECK:STDOUT: --- two_entries.carbon = $two_entries // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/tuple/basics.carbon b/toolchain/check/testdata/tuple/basics.carbon index fd1baa38be5c..71fcdbd580cd 100644 --- a/toolchain/check/testdata/tuple/basics.carbon +++ b/toolchain/check/testdata/tuple/basics.carbon @@ -48,7 +48,7 @@ var x: ((), ()) = ((), ()); var y: ((), ()) = x; //@dump-sem-ir-end -// CHECK:STDOUT: --- empty.carbon +// CHECK:STDOUT: --- empty.carbon = $empty // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -97,7 +97,7 @@ var y: ((), ()) = x; // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- nested_tuple.carbon +// CHECK:STDOUT: --- nested_tuple.carbon = $nested_tuple // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -165,7 +165,7 @@ var y: ((), ()) = x; // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- one_element.carbon +// CHECK:STDOUT: --- one_element.carbon = $one_element // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -230,7 +230,7 @@ var y: ((), ()) = x; // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- two_elements.carbon +// CHECK:STDOUT: --- two_elements.carbon = $two_elements // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/tuple/element_access.carbon b/toolchain/check/testdata/tuple/element_access.carbon index e347e6be27ae..80a6eee5689e 100644 --- a/toolchain/check/testdata/tuple/element_access.carbon +++ b/toolchain/check/testdata/tuple/element_access.carbon @@ -244,7 +244,7 @@ var a: (i32, i32) = (12, 34); // CHECK:STDERR: var b: i32 = a.({.index = 2}.index); -// CHECK:STDOUT: --- basics.carbon +// CHECK:STDOUT: --- basics.carbon = $basics // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -300,7 +300,7 @@ var b: i32 = a.({.index = 2}.index); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- index_not_literal.carbon +// CHECK:STDOUT: --- index_not_literal.carbon = $index_not_literal // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -476,7 +476,7 @@ var b: i32 = a.({.index = 2}.index); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- return_value_access.carbon +// CHECK:STDOUT: --- return_value_access.carbon = $return_value_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/tuple/import.carbon b/toolchain/check/testdata/tuple/import.carbon index 7d4963cb16de..cc542eda8c3d 100644 --- a/toolchain/check/testdata/tuple/import.carbon +++ b/toolchain/check/testdata/tuple/import.carbon @@ -91,7 +91,7 @@ fn F() -> (i32,) { //@dump-sem-ir-end } -// CHECK:STDOUT: --- implicit.impl.carbon +// CHECK:STDOUT: --- implicit.impl.carbon = $implicit.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -323,7 +323,7 @@ fn F() -> (i32,) { // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- import_symbolic_decl.carbon +// CHECK:STDOUT: --- import_symbolic_decl.carbon = $import_symbolic_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/tuple/in_place_tuple_init.carbon b/toolchain/check/testdata/tuple/in_place_tuple_init.carbon index d6e01fb67626..a23abcce7ab6 100644 --- a/toolchain/check/testdata/tuple/in_place_tuple_init.carbon +++ b/toolchain/check/testdata/tuple/in_place_tuple_init.carbon @@ -46,7 +46,7 @@ fn H() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- in_place_tuple_init.carbon +// CHECK:STDOUT: --- in_place_tuple_init.carbon = $in_place_tuple_init // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -183,7 +183,7 @@ fn H() { // CHECK:STDOUT: return %Int.as.Copy.impl.Op.call // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- nested_tuple_in_place.carbon +// CHECK:STDOUT: --- nested_tuple_in_place.carbon = $nested_tuple_in_place // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/tuple/tuple_pattern.carbon b/toolchain/check/testdata/tuple/tuple_pattern.carbon index 403cddeef46f..b2f137b86ee2 100644 --- a/toolchain/check/testdata/tuple/tuple_pattern.carbon +++ b/toolchain/check/testdata/tuple/tuple_pattern.carbon @@ -104,7 +104,7 @@ let (x: {}, y: {}) = ({},); // CHECK:STDERR: let (a: {}, b: {}) = ({}, {}, {}); -// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: --- basic.carbon = $basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -280,7 +280,7 @@ let (a: {}, b: {}) = ({}, {}, {}); // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- variable.carbon +// CHECK:STDOUT: --- variable.carbon = $variable // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -534,7 +534,7 @@ let (a: {}, b: {}) = ({}, {}, {}); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- nested.carbon +// CHECK:STDOUT: --- nested.carbon = $nested // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -592,7 +592,7 @@ let (a: {}, b: {}) = ({}, {}, {}); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- package_scope.carbon +// CHECK:STDOUT: --- package_scope.carbon = $package_scope // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/typeof/basics.carbon b/toolchain/check/testdata/typeof/basics.carbon index 3d698da7e49a..9ec8164b828b 100644 --- a/toolchain/check/testdata/typeof/basics.carbon +++ b/toolchain/check/testdata/typeof/basics.carbon @@ -134,7 +134,7 @@ library "[[@TEST_NAME]]"; // CHECK:STDERR: var x: typeof(undeclared); -// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: --- basic.carbon = $basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -169,7 +169,7 @@ var x: typeof(undeclared); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- type_of_type.carbon +// CHECK:STDOUT: --- type_of_type.carbon = $type_of_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -194,7 +194,7 @@ var x: typeof(undeclared); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- not_evaluated.carbon +// CHECK:STDOUT: --- not_evaluated.carbon = $not_evaluated // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -256,7 +256,7 @@ var x: typeof(undeclared); // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc10_3.2(%self.param: ref %C) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- control_flow.carbon +// CHECK:STDOUT: --- control_flow.carbon = $control_flow // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -288,7 +288,7 @@ var x: typeof(undeclared); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- member_access.carbon +// CHECK:STDOUT: --- member_access.carbon = $member_access // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -308,7 +308,7 @@ var x: typeof(undeclared); // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- generic.carbon +// CHECK:STDOUT: --- generic.carbon = $generic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/var/destroy_control_flow.carbon b/toolchain/check/testdata/var/destroy_control_flow.carbon index d4871e85ea81..80ce112bd141 100644 --- a/toolchain/check/testdata/var/destroy_control_flow.carbon +++ b/toolchain/check/testdata/var/destroy_control_flow.carbon @@ -122,7 +122,7 @@ fn WhileContinue(cond: bool) { //@dump-sem-ir-end } -// CHECK:STDOUT: --- if_then.carbon +// CHECK:STDOUT: --- if_then.carbon = $if_then // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -217,7 +217,7 @@ fn WhileContinue(cond: bool) { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc10_5.2(%self.param: ref %Destructible) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- if_else.carbon +// CHECK:STDOUT: --- if_else.carbon = $if_else // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -338,7 +338,7 @@ fn WhileContinue(cond: bool) { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc10_5.2(%self.param: ref %Destructible) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- if_return.carbon +// CHECK:STDOUT: --- if_return.carbon = $if_return // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -435,7 +435,7 @@ fn WhileContinue(cond: bool) { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc10_5.2(%self.param: ref %Destructible) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- while_break.carbon +// CHECK:STDOUT: --- while_break.carbon = $while_break // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -573,7 +573,7 @@ fn WhileContinue(cond: bool) { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc14_7.2(%self.param: ref %Destructible) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- while_continue.carbon +// CHECK:STDOUT: --- while_continue.carbon = $while_continue // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/var/export_name.carbon b/toolchain/check/testdata/var/export_name.carbon index 7a95b219f75b..967217a6fd23 100644 --- a/toolchain/check/testdata/var/export_name.carbon +++ b/toolchain/check/testdata/var/export_name.carbon @@ -42,7 +42,7 @@ import library "export"; var w: () = v; -// CHECK:STDOUT: --- base.carbon +// CHECK:STDOUT: --- base.carbon = $base // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -103,7 +103,7 @@ var w: () = v; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- export.carbon +// CHECK:STDOUT: --- export.carbon = $export // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -132,7 +132,7 @@ var w: () = v; // CHECK:STDOUT: %v: ref %empty_tuple.type = export v, imports.%Main.v [concrete = imports.%v.var] // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_export.carbon +// CHECK:STDOUT: --- use_export.carbon = $use_export // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/var/fail_duplicate_decl.carbon b/toolchain/check/testdata/var/fail_duplicate_decl.carbon index eb76e5496388..5bdf8c3d6d2e 100644 --- a/toolchain/check/testdata/var/fail_duplicate_decl.carbon +++ b/toolchain/check/testdata/var/fail_duplicate_decl.carbon @@ -30,7 +30,7 @@ fn Main() { var unused x: () = (); } -// CHECK:STDOUT: --- fail_basic.carbon +// CHECK:STDOUT: --- fail_basic.carbon = $fail_basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/var/fail_generic.carbon b/toolchain/check/testdata/var/fail_generic.carbon index 96d2435f832f..d1d0439463a3 100644 --- a/toolchain/check/testdata/var/fail_generic.carbon +++ b/toolchain/check/testdata/var/fail_generic.carbon @@ -31,7 +31,7 @@ fn Main() { var generic x: () = (); } -// CHECK:STDOUT: --- fail_generic.carbon +// CHECK:STDOUT: --- fail_generic.carbon = $fail_generic // CHECK:STDOUT: // CHECK:STDOUT: fn @Main(); // CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/fail_init_type_mismatch.carbon b/toolchain/check/testdata/var/fail_init_type_mismatch.carbon index 9737eb666017..4caaa64aa2ad 100644 --- a/toolchain/check/testdata/var/fail_init_type_mismatch.carbon +++ b/toolchain/check/testdata/var/fail_init_type_mismatch.carbon @@ -23,7 +23,7 @@ // CHECK:STDERR: var x: {} = (); -// CHECK:STDOUT: --- fail_init_type_mismatch.carbon +// CHECK:STDOUT: --- fail_init_type_mismatch.carbon = $fail_init_type_mismatch // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/var/fail_init_with_self.carbon b/toolchain/check/testdata/var/fail_init_with_self.carbon index 8a259c0ab07e..685489933bcc 100644 --- a/toolchain/check/testdata/var/fail_init_with_self.carbon +++ b/toolchain/check/testdata/var/fail_init_with_self.carbon @@ -33,7 +33,7 @@ fn Main() { var unused x: () = x; } -// CHECK:STDOUT: --- fail_basic.carbon +// CHECK:STDOUT: --- fail_basic.carbon = $fail_basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/var/fail_storage_is_literal.carbon b/toolchain/check/testdata/var/fail_storage_is_literal.carbon index 506773dc0779..a0135fab3751 100644 --- a/toolchain/check/testdata/var/fail_storage_is_literal.carbon +++ b/toolchain/check/testdata/var/fail_storage_is_literal.carbon @@ -27,7 +27,7 @@ fn Main() { var unused x: 1 = 1; } -// CHECK:STDOUT: --- fail_storage_is_literal.carbon +// CHECK:STDOUT: --- fail_storage_is_literal.carbon = $fail_storage_is_literal // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/var/fail_todo_control_flow_init.carbon b/toolchain/check/testdata/var/fail_todo_control_flow_init.carbon index 75ca35c5b8cf..8efbf244cede 100644 --- a/toolchain/check/testdata/var/fail_todo_control_flow_init.carbon +++ b/toolchain/check/testdata/var/fail_todo_control_flow_init.carbon @@ -126,11 +126,11 @@ library "[[@TEST_NAME]]"; // CHECK:STDERR: var y2: bool = false or true; -// CHECK:STDOUT: --- fail_if_true.carbon +// CHECK:STDOUT: --- fail_if_true.carbon = $fail_if_true // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_if_false.carbon +// CHECK:STDOUT: --- fail_if_false.carbon = $fail_if_false // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_true_or_false.carbon +// CHECK:STDOUT: --- fail_true_or_false.carbon = $fail_true_or_false // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_false_or_true.carbon +// CHECK:STDOUT: --- fail_false_or_true.carbon = $fail_false_or_true // CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/global_decl.carbon b/toolchain/check/testdata/var/global_decl.carbon index fc93f57a7438..5df2dd56ac8a 100644 --- a/toolchain/check/testdata/var/global_decl.carbon +++ b/toolchain/check/testdata/var/global_decl.carbon @@ -14,7 +14,7 @@ var x: {.v: ()} = {.v = ()}; //@dump-sem-ir-end -// CHECK:STDOUT: --- global_decl.carbon +// CHECK:STDOUT: --- global_decl.carbon = $global_decl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/var/global_decl_import.carbon b/toolchain/check/testdata/var/global_decl_import.carbon index d18cbcb82bb1..80ff03932a29 100644 --- a/toolchain/check/testdata/var/global_decl_import.carbon +++ b/toolchain/check/testdata/var/global_decl_import.carbon @@ -28,7 +28,7 @@ fn G() -> {.v: ()} { //@dump-sem-ir-end } -// CHECK:STDOUT: --- import.carbon +// CHECK:STDOUT: --- import.carbon = $import // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/var/global_decl_with_init.carbon b/toolchain/check/testdata/var/global_decl_with_init.carbon index 51f423c98673..908c492dc368 100644 --- a/toolchain/check/testdata/var/global_decl_with_init.carbon +++ b/toolchain/check/testdata/var/global_decl_with_init.carbon @@ -30,7 +30,7 @@ library "[[@TEST_NAME]]"; var (x: (), y: ()) = ((), ()); -// CHECK:STDOUT: --- simple.carbon +// CHECK:STDOUT: --- simple.carbon = $simple // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -74,7 +74,7 @@ var (x: (), y: ()) = ((), ()); // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- var_in_tuple.carbon +// CHECK:STDOUT: --- var_in_tuple.carbon = $var_in_tuple // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -127,7 +127,7 @@ var (x: (), y: ()) = ((), ()); // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- tuple_in_var.carbon +// CHECK:STDOUT: --- tuple_in_var.carbon = $tuple_in_var // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/var/global_lookup.carbon b/toolchain/check/testdata/var/global_lookup.carbon index 9ec8c40437a9..9ce3ab51724b 100644 --- a/toolchain/check/testdata/var/global_lookup.carbon +++ b/toolchain/check/testdata/var/global_lookup.carbon @@ -15,7 +15,7 @@ var x: {.v: ()} = {.v = ()}; var y: {.v: ()} = x; -// CHECK:STDOUT: --- global_lookup.carbon +// CHECK:STDOUT: --- global_lookup.carbon = $global_lookup // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/var/global_lookup_in_scope.carbon b/toolchain/check/testdata/var/global_lookup_in_scope.carbon index 8086c62a5056..d2f15f2e2c47 100644 --- a/toolchain/check/testdata/var/global_lookup_in_scope.carbon +++ b/toolchain/check/testdata/var/global_lookup_in_scope.carbon @@ -20,7 +20,7 @@ fn Main() { var unused y: {.v: ()} = x; } -// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: --- basic.carbon = $basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/var/import.carbon b/toolchain/check/testdata/var/import.carbon index 63ae5454bb9a..bede6ad9617e 100644 --- a/toolchain/check/testdata/var/import.carbon +++ b/toolchain/check/testdata/var/import.carbon @@ -24,7 +24,7 @@ impl package Implicit; var a: () = a_ref; -// CHECK:STDOUT: --- implicit.carbon +// CHECK:STDOUT: --- implicit.carbon = $implicit // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -60,7 +60,7 @@ var a: () = a_ref; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- implicit.impl.carbon +// CHECK:STDOUT: --- implicit.impl.carbon = $implicit.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/var/import_access.carbon b/toolchain/check/testdata/var/import_access.carbon index 8f69f26282b4..e61e186d4d4f 100644 --- a/toolchain/check/testdata/var/import_access.carbon +++ b/toolchain/check/testdata/var/import_access.carbon @@ -61,7 +61,7 @@ import Test library "def"; // CHECK:STDERR: var v2: () = Test.v; -// CHECK:STDOUT: --- def.carbon +// CHECK:STDOUT: --- def.carbon = $def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -97,7 +97,7 @@ var v2: () = Test.v; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- def.impl.carbon +// CHECK:STDOUT: --- def.impl.carbon = $def.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -143,7 +143,7 @@ var v2: () = Test.v; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_local_def.carbon +// CHECK:STDOUT: --- fail_local_def.carbon = $fail_local_def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -179,7 +179,7 @@ var v2: () = Test.v; // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_other_def.carbon +// CHECK:STDOUT: --- fail_other_def.carbon = $fail_other_def // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/var/initialization.carbon b/toolchain/check/testdata/var/initialization.carbon index 727d062a03eb..51028775c77a 100644 --- a/toolchain/check/testdata/var/initialization.carbon +++ b/toolchain/check/testdata/var/initialization.carbon @@ -66,7 +66,7 @@ fn Main() { var unused x: A; } -// CHECK:STDOUT: --- initialized.carbon +// CHECK:STDOUT: --- initialized.carbon = $initialized // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -120,7 +120,7 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8(%self.param: ref %empty_tuple.type) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- uninitialized.carbon +// CHECK:STDOUT: --- uninitialized.carbon = $uninitialized // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/var/lifetime.carbon b/toolchain/check/testdata/var/lifetime.carbon index a6062da1202b..e8952ba113bc 100644 --- a/toolchain/check/testdata/var/lifetime.carbon +++ b/toolchain/check/testdata/var/lifetime.carbon @@ -33,7 +33,7 @@ fn F() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- extend.carbon +// CHECK:STDOUT: --- extend.carbon = $extend // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/var/lookup.carbon b/toolchain/check/testdata/var/lookup.carbon index 9181619b22bc..b89264098f7f 100644 --- a/toolchain/check/testdata/var/lookup.carbon +++ b/toolchain/check/testdata/var/lookup.carbon @@ -17,7 +17,7 @@ fn Main() { x; } -// CHECK:STDOUT: --- lookup.carbon +// CHECK:STDOUT: --- lookup.carbon = $lookup // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/var/shadowing.carbon b/toolchain/check/testdata/var/shadowing.carbon index f3881bfb3762..81958ba74ca2 100644 --- a/toolchain/check/testdata/var/shadowing.carbon +++ b/toolchain/check/testdata/var/shadowing.carbon @@ -29,7 +29,7 @@ fn Main() { } } -// CHECK:STDOUT: --- basics.carbon +// CHECK:STDOUT: --- basics.carbon = $basics // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/var/var_pattern.carbon b/toolchain/check/testdata/var/var_pattern.carbon index 5c869e5792ee..60e0a4ed4866 100644 --- a/toolchain/check/testdata/var/var_pattern.carbon +++ b/toolchain/check/testdata/var/var_pattern.carbon @@ -197,7 +197,7 @@ fn Call() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: --- basic.carbon = $basic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -271,7 +271,7 @@ fn Call() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc5(%self.param: ref %empty_tuple.type) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- var_in_tuple.carbon +// CHECK:STDOUT: --- var_in_tuple.carbon = $var_in_tuple // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -361,7 +361,7 @@ fn Call() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc5(%self.param: ref %empty_tuple.type) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- tuple_in_var.carbon +// CHECK:STDOUT: --- tuple_in_var.carbon = $tuple_in_var // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -489,7 +489,7 @@ fn Call() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- tuple_in_let_var.carbon +// CHECK:STDOUT: --- tuple_in_let_var.carbon = $tuple_in_let_var // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -617,7 +617,7 @@ fn Call() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- function.carbon +// CHECK:STDOUT: --- function.carbon = $function // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -735,7 +735,7 @@ fn Call() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc4(%self.param: ref %empty_tuple.type) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- public_function.carbon +// CHECK:STDOUT: --- public_function.carbon = $public_function // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -786,7 +786,7 @@ fn Call() { // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%x.param: %empty_tuple.type, %y.param: ref %empty_tuple.type); // CHECK:STDOUT: -// CHECK:STDOUT: --- public_function.impl.carbon +// CHECK:STDOUT: --- public_function.impl.carbon = $public_function.impl // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -842,7 +842,7 @@ fn Call() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- use_public_function.carbon +// CHECK:STDOUT: --- use_public_function.carbon = $use_public_function // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -924,15 +924,15 @@ fn Call() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.2(%self.param: ref %empty_tuple.type) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_nested.carbon +// CHECK:STDOUT: --- fail_nested.carbon = $fail_nested // CHECK:STDOUT: // CHECK:STDOUT: fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_compile_time.carbon +// CHECK:STDOUT: --- fail_compile_time.carbon = $fail_compile_time // CHECK:STDOUT: // CHECK:STDOUT: fn @f(); // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_implicit.carbon +// CHECK:STDOUT: --- fail_implicit.carbon = $fail_implicit // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -964,7 +964,7 @@ fn Call() { // CHECK:STDOUT: // CHECK:STDOUT: fn @G(); // CHECK:STDOUT: -// CHECK:STDOUT: --- var_self.carbon +// CHECK:STDOUT: --- var_self.carbon = $var_self // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1016,7 +1016,7 @@ fn Call() { // CHECK:STDOUT: // CHECK:STDOUT: fn @C.F(%self.param.loc5_8: ref %C, %self.param.loc5_12: %C); // CHECK:STDOUT: -// CHECK:STDOUT: --- nested_match.carbon +// CHECK:STDOUT: --- nested_match.carbon = $nested_match // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1150,7 +1150,7 @@ fn Call() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc8(%self.param: ref %empty_tuple.type) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- var_param_from_init.carbon +// CHECK:STDOUT: --- var_param_from_init.carbon = $var_param_from_init // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -1216,7 +1216,7 @@ fn Call() { // CHECK:STDOUT: // CHECK:STDOUT: fn @SubobjectDestroy.WithSelf.Op.loc7_12.2(%self.param: ref %X) = "no_op"; // CHECK:STDOUT: -// CHECK:STDOUT: --- var_param_from_int_literal.carbon +// CHECK:STDOUT: --- var_param_from_int_literal.carbon = $var_param_from_int_literal // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/where_expr/constraints.carbon b/toolchain/check/testdata/where_expr/constraints.carbon index d3b5ecf0355a..35cdaab875a6 100644 --- a/toolchain/check/testdata/where_expr/constraints.carbon +++ b/toolchain/check/testdata/where_expr/constraints.carbon @@ -242,7 +242,7 @@ fn F() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- self_impls_type.carbon +// CHECK:STDOUT: --- self_impls_type.carbon = $self_impls_type // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -338,7 +338,7 @@ fn F() { // CHECK:STDOUT: %T.loc13_15.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_self_impls_error.carbon +// CHECK:STDOUT: --- fail_self_impls_error.carbon = $fail_self_impls_error // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -386,7 +386,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: specific @F() {} // CHECK:STDOUT: -// CHECK:STDOUT: --- state_constraints.carbon +// CHECK:STDOUT: --- state_constraints.carbon = $state_constraints // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -549,7 +549,7 @@ fn F() { // CHECK:STDOUT: %W.loc16_17.1 => constants.%W // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- associated_type_impls.carbon +// CHECK:STDOUT: --- associated_type_impls.carbon = $associated_type_impls // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -619,7 +619,7 @@ fn F() { // CHECK:STDOUT: %W.loc12_33.1 => constants.%W // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fail_error_in_constraint.carbon +// CHECK:STDOUT: --- fail_error_in_constraint.carbon = $fail_error_in_constraint // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -659,7 +659,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: specific @WithError() {} // CHECK:STDOUT: -// CHECK:STDOUT: --- import_error_in_constraint.carbon +// CHECK:STDOUT: --- import_error_in_constraint.carbon = $import_error_in_constraint // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/where_expr/designator.carbon b/toolchain/check/testdata/where_expr/designator.carbon index 63a184785bff..ca677a366b64 100644 --- a/toolchain/check/testdata/where_expr/designator.carbon +++ b/toolchain/check/testdata/where_expr/designator.carbon @@ -565,7 +565,7 @@ alias A(U: type) = C; // there is no constraint against `.Self`. fn F(unused T: I where C == A(.Self)) {} -// CHECK:STDOUT: --- success.carbon +// CHECK:STDOUT: --- success.carbon = $success // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/where_expr/dot_self_index.carbon b/toolchain/check/testdata/where_expr/dot_self_index.carbon index 03678be9cce4..4e22ab763ae8 100644 --- a/toolchain/check/testdata/where_expr/dot_self_index.carbon +++ b/toolchain/check/testdata/where_expr/dot_self_index.carbon @@ -25,7 +25,7 @@ fn G(U: Empty(i32) where .A = i32*) { H(i32, U, bool); } -// CHECK:STDOUT: --- dot_self_index.carbon +// CHECK:STDOUT: --- dot_self_index.carbon = $dot_self_index // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/where_expr/equal_rewrite.carbon b/toolchain/check/testdata/where_expr/equal_rewrite.carbon index 3f72ec64179b..530ee72f0407 100644 --- a/toolchain/check/testdata/where_expr/equal_rewrite.carbon +++ b/toolchain/check/testdata/where_expr/equal_rewrite.carbon @@ -278,7 +278,7 @@ let J: ((E where .F = {}) where .G = i32) = bool; // CHECK:STDERR: let K: (E where .F = .Self.G) = bool; -// CHECK:STDOUT: --- equal_constraint.carbon +// CHECK:STDOUT: --- equal_constraint.carbon = $equal_constraint // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -343,7 +343,7 @@ let K: (E where .F = .Self.G) = bool; // CHECK:STDOUT: %T.loc9_19.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- nested_rewrites.carbon +// CHECK:STDOUT: --- nested_rewrites.carbon = $nested_rewrites // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -427,7 +427,7 @@ let K: (E where .F = .Self.G) = bool; // CHECK:STDOUT: %D.loc10_27.1 => constants.%D // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- repeated_rewrite.carbon +// CHECK:STDOUT: --- repeated_rewrite.carbon = $repeated_rewrite // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -578,7 +578,7 @@ let K: (E where .F = .Self.G) = bool; // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- rewrites_reordered.carbon +// CHECK:STDOUT: --- rewrites_reordered.carbon = $rewrites_reordered // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/where_expr/non_generic.carbon b/toolchain/check/testdata/where_expr/non_generic.carbon index dcdc25af64bd..c9ab4f5313ba 100644 --- a/toolchain/check/testdata/where_expr/non_generic.carbon +++ b/toolchain/check/testdata/where_expr/non_generic.carbon @@ -17,7 +17,7 @@ interface I { let T: type; } fn NotGenericF(unused U: I where .T == i32) {} //@dump-sem-ir-end -// CHECK:STDOUT: --- non_generic.carbon +// CHECK:STDOUT: --- non_generic.carbon = $non_generic // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/while/lifetime.carbon b/toolchain/check/testdata/while/lifetime.carbon index 8caaae09294d..6421d612ad78 100644 --- a/toolchain/check/testdata/while/lifetime.carbon +++ b/toolchain/check/testdata/while/lifetime.carbon @@ -30,7 +30,7 @@ fn F() { //@dump-sem-ir-end } -// CHECK:STDOUT: --- condition_lifetime.carbon +// CHECK:STDOUT: --- condition_lifetime.carbon = $condition_lifetime // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/check/testdata/while/while.carbon b/toolchain/check/testdata/while/while.carbon index 1b52fa6b9be0..39fb2d8b5b1a 100644 --- a/toolchain/check/testdata/while/while.carbon +++ b/toolchain/check/testdata/while/while.carbon @@ -130,7 +130,7 @@ fn While() { break; } -// CHECK:STDOUT: --- while.carbon +// CHECK:STDOUT: --- while.carbon = $while // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -175,7 +175,7 @@ fn While() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- unreachable_end.carbon +// CHECK:STDOUT: --- unreachable_end.carbon = $unreachable_end // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] @@ -220,7 +220,7 @@ fn While() { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- break_continue.carbon +// CHECK:STDOUT: --- break_continue.carbon = $break_continue // CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: type: type = facet_type [concrete] diff --git a/toolchain/driver/compile_driver.cpp b/toolchain/driver/compile_driver.cpp index 8396cde026d3..467775a458a6 100644 --- a/toolchain/driver/compile_driver.cpp +++ b/toolchain/driver/compile_driver.cpp @@ -636,7 +636,8 @@ auto CompileDriver::Compile(DriverEnv& driver_env) -> DriverResult { } Check::CheckParseTrees(check_units, cache_->tree_and_subtrees_getters(), - driver_env.fs, options, clang_invocation_); + cache_->short_file_names(), driver_env.fs, options, + clang_invocation_); CARBON_VLOG_TO(driver_env.vlog_stream, "*** Check::CheckParseTrees done ***\n"); for (auto& unit : units_) { diff --git a/toolchain/driver/compile_driver.h b/toolchain/driver/compile_driver.h index 8da74ad20a0e..5191f45125f2 100644 --- a/toolchain/driver/compile_driver.h +++ b/toolchain/driver/compile_driver.h @@ -198,7 +198,7 @@ class MultiUnitCache { if (!include_in_dumps_) { include_in_dumps_.emplace( IncludeInDumpsStore::MakeWithExplicitSize(units_.size(), false)); - for (const auto& [i, unit] : llvm::enumerate(units_)) { + for (auto [i, unit] : llvm::enumerate(units_)) { // If this is first accessed after lexing is complete, we need to apply // per-file includes. Otherwise, this is based only on the exclude // option. @@ -219,7 +219,7 @@ class MultiUnitCache { tree_and_subtrees_getters_.emplace( TreeAndSubtreesGettersStore::MakeWithExplicitSize(units_.size(), nullptr)); - for (const auto& [i, unit] : llvm::enumerate(units_)) { + for (auto [i, unit] : llvm::enumerate(units_)) { if (unit->has_source()) { tree_and_subtrees_getters_->Set(SemIR::CheckIRId(i), unit->get_trees_and_subtrees()); @@ -229,6 +229,33 @@ class MultiUnitCache { return *tree_and_subtrees_getters_; } + auto short_file_names() -> const SemIR::ShortFileNameStore& { + if (!short_file_names_) { + SemIR::InstNamer::Namespace compilation_namespace; + llvm::SmallVector namespace_names; + namespace_names.reserve(units_.size()); + for (auto [i, unit] : llvm::enumerate(units_)) { + std::string short_name; + if (unit->has_source()) { + std::filesystem::path file_path( + std::string_view(unit->source().filename())); + short_name = file_path.stem(); + } + namespace_names.push_back( + compilation_namespace.AllocateName(std::move(short_name))); + } + // We need to extract the disambiguated names in a separate pass, because + // they aren't stable until the namespace is fully populated. + short_file_names_.emplace( + SemIR::ShortFileNameStore::MakeWithExplicitSize(units_.size(), "")); + for (auto [i, name] : llvm::enumerate(namespace_names)) { + short_file_names_->Set(SemIR::CheckIRId(i), + std::string(name.GetFullName())); + } + } + return *short_file_names_; + } + private: const CompileOptions* options_; @@ -240,6 +267,9 @@ class MultiUnitCache { // For each unit, the `TreeAndSubtrees` getter. Used by lowering. std::optional tree_and_subtrees_getters_; + + // For each unit, the shorthand name for its file. + std::optional short_file_names_; }; // Helper class to compile C++ and Carbon input files. Used by the `build` and diff --git a/toolchain/driver/testdata/stdin.carbon b/toolchain/driver/testdata/stdin.carbon index 4203e28c953b..5bd00605317a 100644 --- a/toolchain/driver/testdata/stdin.carbon +++ b/toolchain/driver/testdata/stdin.carbon @@ -100,7 +100,7 @@ // CHECK:STDOUT: identifiers: {} // CHECK:STDOUT: strings: {} // CHECK:STDOUT: ... -// CHECK:STDOUT: --- - +// CHECK:STDOUT: --- - = $ // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] {} diff --git a/toolchain/driver/testdata/verbose.carbon b/toolchain/driver/testdata/verbose.carbon index 99600a95a4b9..09996b672305 100644 --- a/toolchain/driver/testdata/verbose.carbon +++ b/toolchain/driver/testdata/verbose.carbon @@ -24,7 +24,7 @@ // CHECK:STDERR: *** Parse::Parse done *** // CHECK:STDERR: *** Check::CheckParseTrees *** // CHECK:STDERR: *** SemIR::File *** -// CHECK:STDERR: --- empty.carbon +// CHECK:STDERR: --- empty.carbon = $empty // CHECK:STDERR: *** Check::CheckParseTrees done *** // CHECK:STDERR: *** Lower::LowerToLLVM: empty.carbon *** // CHECK:STDERR: *** llvm::Module *** diff --git a/toolchain/sem_ir/formatter.cpp b/toolchain/sem_ir/formatter.cpp index bc2cbbb54f6c..50037904db1b 100644 --- a/toolchain/sem_ir/formatter.cpp +++ b/toolchain/sem_ir/formatter.cpp @@ -54,11 +54,12 @@ static auto GetTentativeScopes(const SemIR::File& sem_ir) } Formatter::Formatter( - const File* sem_ir, int total_ir_count, - Parse::GetTreeAndSubtreesFn get_tree_and_subtrees, + const File* sem_ir, const SemIR::ShortFileNameStore* short_file_names, + int total_ir_count, Parse::GetTreeAndSubtreesFn get_tree_and_subtrees, const FixedSizeValueStore* include_ir_in_dumps, bool use_dump_sem_ir_ranges) : sem_ir_(sem_ir), + short_file_names_(short_file_names), inst_namer_(sem_ir_, total_ir_count), get_tree_and_subtrees_(get_tree_and_subtrees), include_ir_in_dumps_(include_ir_in_dumps), @@ -98,7 +99,8 @@ Formatter::Formatter( } auto Formatter::Format() -> void { - out() << "--- " << sem_ir_->filename() << "\n"; + out() << "--- " << sem_ir_->filename() << " = $" + << short_file_names_->Get(sem_ir_->check_ir_id()) << "\n"; for (auto [scope_id, insts] : GetTentativeScopes(*sem_ir_)) { FormatTopLevelScope(scope_id, insts); @@ -1833,6 +1835,8 @@ auto Formatter::FormatTypeOfInst(InstId id) -> void { FormatConstant(sem_ir_->types().GetConstantId(type_id)); } +// TODO: Should this use shorthand file names instead of shorthand library +// names? auto Formatter::GetImportIRLabel(ImportIRId id) -> std::string { CARBON_CHECK(id.has_value(), "Callers are responsible for checking `id.has_value`"); diff --git a/toolchain/sem_ir/formatter.h b/toolchain/sem_ir/formatter.h index 4756d49c5e5d..909a3c054dd6 100644 --- a/toolchain/sem_ir/formatter.h +++ b/toolchain/sem_ir/formatter.h @@ -23,8 +23,8 @@ class Formatter { public: // sem_ir and include_ir_in_dumps must be non-null. explicit Formatter( - const File* sem_ir, int total_ir_count, - Parse::GetTreeAndSubtreesFn get_tree_and_subtrees, + const File* sem_ir, const SemIR::ShortFileNameStore* short_file_names, + int total_ir_count, Parse::GetTreeAndSubtreesFn get_tree_and_subtrees, const FixedSizeValueStore* include_ir_in_dumps, bool use_dump_sem_ir_ranges); @@ -345,6 +345,7 @@ class Formatter { FormatterChunks chunks_; const File* sem_ir_; + const SemIR::ShortFileNameStore* short_file_names_; InstNamer inst_namer_; Parse::GetTreeAndSubtreesFn get_tree_and_subtrees_; diff --git a/toolchain/sem_ir/inst_namer.cpp b/toolchain/sem_ir/inst_namer.cpp index a36e37642fc9..16799c7dfdee 100644 --- a/toolchain/sem_ir/inst_namer.cpp +++ b/toolchain/sem_ir/inst_namer.cpp @@ -342,19 +342,17 @@ auto InstNamer::Namespace::Name::GetBaseName() const -> llvm::StringRef { return value_->first().take_front(base_name_size_); } -auto InstNamer::Namespace::AllocateName( - const InstNamer& inst_namer, - std::variant loc_id_or_fingerprint, std::string name) - -> Name { +auto InstNamer::Namespace::AllocateNameWithSuffixes( + std::string full_name, llvm::ArrayRef name_sizes) -> Name { // The best (shortest) name for this instruction so far, and the current // name for it. Name best; Name current; - const size_t base_name_size = name.size(); + const size_t base_name_size = name_sizes[0]; // Add `name` as a name for this entity. - auto add_name = [&](bool mark_ambiguous = true) { + auto add_name = [&](llvm::StringRef name, bool mark_ambiguous = true) { auto [it, added] = allocated_.insert({name, NameResult()}); Name new_name = Name(it, base_name_size); @@ -376,11 +374,35 @@ auto InstNamer::Namespace::AllocateName( return added; }; - // Use the given name if it's available. - if (!name.empty()) { - add_name(); + int previous_size = -1; + for (auto name_size : name_sizes) { + CARBON_CHECK(name_size > previous_size, "`name_sizes` not sorted"); + previous_size = name_size; + if (name_size > 0) { + add_name(llvm::StringRef(full_name).take_front(name_size)); + } } + CARBON_CHECK(static_cast(previous_size) == full_name.size(), + "`name_sizes` doesn't end with the size of `full_name`"); + // Append numbers until we find an available name. + full_name.push_back('.'); + auto name_size_without_counter = full_name.size(); + for (int counter = 1;; ++counter) { + full_name.resize(name_size_without_counter); + llvm::raw_string_ostream(full_name) << counter; + if (add_name(full_name, /*mark_ambiguous=*/false)) { + return best; + } + } +} + +auto InstNamer::FileNamespace::AllocateName( + const InstNamer& inst_namer, + std::variant loc_id_or_fingerprint, std::string name) + -> Name { + llvm::SmallVector name_sizes; + name_sizes.push_back(name.size()); // Append location information to try to disambiguate. if (auto* loc_id = std::get_if(&loc_id_or_fingerprint)) { *loc_id = inst_namer.sem_ir_->insts().GetCanonicalLocId(*loc_id); @@ -390,11 +412,11 @@ auto InstNamer::Namespace::AllocateName( auto token = tree.node_token(loc_id->node_id()); llvm::raw_string_ostream(name) << ".loc" << tree.tokens().GetLineNumber(token); - add_name(); + name_sizes.push_back(name.size()); llvm::raw_string_ostream(name) << "_" << tree.tokens().GetColumnNumber(token); - add_name(); + name_sizes.push_back(name.size()); } } else { uint64_t fingerprint = std::get(loc_id_or_fingerprint); @@ -405,21 +427,11 @@ auto InstNamer::Namespace::AllocateName( for (int n : llvm::seq(1, 7)) { out.write_hex((fingerprint >> (64 - 4 * n)) & 0xF); if (n >= 3) { - add_name(); + name_sizes.push_back(name.size()); } } } - - // Append numbers until we find an available name. - name.push_back('.'); - auto name_size_without_counter = name.size(); - for (int counter = 1;; ++counter) { - name.resize(name_size_without_counter); - llvm::raw_string_ostream(name) << counter; - if (add_name(/*mark_ambiguous=*/false)) { - return best; - } - } + return AllocateNameWithSuffixes(std::move(name), name_sizes); } auto InstNamer::AddBlockLabel( diff --git a/toolchain/sem_ir/inst_namer.h b/toolchain/sem_ir/inst_namer.h index ffc44a76b45e..2176bf3ceb8d 100644 --- a/toolchain/sem_ir/inst_namer.h +++ b/toolchain/sem_ir/inst_namer.h @@ -27,6 +27,65 @@ namespace Carbon::SemIR { // unable to correctly walk the SemIR. class InstNamer { public: + // A space in which unique names can be allocated. + class Namespace { + private: + // A result of a name lookup. + struct NameResult; + + public: + // A name in a namespace, which might be redirected to refer to another name + // for disambiguation purposes. + class Name { + public: + explicit Name() : value_(nullptr) {} + explicit Name(llvm::StringMap::iterator it, + size_t base_name_size) + : value_(&*it), base_name_size_(base_name_size) {} + + explicit operator bool() const { return value_; } + + // Returns the disambiguated name. Note that this is not stable until + // all names have been added to the `Namespace`. + auto GetFullName() const -> llvm::StringRef; + + // Returns the base name, without any disambiguators. + auto GetBaseName() const -> llvm::StringRef; + + auto SetFallback(Name name) -> void { value_->second.fallback = name; } + + auto SetAmbiguous() -> void { value_->second.ambiguous = true; } + + private: + llvm::StringMapEntry* value_; + + // The base name length within `value_->first()`. + size_t base_name_size_; + }; + + // Allocates and returns a name, handling ambiguity. + auto AllocateName(std::string name) -> Name { + auto size = std::ssize(name); + return AllocateNameWithSuffixes(std::move(name), {size}); + } + + // Allocates and returns a name, handling ambiguity. `full_name` is + // expected to be structured as a base name followed by a series of + // suffixes that add progressively more disambiguation. `name_sizes[N]` + // is the size of the base name plus the first N such suffixes + // (so `name_sizes.back()` should be `full_name.size()`). + auto AllocateNameWithSuffixes(std::string full_name, + llvm::ArrayRef name_sizes) -> Name; + + private: + struct NameResult { + bool ambiguous = false; + Name fallback = Name(); + }; + + llvm::StringMap allocated_; + }; + // int32_t matches the input value size. enum class ScopeId : int32_t { None = -1, @@ -145,60 +204,20 @@ class InstNamer { auto has_name(InstId inst_id) const -> bool; private: - // A space in which unique names can be allocated. - class Namespace { - private: - // A result of a name lookup. - struct NameResult; - + // A namespace within a SemIR::File. + class FileNamespace : public Namespace { public: - // A name in a namespace, which might be redirected to refer to another name - // for disambiguation purposes. - class Name { - public: - explicit Name() : value_(nullptr) {} - explicit Name(llvm::StringMap::iterator it, - size_t base_name_size) - : value_(&*it), base_name_size_(base_name_size) {} - - explicit operator bool() const { return value_; } - - // Returns the disambiguated name. - auto GetFullName() const -> llvm::StringRef; - - // Returns the base name, without any disambiguators. - auto GetBaseName() const -> llvm::StringRef; - - auto SetFallback(Name name) -> void { value_->second.fallback = name; } - - auto SetAmbiguous() -> void { value_->second.ambiguous = true; } - - private: - llvm::StringMapEntry* value_; - - // The base name length within `value_->first()`. - size_t base_name_size_; - }; - // Allocates and returns a name, handling ambiguity. auto AllocateName(const InstNamer& inst_namer, std::variant loc_id_or_fingerprint, std::string name) -> Name; - - private: - struct NameResult { - bool ambiguous = false; - Name fallback = Name(); - }; - - llvm::StringMap allocated_; }; // A named scope that contains named entities. struct Scope { Namespace::Name name; - Namespace insts; - Namespace labels; + FileNamespace insts; + FileNamespace labels; }; // Helper class for naming a single instruction. @@ -277,7 +296,7 @@ class InstNamer { // The namespace for entity names. Names within this namespace are prefixed // with `@` in formatted SemIR. - Namespace globals_; + FileNamespace globals_; // The enclosing scope and name for each instruction, indexed by the InstId's // index. std::vector> insts_; @@ -296,6 +315,9 @@ class InstNamer { llvm::SmallVector> inst_block_stack_; }; +// Value store of short names for Carbon source files. +using ShortFileNameStore = FixedSizeValueStore; + } // namespace Carbon::SemIR #endif // CARBON_TOOLCHAIN_SEM_IR_INST_NAMER_H_