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

Make template actions refer to values from the specific. (#7663)

Browse Source 
When a template action is created, any (non-meta) instruction operand
will refer to instructions in the corresponding generic, or possibly to
a constant. This means that when the action is eventually executed when
forming a specific, it would see the generic value for that operand
rather than the intended specific value.

Fix this by refining `InstId` operands to refer to a corresponding value
in the specific, much like we would when rebuilding a constant in the
eval block.
This commit is contained in:
Richard Smith
2026-08-21 18:34:21 +00:00
committed by GitHub
parent 186a756b72
commit c41033c315
4 changed files with 271 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/generic.cpp
+25 -6
View File
@@ -228,12 +228,11 @@ static auto AddGenericTypeToEvalBlock(Context& context, SemIR::LocId loc_id,
}
// Adds instructions to compute the substituted value of `inst_id` in each
// specific into the eval block for the current generic region. Returns a
// symbolic constant instruction ID that refers to the substituted constant
// value in each specific.
static auto AddGenericConstantToEvalBlock(Context& context,
SemIR::InstId inst_id)
-> SemIR::ConstantId {
// specific into the eval block for the current generic region. Returns the
// instruction within the eval block that computes the substituted constant.
static auto AddGenericConstantInstToEvalBlock(Context& context,
SemIR::InstId inst_id)
-> SemIR::InstId {
CARBON_CHECK(context.constant_values().Get(inst_id).is_symbolic(),
"Adding generic constant {0} with non-symbolic value {1}",
context.insts().Get(inst_id),
@@ -248,9 +247,29 @@ static auto AddGenericConstantToEvalBlock(Context& context,
CARBON_CHECK(new_inst_id != const_inst_id,
"No substitutions performed for generic constant {0}",
context.insts().Get(inst_id));
return new_inst_id;
}
// Adds instructions to compute the substituted value of `inst_id` in each
// specific into the eval block for the current generic region. Returns a
// symbolic constant instruction ID that refers to the substituted constant
// value in each specific.
static auto AddGenericConstantToEvalBlock(Context& context,
SemIR::InstId inst_id)
-> SemIR::ConstantId {
auto new_inst_id = AddGenericConstantInstToEvalBlock(context, inst_id);
return context.constant_values().GetAttached(new_inst_id);
}
auto GetOrAddInstWithSpecificConstantValue(Context& context,
SemIR::InstId inst_id)
-> SemIR::InstId {
if (!context.constant_values().Get(inst_id).is_symbolic()) {
return inst_id;
}
return AddGenericConstantInstToEvalBlock(context, inst_id);
}
// Adds an instruction that performs a template action to the eval block for the
// generic. The instruction should not yet have been added to any block. The
// instruction might refer to types and constants that need to be rewritten, so