carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 15:41:04 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Diagnose impl method without matching virtual function in base class (#5817)

Browse Source 
Also update `RequestVtableIfVirtual` to strip `impl` from functions in
classes without a base class - this avoids a duplicate diagnostic where
they're diagnosed as being in a class without a base class, then
diagnosed again because they don't have a matching function in a base
class.
This commit is contained in:
David Blaikie
2025-07-18 19:03:06 +00:00
committed by GitHub
parent 8428b86cfb
commit 37ac093f32
4 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/class.cpp
+9 -2
View File
@@ -169,6 +169,7 @@ static auto BuildVtable(Context& context, Parse::ClassDefinitionId node_id,
};
llvm::SmallVector<SemIR::InstId> vtable;
Set<SemIR::FunctionId> implemented_impls;
if (base_vtable_id.has_value()) {
auto base_vtable_inst_block = context.inst_blocks().Get(
context.vtables().Get(base_vtable_id).virtual_functions_id);
@@ -190,8 +191,10 @@ static auto BuildVtable(Context& context, Parse::ClassDefinitionId node_id,
override_fn.name_id == fn.name_id;
});
if (i != vtable_contents.end()) {
auto& override_fn = context.functions().Get(
context.insts().GetAs<SemIR::FunctionDecl>(*i).function_id);
auto override_fn_id =
context.insts().GetAs<SemIR::FunctionDecl>(*i).function_id;
implemented_impls.Insert(override_fn_id);
auto& override_fn = context.functions().Get(override_fn_id);
CheckFunctionTypeMatches(context, override_fn, fn, specific_id,
/*check_syntax=*/false,
/*check_self=*/false);
@@ -209,6 +212,10 @@ static auto BuildVtable(Context& context, Parse::ClassDefinitionId node_id,
if (fn.virtual_modifier != SemIR::FunctionFields::VirtualModifier::Impl) {
fn.virtual_index = vtable.size();
vtable.push_back(build_specific_function(inst_id));
} else if (!implemented_impls.Lookup(fn_decl.function_id)) {
CARBON_DIAGNOSTIC(ImplWithoutVirtualInBase, Error,
"impl without compatible virtual in base class");
context.emitter().Emit(SemIR::LocId(inst_id), ImplWithoutVirtualInBase);
}
}