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

Rename singleton InstId constants to TypeInstId (#5323)

Browse Source 
These constant instructions are all TypeInstId already in their type,
and this makes their names match.

Change the name of MakeSingletonInstId as well and update its comment.
This commit is contained in:
Dana Jansens
2025-04-17 18:57:20 +00:00
committed by GitHub
parent bf32da8dad
commit c38e723dd8
26 changed files with 113 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/eval.cpp
+5 -5
View File
@@ -827,7 +827,7 @@ static auto MakeIntTypeResult(Context& context, SemIR::LocId loc_id,
SemIR::IntKind int_kind, SemIR::InstId width_id,
Phase phase) -> SemIR::ConstantId {
auto result = SemIR::IntType{
.type_id = GetSingletonType(context, SemIR::TypeType::InstId),
.type_id = GetSingletonType(context, SemIR::TypeType::TypeInstId),
.int_kind = int_kind,
.bit_width_id = width_id};
if (!ValidateIntType(context, loc_id, result)) {
@@ -1441,7 +1441,7 @@ static auto MakeConstantForBuiltinCall(EvalContext& eval_context,
}
case SemIR::BuiltinFunctionKind::IntLiteralMakeType: {
return context.constant_values().Get(SemIR::IntLiteralType::InstId);
return context.constant_values().Get(SemIR::IntLiteralType::TypeInstId);
}
case SemIR::BuiltinFunctionKind::IntMakeTypeSigned: {
@@ -1462,11 +1462,11 @@ static auto MakeConstantForBuiltinCall(EvalContext& eval_context,
if (!ValidateFloatBitWidth(context, loc_id, arg_ids[0])) {
return SemIR::ErrorInst::ConstantId;
}
return context.constant_values().Get(SemIR::LegacyFloatType::InstId);
return context.constant_values().Get(SemIR::LegacyFloatType::TypeInstId);
}
case SemIR::BuiltinFunctionKind::BoolMakeType: {
return context.constant_values().Get(SemIR::BoolType::InstId);
return context.constant_values().Get(SemIR::BoolType::TypeInstId);
}
// Integer conversions.
@@ -1910,7 +1910,7 @@ auto TryEvalTypedInst<SemIR::WhereExpr>(EvalContext& eval_context,
if (rhs != SemIR::ErrorInst::ConstantId &&
IsPeriodSelf(eval_context, lhs)) {
auto rhs_inst_id = eval_context.constant_values().GetInstId(rhs);
if (rhs_inst_id == SemIR::TypeType::InstId) {
if (rhs_inst_id == SemIR::TypeType::TypeInstId) {
// `.Self impls type` -> nothing to do.
} else {
auto facet_type =