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 template constant -> concrete constant. (#4939)

Browse Source 
This implements a direction decided in a
[recent
discussion](https://docs.google.com/document/d/1Iut5f2TQBrtBNIduF4vJYOKfw7MbS8xH_J01_Q4e6Rk/edit?resourcekey=0-mc_vh5UzrzXfU4kO-3tOjA&tab=t.0#heading=h.mas1g68xx9ct)
to switch away from "template constant" when naming a constant that
doesn't depend on any generic parameters, because that creates confusion
with template-dependent constant values that depend on a template
parameter.
This commit is contained in:
Richard Smith
2025-02-12 21:24:51 +00:00
committed by GitHub
parent 188821ba1a
commit c6d35e1c4a
674 changed files with 35160 additions and 35160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/sem_ir/constant.cpp
+3 -3
View File
@@ -12,8 +12,8 @@ auto ConstantStore::GetOrAdd(Inst inst, PhaseKind phase) -> ConstantId {
auto result = map_.Insert(inst, [&] {
auto inst_id = sem_ir_->insts().AddInNoBlock(LocIdAndInst::NoLoc(inst));
ConstantId const_id = ConstantId::None;
if (phase == IsTemplate) {
const_id = SemIR::ConstantId::ForTemplateConstant(inst_id);
if (phase == IsConcrete) {
const_id = SemIR::ConstantId::ForConcreteConstant(inst_id);
} else {
// The instruction in the constants store is an abstract symbolic
// constant, not associated with any particular generic.
@@ -31,7 +31,7 @@ auto ConstantStore::GetOrAdd(Inst inst, PhaseKind phase) -> ConstantId {
});
CARBON_CHECK(result.value() != ConstantId::None);
CARBON_CHECK(
result.value().is_symbolic() == (phase != IsTemplate),
result.value().is_symbolic() == (phase != IsConcrete),
"Constant {0} registered as both symbolic and template constant.", inst);
return result.value();
}