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 param_refs and implicit_param_refs (#4479)

Browse Source 
This introduces `calling_convention_param_ids`, a single block that
consolidates all the information that was being used by consumers of
`param_refs` and `implicit_param_refs`, in a form that's easier to
produce and typically easier to consume.

See also [this Discord
discussion](https://discord.com/channels/655572317891461132/655578254970716160/1300545448909738125)
regarding the decision to keep the return slot last in the SemIR calling
convention, even though it goes first in the LLVM calling convention.

---------

Co-authored-by: Jon Ross-Perkins <jperkins@google.com>
This commit is contained in:
Geoff Romer
2024-11-22 18:34:21 +00:00
committed by GitHub
co-authored by Jon Ross-Perkins
parent 17272cf93c
commit 4f816dd03f
38 changed files with 940 additions and 1105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/pattern_match.cpp
+23 -19
View File
@@ -161,7 +161,11 @@ auto MatchContext::EmitPatternMatch(Context& context,
bind_name.value_id = entry.scrutinee_id;
context.ReplaceInstBeforeConstantUse(bind_name_id, bind_name);
context.inst_block_stack().AddInstId(bind_name_id);
results_.push_back(bind_name_id);
if (context.insts()
.GetAs<SemIR::AnyParam>(entry.scrutinee_id)
.runtime_index.is_valid()) {
results_.push_back(entry.scrutinee_id);
}
break;
}
case CARBON_KIND(SemIR::AddrPattern addr_pattern): {
@@ -280,6 +284,7 @@ auto MatchContext::EmitPatternMatch(Context& context,
pattern.loc_id, {.type_id = return_slot_pattern.type_id,
.type_inst_id = return_slot_pattern.type_inst_id,
.storage_id = entry.scrutinee_id});
results_.push_back(entry.scrutinee_id);
break;
}
default: {
@@ -293,20 +298,19 @@ auto CalleePatternMatch(Context& context,
SemIR::InstBlockId param_patterns_id,
SemIR::InstId return_slot_pattern_id)
-> ParameterBlocks {
auto params_id = SemIR::InstBlockId::Invalid;
auto implicit_params_id = SemIR::InstBlockId::Invalid;
if (!return_slot_pattern_id.is_valid() && !param_patterns_id.is_valid() &&
!implicit_param_patterns_id.is_valid()) {
return {.call_params_id = SemIR::InstBlockId::Invalid,
.return_slot_id = SemIR::InstId::Invalid};
}
MatchContext match(MatchKind::Callee);
if (implicit_param_patterns_id.is_valid()) {
// We add work to the stack in reverse so that the results will be produced
// in the original order.
for (SemIR::InstId inst_id :
llvm::reverse(context.inst_blocks().Get(implicit_param_patterns_id))) {
match.AddWork(
{.pattern_id = inst_id, .scrutinee_id = SemIR::InstId::Invalid});
}
implicit_params_id = match.DoWork(context);
// We add work to the stack in reverse so that the results will be produced
// in the original order.
if (return_slot_pattern_id.is_valid()) {
match.AddWork({.pattern_id = return_slot_pattern_id,
.scrutinee_id = SemIR::InstId::Invalid});
}
if (param_patterns_id.is_valid()) {
@@ -315,17 +319,17 @@ auto CalleePatternMatch(Context& context,
match.AddWork(
{.pattern_id = inst_id, .scrutinee_id = SemIR::InstId::Invalid});
}
params_id = match.DoWork(context);
}
if (return_slot_pattern_id.is_valid()) {
match.AddWork({.pattern_id = return_slot_pattern_id,
.scrutinee_id = SemIR::InstId::Invalid});
CARBON_CHECK(match.DoWork(context) == SemIR::InstBlockId::Empty);
if (implicit_param_patterns_id.is_valid()) {
for (SemIR::InstId inst_id :
llvm::reverse(context.inst_blocks().Get(implicit_param_patterns_id))) {
match.AddWork(
{.pattern_id = inst_id, .scrutinee_id = SemIR::InstId::Invalid});
}
}
return {.implicit_params_id = implicit_params_id,
.params_id = params_id,
return {.call_params_id = match.DoWork(context),
.return_slot_id = match.return_slot_id()};
}