carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-09-24 21:40:12 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Small cleanups to impl.cpp (#5194)

Browse Source 
This could've been part of #5185, but I missed it there.
This commit is contained in:
Jon Ross-Perkins
2025-03-26 23:43:45 +00:00
committed by GitHub
parent 1d7d78c6da
commit 9d3e1d3c55
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/impl.cpp
+9 -10
View File
@@ -119,8 +119,7 @@ auto ImplWitnessStartDefinition(Context& context, SemIR::Impl& impl) -> void {
// witness.
for (auto [assoc_entity, witness_value] :
llvm::zip(assoc_entities, witness_block)) {
auto decl_id = assoc_entity;
decl_id = context.constant_values().GetConstantInstId(decl_id);
auto decl_id = context.constant_values().GetConstantInstId(assoc_entity);
CARBON_CHECK(decl_id.has_value(), "Non-constant associated entity");
if (auto decl =
context.insts().TryGetAs<SemIR::AssociatedConstantDecl>(decl_id)) {
@@ -163,17 +162,17 @@ auto FinishImplWitness(Context& context, SemIR::Impl& impl) -> void {
context.inst_blocks().Get(interface.associated_entities_id);
llvm::SmallVector<SemIR::InstId> used_decl_ids;
for (auto index : llvm::seq(assoc_entities.size())) {
auto decl_id = assoc_entities[index];
decl_id =
for (auto [assoc_entity, witness_value] :
llvm::zip(assoc_entities, witness_block)) {
auto decl_id =
context.constant_values().GetInstId(SemIR::GetConstantValueInSpecific(
context.sem_ir(), impl.interface.specific_id, decl_id));
context.sem_ir(), impl.interface.specific_id, assoc_entity));
CARBON_CHECK(decl_id.has_value(), "Non-constant associated entity");
auto decl = context.insts().Get(decl_id);
CARBON_KIND_SWITCH(decl) {
case CARBON_KIND(SemIR::StructValue struct_value): {
if (struct_value.type_id == SemIR::ErrorInst::SingletonTypeId) {
witness_block[index] = SemIR::ErrorInst::SingletonInstId;
witness_value = SemIR::ErrorInst::SingletonInstId;
break;
}
auto type_inst = context.types().GetAsInst(struct_value.type_id);
@@ -187,7 +186,7 @@ auto FinishImplWitness(Context& context, SemIR::Impl& impl) -> void {
fn.name_id, impl.scope_id, impl_scope);
if (lookup_result.is_found()) {
used_decl_ids.push_back(lookup_result.target_inst_id());
witness_block[index] = CheckAssociatedFunctionImplementation(
witness_value = CheckAssociatedFunctionImplementation(
context, *fn_type, lookup_result.target_inst_id(), self_type_id,
impl.witness_id);
} else {
@@ -201,7 +200,7 @@ auto FinishImplWitness(Context& context, SemIR::Impl& impl) -> void {
NoteAssociatedFunction(context, builder, fn_type->function_id);
builder.Emit();
witness_block[index] = SemIR::ErrorInst::SingletonInstId;
witness_value = SemIR::ErrorInst::SingletonInstId;
}
break;
}
@@ -212,7 +211,7 @@ auto FinishImplWitness(Context& context, SemIR::Impl& impl) -> void {
default:
CARBON_CHECK(decl_id == SemIR::ErrorInst::SingletonInstId,
"Unexpected kind of associated entity {0}", decl);
witness_block[index] = SemIR::ErrorInst::SingletonInstId;
witness_value = SemIR::ErrorInst::SingletonInstId;
break;
}
}