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

Change DeclNameStack::LookupOrAddName() to return SemIR::ScopeLookupResult instead of a pair (#4852)

Browse Source 
This makes the lookup API more consistent and would make it easier to
add poisoning location.
Part of #4622.
This commit is contained in:
Boaz Brickner
2025-01-28 21:36:20 +00:00
committed by GitHub
parent 51d7e6315e
commit f4e19f4390
5 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/handle_interface.cpp
+7 -4
View File
@@ -59,12 +59,15 @@ static auto BuildInterfaceDecl(Context& context,
SemIR::LibraryNameId::None)};
// Check whether this is a redeclaration.
auto [existing_id, is_poisoned] = context.decl_name_stack().LookupOrAddName(
name_context, interface_decl_id, introducer.modifier_set.GetAccessKind());
if (is_poisoned) {
SemIR::ScopeLookupResult lookup_result =
context.decl_name_stack().LookupOrAddName(
name_context, interface_decl_id,
introducer.modifier_set.GetAccessKind());
if (lookup_result.is_poisoned()) {
// This is a declaration of a poisoned name.
context.DiagnosePoisonedName(interface_decl_id);
} else if (existing_id.has_value()) {
} else if (lookup_result.is_found()) {
SemIR::InstId existing_id = lookup_result.target_inst_id();
if (auto existing_interface_decl =
context.insts().Get(existing_id).TryAs<SemIR::InterfaceDecl>()) {
auto existing_interface =