mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-05 18:21:16 +01:00
Drop Singleton from ErrorInst::SingletonInstId and similar (#5304)
We frequently want to operate on singletons. Per discussion, drop `Singleton` to make the code shorter. This started off as wanting to write `inst_id.is_error()`, but the dependency relationship between ids.h and singleton_insts.h would require some kind of delayed evaluation to allow the implementation to remain in headers (which I suspect is helpful to have for inlining). I could have added something like `IsErrorInst`, forward declared in ids.h and defined in singleton_insts.h (which would always be included by typed_insts.h), but the template approach felt like a decent balance between (a) removing the boilerplate `::SingletonInstId`, (b) understandability, (c) still visually mirroring if we immediately return a singleton, and (d) flexibility for more than just `ErrorInst`. But TBH I'd probably still have written `is_error()` if it didn't require addressing the cross-header cycle. Then I tried `SemIR::InstId::Is<SemIR::ErrorInst>`, which generally worked with types but generated the complaint that it didn't shorten *all* singleton uses. So pulling back on `::Is`, and instead just dropping `Singleton`.
This commit is contained in:
@@ -182,7 +182,7 @@ static auto InsertHere(Context& context, SemIR::ExprRegionId region_id)
|
||||
context.TODO(loc_id,
|
||||
"Control flow expressions are currently only supported inside "
|
||||
"functions.");
|
||||
return SemIR::ErrorInst::SingletonInstId;
|
||||
return SemIR::ErrorInst::InstId;
|
||||
}
|
||||
AddInst(context, SemIR::LocIdAndInst::NoLoc<SemIR::Branch>(
|
||||
{.target_id = region.block_ids.front()}));
|
||||
@@ -291,8 +291,8 @@ auto MatchContext::DoEmitPatternMatch(Context& context,
|
||||
"Parameters out of order; expecting {0} but got {1}", results_.size(),
|
||||
param_pattern.index.index);
|
||||
CARBON_CHECK(entry.scrutinee_id.has_value());
|
||||
if (entry.scrutinee_id == SemIR::ErrorInst::SingletonInstId) {
|
||||
results_.push_back(SemIR::ErrorInst::SingletonInstId);
|
||||
if (entry.scrutinee_id == SemIR::ErrorInst::InstId) {
|
||||
results_.push_back(SemIR::ErrorInst::InstId);
|
||||
} else {
|
||||
results_.push_back(ConvertToValueOfType(
|
||||
context, context.insts().GetLocId(entry.scrutinee_id),
|
||||
@@ -479,7 +479,7 @@ auto MatchContext::DoEmitPatternMatch(Context& context,
|
||||
SemIR::TuplePattern tuple_pattern,
|
||||
SemIR::InstId pattern_inst_id,
|
||||
WorkItem entry) -> void {
|
||||
if (tuple_pattern.type_id == SemIR::ErrorInst::SingletonTypeId) {
|
||||
if (tuple_pattern.type_id == SemIR::ErrorInst::TypeId) {
|
||||
return;
|
||||
}
|
||||
auto subpattern_ids = context.inst_blocks().Get(tuple_pattern.elements_id);
|
||||
@@ -544,7 +544,7 @@ auto MatchContext::DoEmitPatternMatch(Context& context,
|
||||
|
||||
auto MatchContext::EmitPatternMatch(Context& context,
|
||||
MatchContext::WorkItem entry) -> void {
|
||||
if (entry.pattern_id == SemIR::ErrorInst::SingletonInstId) {
|
||||
if (entry.pattern_id == SemIR::ErrorInst::InstId) {
|
||||
return;
|
||||
}
|
||||
Diagnostics::AnnotationScope annotate_diagnostics(
|
||||
|
||||
Reference in New Issue
Block a user