mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-05 22:02:55 +01:00
Split parse nodes out from instructions because they're rarely used. (#3590)
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:
co-authored by
Richard Smith
parent
a3154356f0
commit
f197219c10
@@ -40,8 +40,9 @@ auto HandleStructFieldValue(Context& context,
|
||||
auto [name_node, name_id] = context.node_stack().PopNameWithParseNode();
|
||||
|
||||
// Store the name for the type.
|
||||
context.args_type_info_stack().AddInst(SemIR::StructTypeField{
|
||||
name_node, name_id, context.insts().Get(value_inst_id).type_id()});
|
||||
context.args_type_info_stack().AddInst(
|
||||
{name_node, SemIR::StructTypeField{
|
||||
name_id, context.insts().Get(value_inst_id).type_id()}});
|
||||
|
||||
// Push the value back on the stack as an argument.
|
||||
context.node_stack().Push(parse_node, value_inst_id);
|
||||
@@ -55,8 +56,9 @@ auto HandleStructFieldType(Context& context,
|
||||
|
||||
auto [name_node, name_id] = context.node_stack().PopNameWithParseNode();
|
||||
|
||||
context.AddInstAndPush(
|
||||
parse_node, SemIR::StructTypeField{name_node, name_id, cast_type_id});
|
||||
auto inst_id = context.AddInst(
|
||||
{name_node, SemIR::StructTypeField{name_id, cast_type_id}});
|
||||
context.node_stack().Push(parse_node, inst_id);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -65,12 +67,11 @@ static auto DiagnoseDuplicateNames(Context& context,
|
||||
llvm::StringRef construct) -> bool {
|
||||
auto& sem_ir = context.sem_ir();
|
||||
auto fields = sem_ir.inst_blocks().Get(type_block_id);
|
||||
llvm::SmallDenseMap<SemIR::NameId, Parse::NodeId> names;
|
||||
llvm::SmallDenseMap<SemIR::NameId, SemIR::InstId> names;
|
||||
auto& insts = sem_ir.insts();
|
||||
for (SemIR::InstId field_inst_id : fields) {
|
||||
auto field_inst = insts.GetAs<SemIR::StructTypeField>(field_inst_id);
|
||||
auto [it, added] =
|
||||
names.insert({field_inst.name_id, field_inst.parse_node});
|
||||
auto [it, added] = names.insert({field_inst.name_id, field_inst_id});
|
||||
if (!added) {
|
||||
CARBON_DIAGNOSTIC(StructNameDuplicate, Error,
|
||||
"Duplicated field name `{1}` in {0}.", std::string,
|
||||
@@ -78,9 +79,10 @@ static auto DiagnoseDuplicateNames(Context& context,
|
||||
CARBON_DIAGNOSTIC(StructNamePrevious, Note,
|
||||
"Field with the same name here.");
|
||||
context.emitter()
|
||||
.Build(field_inst.parse_node, StructNameDuplicate, construct.str(),
|
||||
.Build(context.insts().GetParseNode(field_inst_id),
|
||||
StructNameDuplicate, construct.str(),
|
||||
sem_ir.names().GetFormatted(field_inst.name_id).str())
|
||||
.Note(it->second, StructNamePrevious)
|
||||
.Note(context.insts().GetParseNode(it->second), StructNamePrevious)
|
||||
.Emit();
|
||||
return true;
|
||||
}
|
||||
@@ -106,7 +108,7 @@ auto HandleStructLiteral(Context& context, Parse::StructLiteralId parse_node)
|
||||
auto type_id = context.CanonicalizeStructType(parse_node, type_block_id);
|
||||
|
||||
auto value_id =
|
||||
context.AddInst(SemIR::StructLiteral{parse_node, type_id, refs_id});
|
||||
context.AddInst({parse_node, SemIR::StructLiteral{type_id, refs_id}});
|
||||
context.node_stack().Push(parse_node, value_id);
|
||||
return true;
|
||||
}
|
||||
@@ -131,8 +133,7 @@ auto HandleStructTypeLiteral(Context& context,
|
||||
return true;
|
||||
}
|
||||
context.AddInstAndPush(
|
||||
parse_node,
|
||||
SemIR::StructType{parse_node, SemIR::TypeId::TypeType, refs_id});
|
||||
{parse_node, SemIR::StructType{SemIR::TypeId::TypeType, refs_id}});
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user