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

Remove return_slot_id (#4577)

Browse Source 
Co-authored-by: Richard Smith <richard@metafoo.co.uk>
This commit is contained in:
Geoff Romer
2024-12-04 00:21:24 +00:00
committed by GitHub
co-authored by Richard Smith
parent 33110d096c
commit 78d7a7c291
109 changed files with 1160 additions and 1185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/return.cpp
+20 -5
View File
@@ -20,6 +20,18 @@ static auto GetCurrentFunction(Context& context) -> SemIR::Function& {
return context.functions().Get(function_id);
}
// Gets the return slot of the function that lexically encloses the current
// location.
static auto GetCurrentReturnSlot(Context& context) -> SemIR::InstId {
// TODO: this does some unnecessary work to compute non-lexical scopes,
// so a separate API on ScopeStack could be more efficient.
auto return_slot_id = context.scope_stack()
.LookupInLexicalScopes(SemIR::NameId::ReturnSlot)
.first;
CARBON_CHECK(return_slot_id.is_valid());
return return_slot_id;
}
// Gets the currently in scope `returned var`, if any, that would be returned
// by a `return var;`.
static auto GetCurrentReturnedVar(Context& context) -> SemIR::InstId {
@@ -40,13 +52,16 @@ static auto NoteNoReturnTypeProvided(Context::DiagnosticBuilder& diag,
// must be a function whose definition is currently being checked.
static auto NoteReturnType(Context& context, Context::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::ReturnSlot>(function.return_slot_id)
.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_id, ReturnTypeHereNote, return_type_inst_id);
diag.Note(function.return_slot_pattern_id, ReturnTypeHereNote,
return_type_inst_id);
}
// Produces a note pointing at the currently in scope `returned var`.
@@ -97,7 +112,7 @@ auto CheckReturnedVar(Context& context, Parse::NodeId returned_node,
// The variable aliases the return slot if there is one. If not, it has its
// own storage.
if (return_info.has_return_slot()) {
return function.return_slot_id;
return GetCurrentReturnSlot(context);
}
return context.AddInst<SemIR::VarStorage>(
name_node, {.type_id = type_id, .name_id = name_id});
@@ -160,7 +175,7 @@ auto BuildReturnWithExpr(Context& context, Parse::ReturnStatementId node_id,
// convert to it.
expr_id = SemIR::InstId::BuiltinErrorInst;
} else if (return_info.has_return_slot()) {
return_slot_id = function.return_slot_id;
return_slot_id = GetCurrentReturnSlot(context);
// Note that this can import a function and invalidate `function`.
expr_id = Initialize(context, node_id, return_slot_id, expr_id);
} else {
@@ -184,7 +199,7 @@ auto BuildReturnVar(Context& context, Parse::ReturnStatementId node_id)
returned_var_id = SemIR::InstId::BuiltinErrorInst;
}
auto return_slot_id = function.return_slot_id;
auto return_slot_id = GetCurrentReturnSlot(context);
if (!SemIR::ReturnTypeInfo::ForFunction(context.sem_ir(), function)
.has_return_slot()) {
// If we don't have a return slot, we're returning by value. Convert to a