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

Separate binding insts for refs and values (#6235)

Browse Source 
This resolves a TODO in `expr_info.cpp` by using the inst kind rather
than the bound value to track the binding's category.

Since we're churning all the `bind_name` insts in testdata anyway, I'm
also taking this opportunity to align the inst naming with the design's
terminology, by calling these insts "bindings" (this aspect of the PR is
dependent on #6231 resolving an ambiguity in that terminology). For
consistency we'll need to rename several other insts as well (see the
TODO on `RefBinding`); I'm deferring that to a separate PR to minimize
the review load, but I think those name changes are in-scope for this
review.
This commit is contained in:
Geoff Romer
2025-10-23 01:46:24 +00:00
committed by GitHub
parent c0879b2200
commit 09710d102f
435 changed files with 4380 additions and 4306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/pattern.cpp
+33 -27
View File
@@ -48,40 +48,46 @@ auto EndSubpatternAsNonExpr(Context& context) -> void {
auto AddBindingPattern(Context& context, SemIR::LocId name_loc,
SemIR::NameId name_id, SemIR::TypeId type_id,
SemIR::ExprRegionId type_region_id, bool is_generic,
bool is_template) -> BindingPatternInfo {
SemIR::ExprRegionId type_region_id,
SemIR::InstKind pattern_kind, bool is_template)
-> BindingPatternInfo {
SemIR::InstKind bind_name_kind;
switch (pattern_kind) {
case SemIR::InstKind::RefBindingPattern:
bind_name_kind = SemIR::InstKind::RefBinding;
break;
case SemIR::InstKind::SymbolicBindingPattern:
bind_name_kind = SemIR::InstKind::BindSymbolicName;
break;
case SemIR::InstKind::ValueBindingPattern:
bind_name_kind = SemIR::InstKind::ValueBinding;
break;
default:
CARBON_FATAL("pattern_kind is not a binding pattern kind");
}
bool is_generic = pattern_kind == SemIR::SymbolicBindingPattern::Kind;
auto entity_name_id = context.entity_names().AddSymbolicBindingName(
name_id, context.scope_stack().PeekNameScopeId(),
is_generic ? context.scope_stack().AddCompileTimeBinding()
: SemIR::CompileTimeBindIndex::None,
is_template);
auto bind_id = SemIR::InstId::None;
if (is_generic) {
bind_id = AddInstInNoBlock<SemIR::BindSymbolicName>(
context, name_loc,
{.type_id = type_id,
.entity_name_id = entity_name_id,
.value_id = SemIR::InstId::None});
} else {
bind_id =
AddInstInNoBlock<SemIR::BindName>(context, name_loc,
{.type_id = type_id,
.entity_name_id = entity_name_id,
.value_id = SemIR::InstId::None});
}
auto bind_id = AddInstInNoBlock(
context,
SemIR::LocIdAndInst::UncheckedLoc(
name_loc, SemIR::AnyBindName{.kind = bind_name_kind,
.type_id = type_id,
.entity_name_id = entity_name_id,
.value_id = SemIR::InstId::None}));
auto pattern_type_id = GetPatternType(context, type_id);
auto binding_pattern_id = SemIR::InstId::None;
if (is_generic) {
binding_pattern_id = AddPatternInst<SemIR::SymbolicBindingPattern>(
context, name_loc,
{.type_id = pattern_type_id, .entity_name_id = entity_name_id});
} else {
binding_pattern_id = AddPatternInst<SemIR::BindingPattern>(
context, name_loc,
{.type_id = pattern_type_id, .entity_name_id = entity_name_id});
}
auto binding_pattern_id = AddPatternInst(
context, SemIR::LocIdAndInst::UncheckedLoc(
name_loc,
SemIR::AnyBindingPattern{.kind = pattern_kind,
.type_id = pattern_type_id,
.entity_name_id = entity_name_id}));
if (is_generic) {
context.scope_stack().PushCompileTimeBinding(bind_id);
@@ -138,7 +144,7 @@ auto AddSelfParamPattern(Context& context, SemIR::LocId loc_id,
SemIR::TypeId type_id) -> SemIR::InstId {
SemIR::InstId pattern_id =
AddBindingPattern(context, loc_id, SemIR::NameId::SelfValue, type_id,
type_expr_region_id, /*is_generic=*/false,
type_expr_region_id, SemIR::ValueBindingPattern::Kind,
/*is_template=*/false)
.pattern_id;