From 433d626b0484b1c6d7f19e7273f2f4269aac1b88 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Tue, 5 Dec 2023 08:37:02 -0800 Subject: [PATCH] Rename SemIR::{Base,Field} -> SemIR::{Base,Field}Decl. (#3452) Also fix printing of unbound element type to say "element" not "field" since we're touching all the relevant SemIR output anyway. --- toolchain/check/context.cpp | 8 +++---- toolchain/check/handle_binding_pattern.cpp | 8 +++---- toolchain/check/handle_class.cpp | 2 +- toolchain/check/handle_name.cpp | 4 ++-- toolchain/check/testdata/class/base.carbon | 10 ++++---- toolchain/check/testdata/class/basic.carbon | 4 ++-- .../check/testdata/class/fail_abstract.carbon | 10 ++++---- .../testdata/class/fail_base_bad_type.carbon | 12 +++++----- .../testdata/class/fail_base_repeated.carbon | 4 ++-- .../testdata/class/fail_base_unbound.carbon | 4 ++-- .../check/testdata/class/fail_init.carbon | 8 +++---- .../class/fail_init_as_inplace.carbon | 8 +++---- .../class/fail_memaccess_category.carbon | 4 ++-- .../testdata/class/fail_unbound_field.carbon | 8 +++---- .../testdata/class/fail_unknown_member.carbon | 4 ++-- .../check/testdata/class/field_access.carbon | 8 +++---- .../class/field_access_in_value.carbon | 8 +++---- toolchain/check/testdata/class/init.carbon | 8 +++---- toolchain/check/testdata/class/init_as.carbon | 8 +++---- .../check/testdata/class/init_nested.carbon | 16 ++++++------- toolchain/check/testdata/class/method.carbon | 4 ++-- toolchain/check/testdata/class/nested.carbon | 24 +++++++++---------- .../check/testdata/class/nested_name.carbon | 4 ++-- .../check/testdata/class/raw_self.carbon | 4 ++-- toolchain/check/testdata/class/self.carbon | 4 ++-- .../check/testdata/class/self_type.carbon | 4 ++-- .../fail_return_with_returned_var.carbon | 8 +++---- .../check/testdata/return/returned_var.carbon | 8 +++---- toolchain/lower/handle_aggregates.cpp | 8 +++---- toolchain/sem_ir/file.cpp | 14 +++++------ toolchain/sem_ir/file.h | 2 +- toolchain/sem_ir/inst_kind.def | 4 ++-- toolchain/sem_ir/typed_insts.h | 14 +++++------ 33 files changed, 124 insertions(+), 124 deletions(-) diff --git a/toolchain/check/context.cpp b/toolchain/check/context.cpp index 8d8cf9566cb5..8d7d749076c5 100644 --- a/toolchain/check/context.cpp +++ b/toolchain/check/context.cpp @@ -360,8 +360,8 @@ auto Context::GetConstantValue(SemIR::InstId inst_id) -> SemIR::InstId { inst_id = inst.As().value_id; break; - case SemIR::Base::Kind: - case SemIR::Field::Kind: + case SemIR::BaseDecl::Kind: + case SemIR::FieldDecl::Kind: case SemIR::FunctionDecl::Kind: return inst_id; @@ -837,7 +837,7 @@ class TypeCompleter { case SemIR::ArrayIndex::Kind: case SemIR::ArrayInit::Kind: case SemIR::Assign::Kind: - case SemIR::Base::Kind: + case SemIR::BaseDecl::Kind: case SemIR::BinaryOperatorAdd::Kind: case SemIR::BindName::Kind: case SemIR::BindValue::Kind: @@ -853,7 +853,7 @@ class TypeCompleter { case SemIR::ClassInit::Kind: case SemIR::Converted::Kind: case SemIR::Deref::Kind: - case SemIR::Field::Kind: + case SemIR::FieldDecl::Kind: case SemIR::FunctionDecl::Kind: case SemIR::Import::Kind: case SemIR::InitializeFrom::Kind: diff --git a/toolchain/check/handle_binding_pattern.cpp b/toolchain/check/handle_binding_pattern.cpp index 6233d895ffea..b94f6b9fb729 100644 --- a/toolchain/check/handle_binding_pattern.cpp +++ b/toolchain/check/handle_binding_pattern.cpp @@ -92,10 +92,10 @@ auto HandleBindingPattern(Context& context, Parse::NodeId parse_node) -> bool { class_info.self_type_id, cast_type_id}); value_type_id = context.CanonicalizeType(field_type_inst_id); value_id = context.AddInst( - SemIR::Field{parse_node, value_type_id, name_id, - SemIR::ElementIndex(context.args_type_info_stack() - .PeekCurrentBlockContents() - .size())}); + SemIR::FieldDecl{parse_node, value_type_id, name_id, + SemIR::ElementIndex(context.args_type_info_stack() + .PeekCurrentBlockContents() + .size())}); // Add a corresponding field to the object representation of the class. context.args_type_info_stack().AddInst( diff --git a/toolchain/check/handle_class.cpp b/toolchain/check/handle_class.cpp index 86330f78086b..bea1dc4ea050 100644 --- a/toolchain/check/handle_class.cpp +++ b/toolchain/check/handle_class.cpp @@ -242,7 +242,7 @@ auto HandleBaseDecl(Context& context, Parse::NodeId parse_node) -> bool { parse_node, context.GetBuiltinType(SemIR::BuiltinKind::TypeType), class_info.self_type_id, base_type_id}); auto field_type_id = context.CanonicalizeType(field_type_inst_id); - class_info.base_id = context.AddInst(SemIR::Base{ + class_info.base_id = context.AddInst(SemIR::BaseDecl{ parse_node, field_type_id, base_type_id, SemIR::ElementIndex( context.args_type_info_stack().PeekCurrentBlockContents().size())}); diff --git a/toolchain/check/handle_name.cpp b/toolchain/check/handle_name.cpp index 71876af98c57..ef635ade8c1b 100644 --- a/toolchain/check/handle_name.cpp +++ b/toolchain/check/handle_name.cpp @@ -58,10 +58,10 @@ static auto GetExprValueForLookupResult(Context& context, static auto GetClassElementIndex(Context& context, SemIR::InstId element_id) -> SemIR::ElementIndex { auto element_inst = context.insts().Get(element_id); - if (auto field = element_inst.TryAs()) { + if (auto field = element_inst.TryAs()) { return field->index; } - if (auto base = element_inst.TryAs()) { + if (auto base = element_inst.TryAs()) { return base->index; } CARBON_FATAL() << "Unexpected value " << element_inst diff --git a/toolchain/check/testdata/class/base.carbon b/toolchain/check/testdata/class/base.carbon index 75b9049d6e70..0abb11ba3a1d 100644 --- a/toolchain/check/testdata/class/base.carbon +++ b/toolchain/check/testdata/class/base.carbon @@ -50,8 +50,8 @@ fn Access(d: Derived) -> (i32, i32) { // CHECK:STDOUT: // CHECK:STDOUT: class @Base { // CHECK:STDOUT: %.loc8_8.1: type = unbound_element_type Base, i32 -// CHECK:STDOUT: %.loc8_8.2: = field b, element0 -// CHECK:STDOUT: %b: = bind_name b, %.loc8_8.2 +// CHECK:STDOUT: %.loc8_8.2: = field_decl b, element0 +// CHECK:STDOUT: %b: = bind_name b, %.loc8_8.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .b = %b @@ -60,10 +60,10 @@ fn Access(d: Derived) -> (i32, i32) { // CHECK:STDOUT: class @Derived { // CHECK:STDOUT: %Base.ref: type = name_ref Base, file.%Base // CHECK:STDOUT: %.loc13_13.1: type = unbound_element_type Derived, Base -// CHECK:STDOUT: %.loc13_13.2: = base Base, element0 +// CHECK:STDOUT: %.loc13_13.2: = base_decl Base, element0 // CHECK:STDOUT: %.loc15_8.1: type = unbound_element_type Derived, i32 -// CHECK:STDOUT: %.loc15_8.2: = field d, element1 -// CHECK:STDOUT: %d: = bind_name d, %.loc15_8.2 +// CHECK:STDOUT: %.loc15_8.2: = field_decl d, element1 +// CHECK:STDOUT: %d: = bind_name d, %.loc15_8.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .base = %.loc13_13.2 diff --git a/toolchain/check/testdata/class/basic.carbon b/toolchain/check/testdata/class/basic.carbon index 571ce74e758d..2dbe8c37fe53 100644 --- a/toolchain/check/testdata/class/basic.carbon +++ b/toolchain/check/testdata/class/basic.carbon @@ -40,8 +40,8 @@ fn Run() -> i32 { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: %.loc14_8.1: type = unbound_element_type Class, i32 -// CHECK:STDOUT: %.loc14_8.2: = field k, element0 -// CHECK:STDOUT: %k: = bind_name k, %.loc14_8.2 +// CHECK:STDOUT: %.loc14_8.2: = field_decl k, element0 +// CHECK:STDOUT: %k: = bind_name k, %.loc14_8.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %F diff --git a/toolchain/check/testdata/class/fail_abstract.carbon b/toolchain/check/testdata/class/fail_abstract.carbon index 53c57b5fa4a5..4ce54535da75 100644 --- a/toolchain/check/testdata/class/fail_abstract.carbon +++ b/toolchain/check/testdata/class/fail_abstract.carbon @@ -54,8 +54,8 @@ fn Access(d: Derived) -> (i32, i32) { // CHECK:STDOUT: // CHECK:STDOUT: class @Abstract { // CHECK:STDOUT: %.loc8_8.1: type = unbound_element_type Abstract, i32 -// CHECK:STDOUT: %.loc8_8.2: = field a, element0 -// CHECK:STDOUT: %a: = bind_name a, %.loc8_8.2 +// CHECK:STDOUT: %.loc8_8.2: = field_decl a, element0 +// CHECK:STDOUT: %a: = bind_name a, %.loc8_8.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .a = %a @@ -64,10 +64,10 @@ fn Access(d: Derived) -> (i32, i32) { // CHECK:STDOUT: class @Derived { // CHECK:STDOUT: %Abstract.ref: type = name_ref Abstract, file.%Abstract // CHECK:STDOUT: %.loc13_17.1: type = unbound_element_type Derived, Abstract -// CHECK:STDOUT: %.loc13_17.2: = base Abstract, element0 +// CHECK:STDOUT: %.loc13_17.2: = base_decl Abstract, element0 // CHECK:STDOUT: %.loc15_8.1: type = unbound_element_type Derived, i32 -// CHECK:STDOUT: %.loc15_8.2: = field d, element1 -// CHECK:STDOUT: %d: = bind_name d, %.loc15_8.2 +// CHECK:STDOUT: %.loc15_8.2: = field_decl d, element1 +// CHECK:STDOUT: %d: = bind_name d, %.loc15_8.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .base = %.loc13_17.2 diff --git a/toolchain/check/testdata/class/fail_base_bad_type.carbon b/toolchain/check/testdata/class/fail_base_bad_type.carbon index c61591f80276..9205f1cd1c9f 100644 --- a/toolchain/check/testdata/class/fail_base_bad_type.carbon +++ b/toolchain/check/testdata/class/fail_base_bad_type.carbon @@ -108,7 +108,7 @@ class DeriveFromFinal { // CHECK:STDOUT: class @DeriveFromNonType { // CHECK:STDOUT: %.loc14_9: i32 = int_literal 32 // CHECK:STDOUT: %.loc14_11.1: type = unbound_element_type DeriveFromNonType, -// CHECK:STDOUT: %.loc14_11.2: = base , element0 +// CHECK:STDOUT: %.loc14_11.2: = base_decl , element0 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .base = %.loc14_11.2 @@ -116,7 +116,7 @@ class DeriveFromFinal { // CHECK:STDOUT: // CHECK:STDOUT: class @DeriveFromi32 { // CHECK:STDOUT: %.loc21_12.1: type = unbound_element_type DeriveFromi32, i32 -// CHECK:STDOUT: %.loc21_12.2: = base i32, element0 +// CHECK:STDOUT: %.loc21_12.2: = base_decl i32, element0 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .base = %.loc21_12.2 @@ -127,7 +127,7 @@ class DeriveFromFinal { // CHECK:STDOUT: %.loc28_15: (type,) = tuple_literal (%Base.ref) // CHECK:STDOUT: %.loc28_16.1: type = converted %.loc28_15, constants.%.loc28_16.1 // CHECK:STDOUT: %.loc28_16.2: type = unbound_element_type DeriveFromTuple, (Base,) -// CHECK:STDOUT: %.loc28_16.3: = base (Base,), element0 +// CHECK:STDOUT: %.loc28_16.3: = base_decl (Base,), element0 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .base = %.loc28_16.3 @@ -136,7 +136,7 @@ class DeriveFromFinal { // CHECK:STDOUT: class @DeriveFromStruct { // CHECK:STDOUT: %.loc37_26: type = struct_type {.a: i32, .b: i32} // CHECK:STDOUT: %.loc37_27.1: type = unbound_element_type DeriveFromStruct, {.a: i32, .b: i32} -// CHECK:STDOUT: %.loc37_27.2: = base {.a: i32, .b: i32}, element0 +// CHECK:STDOUT: %.loc37_27.2: = base_decl {.a: i32, .b: i32}, element0 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .base = %.loc37_27.2 @@ -147,7 +147,7 @@ class DeriveFromFinal { // CHECK:STDOUT: class @DeriveFromIncomplete { // CHECK:STDOUT: %Incomplete.ref: type = name_ref Incomplete, file.%Incomplete // CHECK:STDOUT: %.loc49_19.1: type = unbound_element_type DeriveFromIncomplete, -// CHECK:STDOUT: %.loc49_19.2: = base , element0 +// CHECK:STDOUT: %.loc49_19.2: = base_decl , element0 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .base = %.loc49_19.2 @@ -156,7 +156,7 @@ class DeriveFromFinal { // CHECK:STDOUT: class @DeriveFromFinal { // CHECK:STDOUT: %Final.ref: type = name_ref Final, file.%Final // CHECK:STDOUT: %.loc56_14.1: type = unbound_element_type DeriveFromFinal, Final -// CHECK:STDOUT: %.loc56_14.2: = base Final, element0 +// CHECK:STDOUT: %.loc56_14.2: = base_decl Final, element0 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .base = %.loc56_14.2 diff --git a/toolchain/check/testdata/class/fail_base_repeated.carbon b/toolchain/check/testdata/class/fail_base_repeated.carbon index 033af15b0c48..4ac9da4230a1 100644 --- a/toolchain/check/testdata/class/fail_base_repeated.carbon +++ b/toolchain/check/testdata/class/fail_base_repeated.carbon @@ -64,7 +64,7 @@ class D { // CHECK:STDOUT: class @C { // CHECK:STDOUT: %B1.ref: type = name_ref B1, file.%B1 // CHECK:STDOUT: %.loc11_11.1: type = unbound_element_type C, B1 -// CHECK:STDOUT: %.loc11_11.2: = base B1, element0 +// CHECK:STDOUT: %.loc11_11.2: = base_decl B1, element0 // CHECK:STDOUT: %B2.ref: type = name_ref B2, file.%B2 // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -74,7 +74,7 @@ class D { // CHECK:STDOUT: class @D { // CHECK:STDOUT: %B1.ref.loc23: type = name_ref B1, file.%B1 // CHECK:STDOUT: %.loc23_11.1: type = unbound_element_type D, B1 -// CHECK:STDOUT: %.loc23_11.2: = base B1, element0 +// CHECK:STDOUT: %.loc23_11.2: = base_decl B1, element0 // CHECK:STDOUT: %B1.ref.loc30: type = name_ref B1, file.%B1 // CHECK:STDOUT: // CHECK:STDOUT: !members: diff --git a/toolchain/check/testdata/class/fail_base_unbound.carbon b/toolchain/check/testdata/class/fail_base_unbound.carbon index b80eb6eee5cd..cdc679fca410 100644 --- a/toolchain/check/testdata/class/fail_base_unbound.carbon +++ b/toolchain/check/testdata/class/fail_base_unbound.carbon @@ -32,7 +32,7 @@ let b: B = C.base; // CHECK:STDOUT: %C: type = class_type @C // CHECK:STDOUT: %B.ref: type = name_ref B, %B // CHECK:STDOUT: %C.ref: type = name_ref C, %C -// CHECK:STDOUT: %base.ref: = name_ref base, @C.%.loc10_10.2 +// CHECK:STDOUT: %base.ref: = name_ref base, @C.%.loc10_10.2 // CHECK:STDOUT: %b: B = bind_name b, // CHECK:STDOUT: } // CHECK:STDOUT: @@ -44,7 +44,7 @@ let b: B = C.base; // CHECK:STDOUT: class @C { // CHECK:STDOUT: %B.ref: type = name_ref B, file.%B // CHECK:STDOUT: %.loc10_10.1: type = unbound_element_type C, B -// CHECK:STDOUT: %.loc10_10.2: = base B, element0 +// CHECK:STDOUT: %.loc10_10.2: = base_decl B, element0 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .base = %.loc10_10.2 diff --git a/toolchain/check/testdata/class/fail_init.carbon b/toolchain/check/testdata/class/fail_init.carbon index d1ebfce80505..b841ac9c189e 100644 --- a/toolchain/check/testdata/class/fail_init.carbon +++ b/toolchain/check/testdata/class/fail_init.carbon @@ -43,11 +43,11 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: class @Class { // CHECK:STDOUT: %.loc8_8.1: type = unbound_element_type Class, i32 -// CHECK:STDOUT: %.loc8_8.2: = field a, element0 -// CHECK:STDOUT: %a: = bind_name a, %.loc8_8.2 +// CHECK:STDOUT: %.loc8_8.2: = field_decl a, element0 +// CHECK:STDOUT: %a: = bind_name a, %.loc8_8.2 // CHECK:STDOUT: %.loc9_8.1: type = unbound_element_type Class, i32 -// CHECK:STDOUT: %.loc9_8.2: = field b, element1 -// CHECK:STDOUT: %b: = bind_name b, %.loc9_8.2 +// CHECK:STDOUT: %.loc9_8.2: = field_decl b, element1 +// CHECK:STDOUT: %b: = bind_name b, %.loc9_8.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .a = %a diff --git a/toolchain/check/testdata/class/fail_init_as_inplace.carbon b/toolchain/check/testdata/class/fail_init_as_inplace.carbon index 22bb6cf7a2d5..6d2090bd641a 100644 --- a/toolchain/check/testdata/class/fail_init_as_inplace.carbon +++ b/toolchain/check/testdata/class/fail_init_as_inplace.carbon @@ -40,11 +40,11 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: class @Class { // CHECK:STDOUT: %.loc8_8.1: type = unbound_element_type Class, i32 -// CHECK:STDOUT: %.loc8_8.2: = field a, element0 -// CHECK:STDOUT: %a: = bind_name a, %.loc8_8.2 +// CHECK:STDOUT: %.loc8_8.2: = field_decl a, element0 +// CHECK:STDOUT: %a: = bind_name a, %.loc8_8.2 // CHECK:STDOUT: %.loc9_8.1: type = unbound_element_type Class, i32 -// CHECK:STDOUT: %.loc9_8.2: = field b, element1 -// CHECK:STDOUT: %b: = bind_name b, %.loc9_8.2 +// CHECK:STDOUT: %.loc9_8.2: = field_decl b, element1 +// CHECK:STDOUT: %b: = bind_name b, %.loc9_8.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .a = %a diff --git a/toolchain/check/testdata/class/fail_memaccess_category.carbon b/toolchain/check/testdata/class/fail_memaccess_category.carbon index ffd89f0dfd38..5f50cc852282 100644 --- a/toolchain/check/testdata/class/fail_memaccess_category.carbon +++ b/toolchain/check/testdata/class/fail_memaccess_category.carbon @@ -63,8 +63,8 @@ fn F(s: {.a: A}, b: B) { // CHECK:STDOUT: class @B { // CHECK:STDOUT: %A.ref: type = name_ref A, file.%A // CHECK:STDOUT: %.loc12_8.1: type = unbound_element_type B, A -// CHECK:STDOUT: %.loc12_8.2: = field a, element0 -// CHECK:STDOUT: %a: = bind_name a, %.loc12_8.2 +// CHECK:STDOUT: %.loc12_8.2: = field_decl a, element0 +// CHECK:STDOUT: %a: = bind_name a, %.loc12_8.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .a = %a diff --git a/toolchain/check/testdata/class/fail_unbound_field.carbon b/toolchain/check/testdata/class/fail_unbound_field.carbon index dec14df03e2e..0d76a5967187 100644 --- a/toolchain/check/testdata/class/fail_unbound_field.carbon +++ b/toolchain/check/testdata/class/fail_unbound_field.carbon @@ -36,8 +36,8 @@ fn G() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: class @Class { // CHECK:STDOUT: %.loc8_12.1: type = unbound_element_type Class, i32 -// CHECK:STDOUT: %.loc8_12.2: = field field, element0 -// CHECK:STDOUT: %field: = bind_name field, %.loc8_12.2 +// CHECK:STDOUT: %.loc8_12.2: = field_decl field, element0 +// CHECK:STDOUT: %field: = bind_name field, %.loc8_12.2 // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -47,14 +47,14 @@ fn G() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %field.ref: = name_ref field, @Class.%field +// CHECK:STDOUT: %field.ref: = name_ref field, @Class.%field // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @G() -> i32 { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class -// CHECK:STDOUT: %field.ref: = name_ref field, @Class.%field +// CHECK:STDOUT: %field.ref: = name_ref field, @Class.%field // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_unknown_member.carbon b/toolchain/check/testdata/class/fail_unknown_member.carbon index 79c1ddf3e677..5d33aac94273 100644 --- a/toolchain/check/testdata/class/fail_unknown_member.carbon +++ b/toolchain/check/testdata/class/fail_unknown_member.carbon @@ -32,8 +32,8 @@ fn G(c: Class) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: class @Class { // CHECK:STDOUT: %.loc8_8.1: type = unbound_element_type Class, i32 -// CHECK:STDOUT: %.loc8_8.2: = field n, element0 -// CHECK:STDOUT: %n: = bind_name n, %.loc8_8.2 +// CHECK:STDOUT: %.loc8_8.2: = field_decl n, element0 +// CHECK:STDOUT: %n: = bind_name n, %.loc8_8.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .n = %n diff --git a/toolchain/check/testdata/class/field_access.carbon b/toolchain/check/testdata/class/field_access.carbon index 86d7a9a0b75d..550f0b9b7e48 100644 --- a/toolchain/check/testdata/class/field_access.carbon +++ b/toolchain/check/testdata/class/field_access.carbon @@ -32,11 +32,11 @@ fn Run() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: class @Class { // CHECK:STDOUT: %.loc8_8.1: type = unbound_element_type Class, i32 -// CHECK:STDOUT: %.loc8_8.2: = field j, element0 -// CHECK:STDOUT: %j: = bind_name j, %.loc8_8.2 +// CHECK:STDOUT: %.loc8_8.2: = field_decl j, element0 +// CHECK:STDOUT: %j: = bind_name j, %.loc8_8.2 // CHECK:STDOUT: %.loc9_8.1: type = unbound_element_type Class, i32 -// CHECK:STDOUT: %.loc9_8.2: = field k, element1 -// CHECK:STDOUT: %k: = bind_name k, %.loc9_8.2 +// CHECK:STDOUT: %.loc9_8.2: = field_decl k, element1 +// CHECK:STDOUT: %k: = bind_name k, %.loc9_8.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .j = %j diff --git a/toolchain/check/testdata/class/field_access_in_value.carbon b/toolchain/check/testdata/class/field_access_in_value.carbon index 967d831b47eb..250aa3aa11fb 100644 --- a/toolchain/check/testdata/class/field_access_in_value.carbon +++ b/toolchain/check/testdata/class/field_access_in_value.carbon @@ -33,11 +33,11 @@ fn Run() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: class @Class { // CHECK:STDOUT: %.loc8_8.1: type = unbound_element_type Class, i32 -// CHECK:STDOUT: %.loc8_8.2: = field j, element0 -// CHECK:STDOUT: %j: = bind_name j, %.loc8_8.2 +// CHECK:STDOUT: %.loc8_8.2: = field_decl j, element0 +// CHECK:STDOUT: %j: = bind_name j, %.loc8_8.2 // CHECK:STDOUT: %.loc9_8.1: type = unbound_element_type Class, i32 -// CHECK:STDOUT: %.loc9_8.2: = field k, element1 -// CHECK:STDOUT: %k: = bind_name k, %.loc9_8.2 +// CHECK:STDOUT: %.loc9_8.2: = field_decl k, element1 +// CHECK:STDOUT: %k: = bind_name k, %.loc9_8.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .j = %j diff --git a/toolchain/check/testdata/class/init.carbon b/toolchain/check/testdata/class/init.carbon index aafea891fa5b..2d2394016ddf 100644 --- a/toolchain/check/testdata/class/init.carbon +++ b/toolchain/check/testdata/class/init.carbon @@ -35,13 +35,13 @@ fn MakeReorder(n: i32, next: Class*) -> Class { // CHECK:STDOUT: // CHECK:STDOUT: class @Class { // CHECK:STDOUT: %.loc8_8.1: type = unbound_element_type Class, i32 -// CHECK:STDOUT: %.loc8_8.2: = field n, element0 -// CHECK:STDOUT: %n: = bind_name n, %.loc8_8.2 +// CHECK:STDOUT: %.loc8_8.2: = field_decl n, element0 +// CHECK:STDOUT: %n: = bind_name n, %.loc8_8.2 // CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class // CHECK:STDOUT: %.loc9_18: type = ptr_type Class // CHECK:STDOUT: %.loc9_11.1: type = unbound_element_type Class, Class* -// CHECK:STDOUT: %.loc9_11.2: = field next, element1 -// CHECK:STDOUT: %next: = bind_name next, %.loc9_11.2 +// CHECK:STDOUT: %.loc9_11.2: = field_decl next, element1 +// CHECK:STDOUT: %next: = bind_name next, %.loc9_11.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .n = %n diff --git a/toolchain/check/testdata/class/init_as.carbon b/toolchain/check/testdata/class/init_as.carbon index b81c08ec3823..68f2b8df18e0 100644 --- a/toolchain/check/testdata/class/init_as.carbon +++ b/toolchain/check/testdata/class/init_as.carbon @@ -29,11 +29,11 @@ fn F() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: class @Class { // CHECK:STDOUT: %.loc8_8.1: type = unbound_element_type Class, i32 -// CHECK:STDOUT: %.loc8_8.2: = field a, element0 -// CHECK:STDOUT: %a: = bind_name a, %.loc8_8.2 +// CHECK:STDOUT: %.loc8_8.2: = field_decl a, element0 +// CHECK:STDOUT: %a: = bind_name a, %.loc8_8.2 // CHECK:STDOUT: %.loc9_8.1: type = unbound_element_type Class, i32 -// CHECK:STDOUT: %.loc9_8.2: = field b, element1 -// CHECK:STDOUT: %b: = bind_name b, %.loc9_8.2 +// CHECK:STDOUT: %.loc9_8.2: = field_decl b, element1 +// CHECK:STDOUT: %b: = bind_name b, %.loc9_8.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .a = %a diff --git a/toolchain/check/testdata/class/init_nested.carbon b/toolchain/check/testdata/class/init_nested.carbon index 854064321ad3..9ac4ab67c668 100644 --- a/toolchain/check/testdata/class/init_nested.carbon +++ b/toolchain/check/testdata/class/init_nested.carbon @@ -43,11 +43,11 @@ fn MakeOuter() -> Outer { // CHECK:STDOUT: // CHECK:STDOUT: class @Inner { // CHECK:STDOUT: %.loc8_8.1: type = unbound_element_type Inner, i32 -// CHECK:STDOUT: %.loc8_8.2: = field a, element0 -// CHECK:STDOUT: %a: = bind_name a, %.loc8_8.2 +// CHECK:STDOUT: %.loc8_8.2: = field_decl a, element0 +// CHECK:STDOUT: %a: = bind_name a, %.loc8_8.2 // CHECK:STDOUT: %.loc9_8.1: type = unbound_element_type Inner, i32 -// CHECK:STDOUT: %.loc9_8.2: = field b, element1 -// CHECK:STDOUT: %b: = bind_name b, %.loc9_8.2 +// CHECK:STDOUT: %.loc9_8.2: = field_decl b, element1 +// CHECK:STDOUT: %b: = bind_name b, %.loc9_8.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .a = %a @@ -57,12 +57,12 @@ fn MakeOuter() -> Outer { // CHECK:STDOUT: class @Outer { // CHECK:STDOUT: %Inner.ref.loc15: type = name_ref Inner, file.%Inner // CHECK:STDOUT: %.loc15_8.1: type = unbound_element_type Outer, Inner -// CHECK:STDOUT: %.loc15_8.2: = field c, element0 -// CHECK:STDOUT: %c: = bind_name c, %.loc15_8.2 +// CHECK:STDOUT: %.loc15_8.2: = field_decl c, element0 +// CHECK:STDOUT: %c: = bind_name c, %.loc15_8.2 // CHECK:STDOUT: %Inner.ref.loc16: type = name_ref Inner, file.%Inner // CHECK:STDOUT: %.loc16_8.1: type = unbound_element_type Outer, Inner -// CHECK:STDOUT: %.loc16_8.2: = field d, element1 -// CHECK:STDOUT: %d: = bind_name d, %.loc16_8.2 +// CHECK:STDOUT: %.loc16_8.2: = field_decl d, element1 +// CHECK:STDOUT: %d: = bind_name d, %.loc16_8.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .c = %c diff --git a/toolchain/check/testdata/class/method.carbon b/toolchain/check/testdata/class/method.carbon index 74a5f2ac20a7..4beeecc4f22e 100644 --- a/toolchain/check/testdata/class/method.carbon +++ b/toolchain/check/testdata/class/method.carbon @@ -69,8 +69,8 @@ fn CallGOnInitializingExpr() -> i32 { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: %.loc11_8.1: type = unbound_element_type Class, i32 -// CHECK:STDOUT: %.loc11_8.2: = field k, element0 -// CHECK:STDOUT: %k: = bind_name k, %.loc11_8.2 +// CHECK:STDOUT: %.loc11_8.2: = field_decl k, element0 +// CHECK:STDOUT: %k: = bind_name k, %.loc11_8.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %F diff --git a/toolchain/check/testdata/class/nested.carbon b/toolchain/check/testdata/class/nested.carbon index bb961efd9ad3..7f752066d3ad 100644 --- a/toolchain/check/testdata/class/nested.carbon +++ b/toolchain/check/testdata/class/nested.carbon @@ -50,18 +50,18 @@ fn F(a: Outer*) { // CHECK:STDOUT: %Self.ref: type = name_ref Self, file.%Outer // CHECK:STDOUT: %.loc14_15: type = ptr_type Outer // CHECK:STDOUT: %.loc14_9.1: type = unbound_element_type Outer, Outer* -// CHECK:STDOUT: %.loc14_9.2: = field po, element0 -// CHECK:STDOUT: %po: = bind_name po, %.loc14_9.2 +// CHECK:STDOUT: %.loc14_9.2: = field_decl po, element0 +// CHECK:STDOUT: %po: = bind_name po, %.loc14_9.2 // CHECK:STDOUT: %Outer.ref: type = name_ref Outer, file.%Outer // CHECK:STDOUT: %.loc15_16: type = ptr_type Outer // CHECK:STDOUT: %.loc15_9.1: type = unbound_element_type Outer, Outer* -// CHECK:STDOUT: %.loc15_9.2: = field qo, element1 -// CHECK:STDOUT: %qo: = bind_name qo, %.loc15_9.2 +// CHECK:STDOUT: %.loc15_9.2: = field_decl qo, element1 +// CHECK:STDOUT: %qo: = bind_name qo, %.loc15_9.2 // CHECK:STDOUT: %Inner.ref: type = name_ref Inner, %Inner // CHECK:STDOUT: %.loc16_16: type = ptr_type Inner // CHECK:STDOUT: %.loc16_9.1: type = unbound_element_type Outer, Inner* -// CHECK:STDOUT: %.loc16_9.2: = field pi, element2 -// CHECK:STDOUT: %pi: = bind_name pi, %.loc16_9.2 +// CHECK:STDOUT: %.loc16_9.2: = field_decl pi, element2 +// CHECK:STDOUT: %pi: = bind_name pi, %.loc16_9.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Inner = %Inner.decl @@ -74,18 +74,18 @@ fn F(a: Outer*) { // CHECK:STDOUT: %Self.ref: type = name_ref Self, @Outer.%Inner // CHECK:STDOUT: %.loc9_17: type = ptr_type Inner // CHECK:STDOUT: %.loc9_11.1: type = unbound_element_type Inner, Inner* -// CHECK:STDOUT: %.loc9_11.2: = field pi, element0 -// CHECK:STDOUT: %pi: = bind_name pi, %.loc9_11.2 +// CHECK:STDOUT: %.loc9_11.2: = field_decl pi, element0 +// CHECK:STDOUT: %pi: = bind_name pi, %.loc9_11.2 // CHECK:STDOUT: %Outer.ref: type = name_ref Outer, file.%Outer // CHECK:STDOUT: %.loc10_18: type = ptr_type Outer // CHECK:STDOUT: %.loc10_11.1: type = unbound_element_type Inner, Outer* -// CHECK:STDOUT: %.loc10_11.2: = field po, element1 -// CHECK:STDOUT: %po: = bind_name po, %.loc10_11.2 +// CHECK:STDOUT: %.loc10_11.2: = field_decl po, element1 +// CHECK:STDOUT: %po: = bind_name po, %.loc10_11.2 // CHECK:STDOUT: %Inner.ref: type = name_ref Inner, @Outer.%Inner // CHECK:STDOUT: %.loc11_18: type = ptr_type Inner // CHECK:STDOUT: %.loc11_11.1: type = unbound_element_type Inner, Inner* -// CHECK:STDOUT: %.loc11_11.2: = field qi, element2 -// CHECK:STDOUT: %qi: = bind_name qi, %.loc11_11.2 +// CHECK:STDOUT: %.loc11_11.2: = field_decl qi, element2 +// CHECK:STDOUT: %qi: = bind_name qi, %.loc11_11.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .pi = %pi diff --git a/toolchain/check/testdata/class/nested_name.carbon b/toolchain/check/testdata/class/nested_name.carbon index f4dd8c1e01cd..175c00ff881d 100644 --- a/toolchain/check/testdata/class/nested_name.carbon +++ b/toolchain/check/testdata/class/nested_name.carbon @@ -46,8 +46,8 @@ fn G(o: Outer) { // CHECK:STDOUT: // CHECK:STDOUT: class @Inner { // CHECK:STDOUT: %.loc9_10.1: type = unbound_element_type Inner, i32 -// CHECK:STDOUT: %.loc9_10.2: = field n, element0 -// CHECK:STDOUT: %n: = bind_name n, %.loc9_10.2 +// CHECK:STDOUT: %.loc9_10.2: = field_decl n, element0 +// CHECK:STDOUT: %n: = bind_name n, %.loc9_10.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .n = %n diff --git a/toolchain/check/testdata/class/raw_self.carbon b/toolchain/check/testdata/class/raw_self.carbon index e5314d0eb6ba..5374a42802e6 100644 --- a/toolchain/check/testdata/class/raw_self.carbon +++ b/toolchain/check/testdata/class/raw_self.carbon @@ -40,8 +40,8 @@ fn Class.G[self: Class](r#self: i32) -> (i32, i32) { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: %.loc10_8.1: type = unbound_element_type Class, i32 -// CHECK:STDOUT: %.loc10_8.2: = field n, element0 -// CHECK:STDOUT: %n: = bind_name n, %.loc10_8.2 +// CHECK:STDOUT: %.loc10_8.2: = field_decl n, element0 +// CHECK:STDOUT: %n: = bind_name n, %.loc10_8.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %F diff --git a/toolchain/check/testdata/class/self.carbon b/toolchain/check/testdata/class/self.carbon index 37425b801d0b..85446f18a2da 100644 --- a/toolchain/check/testdata/class/self.carbon +++ b/toolchain/check/testdata/class/self.carbon @@ -38,8 +38,8 @@ fn Class.G[addr self: Class*]() -> i32 { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: %.loc11_8.1: type = unbound_element_type Class, i32 -// CHECK:STDOUT: %.loc11_8.2: = field n, element0 -// CHECK:STDOUT: %n: = bind_name n, %.loc11_8.2 +// CHECK:STDOUT: %.loc11_8.2: = field_decl n, element0 +// CHECK:STDOUT: %n: = bind_name n, %.loc11_8.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %F diff --git a/toolchain/check/testdata/class/self_type.carbon b/toolchain/check/testdata/class/self_type.carbon index dae9c801e15f..7f4c34e70911 100644 --- a/toolchain/check/testdata/class/self_type.carbon +++ b/toolchain/check/testdata/class/self_type.carbon @@ -35,8 +35,8 @@ fn Class.F[self: Class]() -> i32 { // CHECK:STDOUT: %Self.ref: type = name_ref Self, file.%Class // CHECK:STDOUT: %.loc9_14: type = ptr_type Class // CHECK:STDOUT: %.loc9_8.1: type = unbound_element_type Class, Class* -// CHECK:STDOUT: %.loc9_8.2: = field p, element0 -// CHECK:STDOUT: %p: = bind_name p, %.loc9_8.2 +// CHECK:STDOUT: %.loc9_8.2: = field_decl p, element0 +// CHECK:STDOUT: %p: = bind_name p, %.loc9_8.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %F 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 1aed4cb708b3..64acb6bd2a33 100644 --- a/toolchain/check/testdata/return/fail_return_with_returned_var.carbon +++ b/toolchain/check/testdata/return/fail_return_with_returned_var.carbon @@ -44,11 +44,11 @@ fn G() -> C { // CHECK:STDOUT: // CHECK:STDOUT: class @C { // CHECK:STDOUT: %.loc18_16.1: type = unbound_element_type C, i32 -// CHECK:STDOUT: %.loc18_16.2: = field a, element0 -// CHECK:STDOUT: %a: = bind_name a, %.loc18_16.2 +// CHECK:STDOUT: %.loc18_16.2: = field_decl a, element0 +// CHECK:STDOUT: %a: = bind_name a, %.loc18_16.2 // CHECK:STDOUT: %.loc18_28.1: type = unbound_element_type C, i32 -// CHECK:STDOUT: %.loc18_28.2: = field b, element1 -// CHECK:STDOUT: %b: = bind_name b, %.loc18_28.2 +// CHECK:STDOUT: %.loc18_28.2: = field_decl b, element1 +// CHECK:STDOUT: %b: = bind_name b, %.loc18_28.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .a = %a diff --git a/toolchain/check/testdata/return/returned_var.carbon b/toolchain/check/testdata/return/returned_var.carbon index cd33446c554d..9d68760e7f03 100644 --- a/toolchain/check/testdata/return/returned_var.carbon +++ b/toolchain/check/testdata/return/returned_var.carbon @@ -36,11 +36,11 @@ fn G() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: class @C { // CHECK:STDOUT: %.loc8_8.1: type = unbound_element_type C, i32 -// CHECK:STDOUT: %.loc8_8.2: = field a, element0 -// CHECK:STDOUT: %a: = bind_name a, %.loc8_8.2 +// CHECK:STDOUT: %.loc8_8.2: = field_decl a, element0 +// CHECK:STDOUT: %a: = bind_name a, %.loc8_8.2 // CHECK:STDOUT: %.loc9_8.1: type = unbound_element_type C, i32 -// CHECK:STDOUT: %.loc9_8.2: = field b, element1 -// CHECK:STDOUT: %b: = bind_name b, %.loc9_8.2 +// CHECK:STDOUT: %.loc9_8.2: = field_decl b, element1 +// CHECK:STDOUT: %b: = bind_name b, %.loc9_8.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .a = %a diff --git a/toolchain/lower/handle_aggregates.cpp b/toolchain/lower/handle_aggregates.cpp index d0aecdd3c8e7..d1d311082f4a 100644 --- a/toolchain/lower/handle_aggregates.cpp +++ b/toolchain/lower/handle_aggregates.cpp @@ -157,13 +157,13 @@ auto HandleClassInit(FunctionContext& context, SemIR::InstId inst_id, "class.init")); } -auto HandleBase(FunctionContext& /*context*/, SemIR::InstId /*inst_id*/, - SemIR::Base /*inst*/) -> void { +auto HandleBaseDecl(FunctionContext& /*context*/, SemIR::InstId /*inst_id*/, + SemIR::BaseDecl /*inst*/) -> void { // No action to perform. } -auto HandleField(FunctionContext& /*context*/, SemIR::InstId /*inst_id*/, - SemIR::Field /*inst*/) -> void { +auto HandleFieldDecl(FunctionContext& /*context*/, SemIR::InstId /*inst_id*/, + SemIR::FieldDecl /*inst*/) -> void { // No action to perform. } diff --git a/toolchain/sem_ir/file.cpp b/toolchain/sem_ir/file.cpp index 9ac8efc29ed7..19d5ca63f5a8 100644 --- a/toolchain/sem_ir/file.cpp +++ b/toolchain/sem_ir/file.cpp @@ -187,7 +187,7 @@ static auto GetTypePrecedence(InstKind kind) -> int { case ArrayIndex::Kind: case ArrayInit::Kind: case Assign::Kind: - case Base::Kind: + case BaseDecl::Kind: case BinaryOperatorAdd::Kind: case BindName::Kind: case BindValue::Kind: @@ -203,7 +203,7 @@ static auto GetTypePrecedence(InstKind kind) -> int { case ClassInit::Kind: case Converted::Kind: case Deref::Kind: - case Field::Kind: + case FieldDecl::Kind: case FunctionDecl::Kind: case Import::Kind: case InitializeFrom::Kind: @@ -377,7 +377,7 @@ auto File::StringifyTypeExpr(InstId outer_inst_id, bool in_type_context) const } case UnboundElementType::Kind: { if (step.index == 0) { - out << "().class_type_id)}); @@ -390,7 +390,7 @@ auto File::StringifyTypeExpr(InstId outer_inst_id, bool in_type_context) const case ArrayIndex::Kind: case ArrayInit::Kind: case Assign::Kind: - case Base::Kind: + case BaseDecl::Kind: case BinaryOperatorAdd::Kind: case BindName::Kind: case BindValue::Kind: @@ -408,7 +408,7 @@ auto File::StringifyTypeExpr(InstId outer_inst_id, bool in_type_context) const case Converted::Kind: case CrossRef::Kind: case Deref::Kind: - case Field::Kind: + case FieldDecl::Kind: case FunctionDecl::Kind: case Import::Kind: case InitializeFrom::Kind: @@ -472,12 +472,12 @@ auto GetExprCategory(const File& file, InstId inst_id) -> ExprCategory { // NOLINTNEXTLINE(bugprone-switch-missing-default-case) switch (inst.kind()) { case Assign::Kind: - case Base::Kind: + case BaseDecl::Kind: case Branch::Kind: case BranchIf::Kind: case BranchWithArg::Kind: case ClassDecl::Kind: - case Field::Kind: + case FieldDecl::Kind: case FunctionDecl::Kind: case Import::Kind: case Namespace::Kind: diff --git a/toolchain/sem_ir/file.h b/toolchain/sem_ir/file.h index 3ec5c1d841b7..ceeca898b87b 100644 --- a/toolchain/sem_ir/file.h +++ b/toolchain/sem_ir/file.h @@ -108,7 +108,7 @@ struct Class : public Printable { // The following members are accumulated throughout the class definition. // The base class declaration. Invalid if the class has no base class. This is - // a Base instruction. + // a BaseDecl instruction. InstId base_id = InstId::Invalid; // The following members are set at the `}` of the class definition. diff --git a/toolchain/sem_ir/inst_kind.def b/toolchain/sem_ir/inst_kind.def index 8b4097d466ea..7e34c20960e6 100644 --- a/toolchain/sem_ir/inst_kind.def +++ b/toolchain/sem_ir/inst_kind.def @@ -22,7 +22,7 @@ CARBON_SEM_IR_INST_KIND(ArrayIndex) CARBON_SEM_IR_INST_KIND(ArrayInit) CARBON_SEM_IR_INST_KIND(ArrayType) CARBON_SEM_IR_INST_KIND(Assign) -CARBON_SEM_IR_INST_KIND(Base) +CARBON_SEM_IR_INST_KIND(BaseDecl) CARBON_SEM_IR_INST_KIND(BinaryOperatorAdd) CARBON_SEM_IR_INST_KIND(BindName) CARBON_SEM_IR_INST_KIND(BindValue) @@ -42,7 +42,7 @@ CARBON_SEM_IR_INST_KIND(ConstType) CARBON_SEM_IR_INST_KIND(Converted) CARBON_SEM_IR_INST_KIND(CrossRef) CARBON_SEM_IR_INST_KIND(Deref) -CARBON_SEM_IR_INST_KIND(Field) +CARBON_SEM_IR_INST_KIND(FieldDecl) CARBON_SEM_IR_INST_KIND(FunctionDecl) CARBON_SEM_IR_INST_KIND(Import) CARBON_SEM_IR_INST_KIND(InitializeFrom) diff --git a/toolchain/sem_ir/typed_insts.h b/toolchain/sem_ir/typed_insts.h index 86270ca548f2..0ad0ada810d2 100644 --- a/toolchain/sem_ir/typed_insts.h +++ b/toolchain/sem_ir/typed_insts.h @@ -87,10 +87,10 @@ struct Assign { }; // A base in a class, of the form `base: base_type;`. A base class is an -// element of the derived class, and the type of the `Base` instruction is an -// `UnboundElementType`. -struct Base { - static constexpr auto Kind = InstKind::Base.Define("base"); +// element of the derived class, and the type of the `BaseDecl` instruction is +// an `UnboundElementType`. +struct BaseDecl { + static constexpr auto Kind = InstKind::BaseDecl.Define("base_decl"); Parse::NodeId parse_node; TypeId type_id; @@ -284,9 +284,9 @@ struct Deref { }; // A field in a class, of the form `var field: field_type;`. The type of the -// `Field` instruction is an `UnboundElementType`. -struct Field { - static constexpr auto Kind = InstKind::Field.Define("field"); +// `FieldDecl` instruction is an `UnboundElementType`. +struct FieldDecl { + static constexpr auto Kind = InstKind::FieldDecl.Define("field_decl"); Parse::NodeId parse_node; TypeId type_id;