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

Split parse nodes out from instructions because they're rarely used. (#3590)

Browse Source 
The parse nodes are still tracked as part of the same value store
interface in order to ensure parity, but they're split out from Inst
itself in order to reduce the size of Inst -- the expectation is that
they don't need to be passed around quite as much.

This change doesn't actually reduce the passing very much, although
there are hints of it: AddInstAndPush doesn't typically need a separate
parse node from the one on the Inst itself, for example. In a couple
spots I changed code to rely a little more on the InstId until the
ParseNode is needed, but it's very low hanging fruit where done. I think
convert could do more to not eagerly fetch the parse node before its
use, but more cleanup felt it would be easier to handle separately. I'm
currently viewing this as making such cleanup _possible_ rather than
executing on it up-front.

But also, I want to make sure there's a consensus to head in this
direction before pulling the trigger. We speculated that this would
result in the parse node being passed around less, and I do think that's
the case, although it's a bit fuzzy in the change.

---------

Co-authored-by: Richard Smith <richard@metafoo.co.uk>
This commit is contained in:
Jon Ross-Perkins
2024-01-12 19:01:51 +00:00
committed by GitHub
co-authored by Richard Smith
parent a3154356f0
commit f197219c10
37 changed files with 674 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/return.cpp
+9 -9
View File
@@ -34,7 +34,7 @@ static auto NoteNoReturnTypeProvided(Context& context,
const SemIR::Function& function) {
CARBON_DIAGNOSTIC(ReturnTypeOmittedNote, Note,
"There was no return type provided.");
diag.Note(context.insts().Get(function.decl_id).parse_node(),
diag.Note(context.insts().GetParseNode(function.decl_id),
ReturnTypeOmittedNote);
}
@@ -43,7 +43,7 @@ static auto NoteReturnType(Context& context, Context::DiagnosticBuilder& diag,
const SemIR::Function& function) {
// TODO: This is the location of the `fn` keyword. Find the location of the
// return type.
auto type_parse_node = context.insts().Get(function.decl_id).parse_node();
auto type_parse_node = context.insts().GetParseNode(function.decl_id);
CARBON_DIAGNOSTIC(ReturnTypeHereNote, Note,
"Return type of function is `{0}`.", std::string);
diag.Note(type_parse_node, ReturnTypeHereNote,
@@ -54,7 +54,7 @@ static auto NoteReturnType(Context& context, Context::DiagnosticBuilder& diag,
static auto NoteReturnedVar(Context& context, Context::DiagnosticBuilder& diag,
SemIR::InstId returned_var_id) {
CARBON_DIAGNOSTIC(ReturnedVarHere, Note, "`returned var` was declared here.");
diag.Note(context.insts().Get(returned_var_id).parse_node(), ReturnedVarHere);
diag.Note(context.insts().GetParseNode(returned_var_id), ReturnedVarHere);
}
auto CheckReturnedVar(Context& context, Parse::NodeId returned_node,
@@ -92,7 +92,7 @@ auto CheckReturnedVar(Context& context, Parse::NodeId returned_node,
if (function.return_slot_id.is_valid()) {
return function.return_slot_id;
}
return context.AddInst(SemIR::VarStorage{name_node, type_id, name_id});
return context.AddInst({name_node, SemIR::VarStorage{type_id, name_id}});
}
auto RegisterReturnedVar(Context& context, SemIR::InstId bind_id) -> void {
@@ -101,8 +101,8 @@ auto RegisterReturnedVar(Context& context, SemIR::InstId bind_id) -> void {
CARBON_DIAGNOSTIC(ReturnedVarShadowed, Error,
"Cannot declare a `returned var` in the scope of "
"another `returned var`.");
auto diag = context.emitter().Build(
context.insts().Get(bind_id).parse_node(), ReturnedVarShadowed);
auto diag = context.emitter().Build(context.insts().GetParseNode(bind_id),
ReturnedVarShadowed);
NoteReturnedVar(context, diag, existing_id);
diag.Emit();
}
@@ -120,7 +120,7 @@ auto BuildReturnWithNoExpr(Context& context,
diag.Emit();
}
context.AddInst(SemIR::Return{parse_node});
context.AddInst({parse_node, SemIR::Return{}});
}
auto BuildReturnWithExpr(Context& context, Parse::ReturnStatementId parse_node,
@@ -152,7 +152,7 @@ auto BuildReturnWithExpr(Context& context, Parse::ReturnStatementId parse_node,
function.return_type_id);
}
context.AddInst(SemIR::ReturnExpr{parse_node, expr_id});
context.AddInst({parse_node, SemIR::ReturnExpr{expr_id}});
}
auto BuildReturnVar(Context& context, Parse::ReturnStatementId parse_node)
@@ -173,7 +173,7 @@ auto BuildReturnVar(Context& context, Parse::ReturnStatementId parse_node)
returned_var_id = ConvertToValueExpr(context, returned_var_id);
}
context.AddInst(SemIR::ReturnExpr{parse_node, returned_var_id});
context.AddInst({parse_node, SemIR::ReturnExpr{returned_var_id}});
}
} // namespace Carbon::Check