diff --git a/toolchain/check/class.cpp b/toolchain/check/class.cpp index 3d07f6c461e2..58d2fb4ca109 100644 --- a/toolchain/check/class.cpp +++ b/toolchain/check/class.cpp @@ -214,7 +214,7 @@ static auto BuildVtable(Context& context, Parse::ClassDefinitionId node_id, override_fn.virtual_index = vtable.size(); CARBON_CHECK(override_fn.virtual_index == fn.virtual_index); } else if (auto base_vtable_specific_function = - context.sem_ir().insts().TryGetAs( + context.insts().TryGetAs( derived_vtable_entry_id)) { if (derived_vtable_entry_const_id.is_symbolic()) { // Create a new instruction here that is otherwise identical to diff --git a/toolchain/check/context.h b/toolchain/check/context.h index dedc20aa3b77..67e13d6e410b 100644 --- a/toolchain/check/context.h +++ b/toolchain/check/context.h @@ -294,7 +294,7 @@ class Context { auto types() -> SemIR::TypeStore& { return sem_ir().types(); } // Instructions should be added with `AddInst` or `AddInstInNoBlock` from // `inst.h`. This is `const` to prevent accidental misuse. - auto insts() -> const SemIR::InstStore& { return sem_ir().insts(); } + auto insts() const -> const SemIR::InstStore& { return sem_ir().insts(); } auto constant_values() -> SemIR::ConstantValueStore& { return sem_ir().constant_values(); } diff --git a/toolchain/check/convert.cpp b/toolchain/check/convert.cpp index 1361f9507fd6..afe74afb659a 100644 --- a/toolchain/check/convert.cpp +++ b/toolchain/check/convert.cpp @@ -63,7 +63,7 @@ static auto CopyValueToTemporary(Context& context, SemIR::InstId init_id) -> SemIR::InstId { // TODO: Consider using `None` to mean that we immediately materialize and // initialize a temporary, rather than two separate instructions. - auto init = context.sem_ir().insts().Get(init_id); + auto init = context.insts().Get(init_id); auto temporary_id = AddInst( context, SemIR::LocId(init_id), {.type_id = init.type_id()}); return AddInstWithCleanup(context, SemIR::LocId(init_id), diff --git a/toolchain/check/cpp/import.cpp b/toolchain/check/cpp/import.cpp index bcc33ca61bd7..9047b445ef56 100644 --- a/toolchain/check/cpp/import.cpp +++ b/toolchain/check/cpp/import.cpp @@ -599,8 +599,7 @@ static auto IsDeclInjectedClassName(const Context& context, CARBON_CHECK(ast_context.getCanonicalTagType(scope_record_decl) == ast_context.getCanonicalTagType(record_decl)); - auto class_decl = - context.sem_ir().insts().GetAs(clang_decl.inst_id); + auto class_decl = context.insts().GetAs(clang_decl.inst_id); CARBON_CHECK(name_id == context.sem_ir().classes().Get(class_decl.class_id).name_id); return true;