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
+20
-10
@@ -5,6 +5,7 @@
|
||||
#include "toolchain/check/eval.h"
|
||||
|
||||
#include "toolchain/sem_ir/typed_insts.h"
|
||||
#include "toolchain/sem_ir/value_stores.h"
|
||||
|
||||
namespace Carbon::Check {
|
||||
|
||||
@@ -65,7 +66,8 @@ static auto ReplaceFieldWithConstantValue(Context& context, InstT* inst,
|
||||
// replaces the fields with their constant values and builds a corresponding
|
||||
// constant value. Otherwise returns `SemIR::InstId::Invalid`.
|
||||
template <typename InstT, typename... EachFieldIdT>
|
||||
static auto RebuildIfFieldsAreConstant(Context& context, SemIR::Inst inst,
|
||||
static auto RebuildIfFieldsAreConstant(Context& context, SemIR::InstId inst_id,
|
||||
SemIR::Inst inst,
|
||||
EachFieldIdT InstT::*... each_field_id)
|
||||
-> SemIR::ConstantId {
|
||||
// Build a constant instruction by replacing each non-constant operand with
|
||||
@@ -75,7 +77,10 @@ static auto RebuildIfFieldsAreConstant(Context& context, SemIR::Inst inst,
|
||||
if ((ReplaceFieldWithConstantValue(context, &typed_inst, each_field_id,
|
||||
&is_symbolic) &&
|
||||
...)) {
|
||||
return context.AddConstant(typed_inst, is_symbolic);
|
||||
return context.AddConstant(
|
||||
SemIR::ParseNodeAndInst::Untyped(context.insts().GetParseNode(inst_id),
|
||||
typed_inst),
|
||||
is_symbolic);
|
||||
}
|
||||
return SemIR::ConstantId::NotConstant;
|
||||
}
|
||||
@@ -90,23 +95,23 @@ auto TryEvalInst(Context& context, SemIR::InstId inst_id, SemIR::Inst inst)
|
||||
switch (inst.kind()) {
|
||||
// These cases are constants if their operands are.
|
||||
case SemIR::AddrOf::Kind:
|
||||
return RebuildIfFieldsAreConstant(context, inst,
|
||||
return RebuildIfFieldsAreConstant(context, inst_id, inst,
|
||||
&SemIR::AddrOf::lvalue_id);
|
||||
case SemIR::ArrayType::Kind:
|
||||
return RebuildIfFieldsAreConstant(context, inst,
|
||||
return RebuildIfFieldsAreConstant(context, inst_id, inst,
|
||||
&SemIR::ArrayType::bound_id);
|
||||
case SemIR::BoundMethod::Kind:
|
||||
return RebuildIfFieldsAreConstant(context, inst,
|
||||
return RebuildIfFieldsAreConstant(context, inst_id, inst,
|
||||
&SemIR::BoundMethod::object_id,
|
||||
&SemIR::BoundMethod::function_id);
|
||||
case SemIR::StructValue::Kind:
|
||||
return RebuildIfFieldsAreConstant(context, inst,
|
||||
return RebuildIfFieldsAreConstant(context, inst_id, inst,
|
||||
&SemIR::StructValue::elements_id);
|
||||
case SemIR::Temporary::Kind:
|
||||
return RebuildIfFieldsAreConstant(context, inst,
|
||||
return RebuildIfFieldsAreConstant(context, inst_id, inst,
|
||||
&SemIR::Temporary::init_id);
|
||||
case SemIR::TupleValue::Kind:
|
||||
return RebuildIfFieldsAreConstant(context, inst,
|
||||
return RebuildIfFieldsAreConstant(context, inst_id, inst,
|
||||
&SemIR::TupleValue::elements_id);
|
||||
|
||||
// These cases are constants already.
|
||||
@@ -132,7 +137,10 @@ auto TryEvalInst(Context& context, SemIR::InstId inst_id, SemIR::Inst inst)
|
||||
case SemIR::RealLiteral::Kind:
|
||||
case SemIR::StringLiteral::Kind:
|
||||
// Promote literals to the constant block.
|
||||
return context.AddConstant(inst, /*is_symbolic=*/false);
|
||||
return context.AddConstant(
|
||||
SemIR::ParseNodeAndInst::Untyped(
|
||||
context.insts().GetParseNode(inst_id), inst),
|
||||
/*is_symbolic=*/false);
|
||||
|
||||
// TODO: These need special handling.
|
||||
case SemIR::ArrayIndex::Kind:
|
||||
@@ -186,7 +194,9 @@ auto TryEvalInst(Context& context, SemIR::InstId inst_id, SemIR::Inst inst)
|
||||
value.value =
|
||||
(value.value == SemIR::BoolValue::False ? SemIR::BoolValue::True
|
||||
: SemIR::BoolValue::False);
|
||||
return context.AddConstant(value, /*is_symbolic=*/false);
|
||||
return context.AddConstant(
|
||||
{context.insts().GetParseNode(const_id.inst_id()), value},
|
||||
/*is_symbolic=*/false);
|
||||
}
|
||||
|
||||
// These cases are either not expressions or not constant.
|
||||
|
||||
Reference in New Issue
Block a user