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

Distinguish between name IDs and string IDs in the type system. (#3341)

Browse Source 
Add a `NameId` that is effectively just a wrapper around a `StringId`,
with
some additional predefined values for names that don't correspond to
strings, such as the name of `self` or the function's return slot.
This commit is contained in:
Richard Smith
2023-11-09 16:51:36 +00:00
committed by GitHub
parent 84bc8cc4bf
commit 71aa4a45be
206 changed files with 1050 additions and 921 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/convert.cpp
+9 -9
View File
@@ -428,7 +428,7 @@ static auto ConvertStructToStructOrClass(Context& context,
}
// Prepare to look up fields in the source by index.
llvm::SmallDenseMap<IdentifierId, int32_t> src_field_indexes;
llvm::SmallDenseMap<SemIR::NameId, int32_t> src_field_indexes;
if (src_type.fields_id != dest_type.fields_id) {
for (auto [i, field_id] : llvm::enumerate(src_elem_fields)) {
auto [it, added] = src_field_indexes.insert(
@@ -467,19 +467,19 @@ static auto ConvertStructToStructOrClass(Context& context,
StructInitMissingFieldInLiteral, Error,
"Missing value for field `{0}` in struct initialization.",
llvm::StringRef);
context.emitter().Emit(value.parse_node(),
StructInitMissingFieldInLiteral,
sem_ir.identifiers().Get(dest_field.name_id));
context.emitter().Emit(
value.parse_node(), StructInitMissingFieldInLiteral,
sem_ir.names().GetFormatted(dest_field.name_id));
} else {
CARBON_DIAGNOSTIC(StructInitMissingFieldInConversion, Error,
"Cannot convert from struct type `{0}` to `{1}`: "
"missing field `{2}` in source type.",
std::string, std::string, llvm::StringRef);
context.emitter().Emit(value.parse_node(),
StructInitMissingFieldInConversion,
sem_ir.StringifyType(value.type_id()),
sem_ir.StringifyType(target.type_id),
sem_ir.identifiers().Get(dest_field.name_id));
context.emitter().Emit(
value.parse_node(), StructInitMissingFieldInConversion,
sem_ir.StringifyType(value.type_id()),
sem_ir.StringifyType(target.type_id),
sem_ir.names().GetFormatted(dest_field.name_id));
}
return SemIR::InstId::BuiltinError;
}