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

Add form to Function (#6561)

Browse Source 
... and use the form to implement support for `ref` returns.
This commit is contained in:
Geoff Romer
2026-01-08 18:55:53 +00:00
committed by GitHub
parent 28b01118d0
commit 11d407b4a0
24 changed files with 1554 additions and 1319 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/handle_function.cpp
+7 -3
View File
@@ -190,6 +190,7 @@ static auto MergeFunctionRedecl(Context& context,
prev_function.MergeDefinition(new_function);
prev_function.call_params_id = new_function.call_params_id;
prev_function.return_type_inst_id = new_function.return_type_inst_id;
prev_function.return_form_inst_id = new_function.return_form_inst_id;
prev_function.return_patterns_id = new_function.return_patterns_id;
prev_function.self_param_id = new_function.self_param_id;
}
@@ -408,12 +409,14 @@ static auto BuildFunctionDecl(Context& context,
-> std::pair<SemIR::FunctionId, SemIR::InstId> {
auto return_patterns_id = SemIR::InstBlockId::None;
auto return_type_inst_id = SemIR::TypeInstId::None;
auto return_form_inst_id = SemIR::InstId::None;
if (auto [return_node, maybe_return_patterns_id] =
context.node_stack().PopWithNodeIdIf<Parse::NodeKind::ReturnType>();
maybe_return_patterns_id) {
return_patterns_id = *maybe_return_patterns_id;
return_type_inst_id = context.PopReturnForm().type_component_id;
CARBON_CHECK(return_type_inst_id.has_value());
auto return_form = context.PopReturnForm();
return_type_inst_id = return_form.type_component_id;
return_form_inst_id = return_form.form_inst_id;
}
auto name = PopNameComponent(context, return_patterns_id);
@@ -448,6 +451,7 @@ static auto BuildFunctionDecl(Context& context,
name, decl_id, is_extern, introducer.extern_library),
{.call_params_id = name.call_params_id,
.return_type_inst_id = return_type_inst_id,
.return_form_inst_id = return_form_inst_id,
.return_patterns_id = return_patterns_id,
.virtual_modifier = virtual_modifier,
.self_param_id = self_param_id}};
@@ -569,7 +573,7 @@ auto HandleParseNode(Context& context, Parse::FunctionDefinitionId node_id)
// If the `}` of the function is reachable, reject if we need a return value
// and otherwise add an implicit `return;`.
if (IsCurrentPositionReachable(context)) {
if (context.functions().Get(function_id).return_type_inst_id.has_value()) {
if (context.functions().Get(function_id).return_form_inst_id.has_value()) {
CARBON_DIAGNOSTIC(
MissingReturnStatement, Error,
"missing `return` at end of function with declared return type");