mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-05 22:02:55 +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:
@@ -72,7 +72,7 @@ auto ValidateFloatType(Context& context, SemIR::LocId loc_id,
|
||||
template <typename InstT, typename... EachArgT>
|
||||
static auto GetTypeImpl(Context& context, EachArgT... each_arg)
|
||||
-> SemIR::TypeId {
|
||||
InstT inst = {SemIR::TypeType::SingletonTypeId, each_arg...};
|
||||
InstT inst = {SemIR::TypeType::TypeId, each_arg...};
|
||||
return context.types().GetTypeIdForTypeConstantId(TryEvalInst(context, inst));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user