mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-03 22:02:51 +01:00
Rename singleton InstId constants to TypeInstId (#5323)
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:
@@ -173,7 +173,8 @@ static auto AddNamespace(Context& context, PackageNameId cpp_package_id,
|
||||
}
|
||||
|
||||
return AddImportNamespaceToScope(
|
||||
context, GetSingletonType(context, SemIR::NamespaceType::InstId),
|
||||
context,
|
||||
GetSingletonType(context, SemIR::NamespaceType::TypeInstId),
|
||||
SemIR::NameId::ForPackageName(cpp_package_id),
|
||||
SemIR::NameScopeId::Package,
|
||||
/*diagnose_duplicate_namespace=*/false,
|
||||
@@ -427,8 +428,8 @@ static auto ImportNamespaceDecl(Context& context,
|
||||
clang::NamespaceDecl* clang_decl)
|
||||
-> SemIR::InstId {
|
||||
auto result = AddImportNamespace(
|
||||
context, GetSingletonType(context, SemIR::NamespaceType::InstId), name_id,
|
||||
parent_scope_id, /*import_id=*/SemIR::InstId::None);
|
||||
context, GetSingletonType(context, SemIR::NamespaceType::TypeInstId),
|
||||
name_id, parent_scope_id, /*import_id=*/SemIR::InstId::None);
|
||||
context.name_scopes()
|
||||
.Get(result.name_scope_id)
|
||||
.set_cpp_decl_context(clang_decl);
|
||||
|
||||
Reference in New Issue
Block a user