carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-09-24 21:00:13 +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/handle_function.cpp
+6 -3
View File
@@ -327,7 +327,7 @@ static auto IsGenericFunction(Context& context,
// Requests a vtable be created when processing a virtual function.
static auto RequestVtableIfVirtual(
Context& context, Parse::AnyFunctionDeclId node_id,
SemIR::Function::VirtualModifier virtual_modifier,
SemIR::Function::VirtualModifier& virtual_modifier,
const std::optional<SemIR::Inst>& parent_scope_inst, SemIR::InstId decl_id,
SemIR::GenericId generic_id) -> void {
// In order to request a vtable, the function must be virtual, and in a class
@@ -346,11 +346,14 @@ static auto RequestVtableIfVirtual(
!class_info.base_id.has_value()) {
CARBON_DIAGNOSTIC(ImplWithoutBase, Error, "impl without base class");
context.emitter().Emit(node_id, ImplWithoutBase);
virtual_modifier = SemIR::Function::VirtualModifier::None;
return;
}
if (IsGenericFunction(context, generic_id, class_info.generic_id)) {
CARBON_DIAGNOSTIC(GenericVirtual, Error, "generic virtual function");
context.emitter().Emit(node_id, GenericVirtual);
virtual_modifier = SemIR::Function::VirtualModifier::None;
return;
}
@@ -528,8 +531,8 @@ static auto BuildFunctionDecl(Context& context,
// TODO: Validate that the redeclaration doesn't set an access modifier.
}
RequestVtableIfVirtual(context, node_id, virtual_modifier, parent_scope_inst,
decl_id, function_info.generic_id);
RequestVtableIfVirtual(context, node_id, function_info.virtual_modifier,
parent_scope_inst, decl_id, function_info.generic_id);
// Write the function ID into the FunctionDecl.
ReplaceInstBeforeConstantUse(context, decl_id, function_decl);