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

Restructure handling of expressions in patterns (#7445)

Browse Source 
Instead of maintaining a stack of pending subpatterns which might or
might not contain expressions, we mark non-nesting regions during
pattern handling that might contain an expression. The implementation
remains largely the same; the difference is that callers are expected to
end a pending expression region as soon as possible, rather than wait
for the end of the subpattern. This makes it possible to emit
non-pattern insts during pattern handling, without the risk that they
will get caught in a pending expression region further up the stack.
This commit is contained in:
Geoff Romer
2026-07-01 19:15:34 +00:00
committed by GitHub
parent e7771c2f6d
commit 11eaeeda7d
10 changed files with 99 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/function.cpp
+6 -12
View File
@@ -117,29 +117,23 @@ static auto MakeFunctionSignature(Context& context, SemIR::LocId loc_id,
if (!args.self_type_id.has_value() && args.param_type_ids.empty()) {
insts.param_patterns_id = SemIR::InstBlockId::Empty;
} else {
context.inst_block_stack().Push();
llvm::SmallVector<SemIR::InstId> param_patterns;
if (args.self_type_id.has_value()) {
BeginSubpattern(context);
auto self_type_region_id = ConsumeSubpatternExpr(
auto self_type_region_id = MakeEmptyRegion(
context, context.types().GetTypeInstId(args.self_type_id));
EndEmptySubpattern(context);
insts.self_param_id = AddParamPattern(
context, loc_id, SemIR::NameId::SelfValue, self_type_region_id,
args.self_type_id, args.self_kind);
context.inst_block_stack().AddInstId(insts.self_param_id);
param_patterns.push_back(insts.self_param_id);
}
for (auto param_type_id : args.param_type_ids) {
BeginSubpattern(context);
auto param_type_region_id = ConsumeSubpatternExpr(
auto param_type_region_id = MakeEmptyRegion(
context, context.types().GetTypeInstId(param_type_id));
EndEmptySubpattern(context);
context.inst_block_stack().AddInstId(AddParamPattern(
param_patterns.push_back(AddParamPattern(
context, loc_id, SemIR::NameId::Underscore, param_type_region_id,
param_type_id, args.param_kind));
}
insts.param_patterns_id = context.inst_block_stack().Pop();
insts.param_patterns_id = context.inst_blocks().Add(param_patterns);
}
context.full_pattern_stack().EndExplicitParamList();