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

Refactor function return type representation (#6463)

Browse Source 
This separates the return type from the return pattern, and replaces the
return pattern with a block of return patterns. This is a step toward
support for `ref` returns (where there's no corresponding return
pattern) and compund-form returns (where there may be multiple return
patterns).
This commit is contained in:
Geoff Romer
2025-12-10 18:34:23 +00:00
committed by GitHub
parent 77918d023b
commit bf45b1cbf5
57 changed files with 1668 additions and 1532 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/return.cpp
+5 -11
View File
@@ -48,18 +48,12 @@ static auto NoteNoReturnTypeProvided(DiagnosticBuilder& diag,
// Produces a note describing the return type of the given function, which
// must be a function whose definition is currently being checked.
static auto NoteReturnType(Context& context, DiagnosticBuilder& diag,
static auto NoteReturnType(DiagnosticBuilder& diag,
const SemIR::Function& function) {
auto out_param_pattern = context.insts().GetAs<SemIR::OutParamPattern>(
function.return_slot_pattern_id);
auto return_type_inst_id =
context.insts()
.GetAs<SemIR::ReturnSlotPattern>(out_param_pattern.subpattern_id)
.type_inst_id;
CARBON_DIAGNOSTIC(ReturnTypeHereNote, Note, "return type of function is {0}",
InstIdAsType);
diag.Note(function.return_slot_pattern_id, ReturnTypeHereNote,
return_type_inst_id);
diag.Note(function.return_type_inst_id, ReturnTypeHereNote,
function.return_type_inst_id);
}
// Produces a note pointing at the currently in scope `returned var`.
@@ -99,7 +93,7 @@ auto RegisterReturnedVar(Context& context, Parse::NodeId returned_node,
SemIR::TypeId);
auto diag =
context.emitter().Build(type_node, ReturnedVarWrongType, type_id);
NoteReturnType(context, diag, function);
NoteReturnType(diag, function);
diag.Emit();
}
@@ -122,7 +116,7 @@ auto BuildReturnWithNoExpr(Context& context, SemIR::LocId loc_id) -> void {
CARBON_DIAGNOSTIC(ReturnStatementMissingExpr, Error,
"missing return value");
auto diag = context.emitter().Build(loc_id, ReturnStatementMissingExpr);
NoteReturnType(context, diag, function);
NoteReturnType(diag, function);
diag.Emit();
}