Skip to content

Commit

Permalink
Fix LexicalLookupResult's node_id -> inst_id (#3476)
Browse files Browse the repository at this point in the history
Noticed while working on #3475, but felt like it would be easy enough to
separate out.
  • Loading branch information
jonmeow committed Dec 8, 2023
1 parent 5007153 commit 18c51ea
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions toolchain/check/context.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,9 @@ auto Context::AddNameToLookup(Parse::NodeId name_node, SemIR::NameId name_id,
lexical_results.back().scope_index < current_scope_index())
<< "Failed to clean up after scope nested within the current scope";
lexical_results.push_back(
{.node_id = target_id, .scope_index = current_scope_index()});
{.inst_id = target_id, .scope_index = current_scope_index()});
} else {
DiagnoseDuplicateName(name_node, name_lookup_[name_id].back().node_id);
DiagnoseDuplicateName(name_node, name_lookup_[name_id].back().inst_id);
}
}

Expand Down Expand Up @@ -201,7 +201,7 @@ auto Context::LookupNameInDecl(Parse::NodeId parse_node, SemIR::NameId name_id,
<< "Should have been erased: " << names().GetFormatted(name_id);
auto result = name_it->second.back();
if (result.scope_index == current_scope_index()) {
return result.node_id;
return result.inst_id;
}
}
return SemIR::InstId::Invalid;
Expand Down Expand Up @@ -233,7 +233,7 @@ auto Context::LookupUnqualifiedName(Parse::NodeId parse_node,
// it shadows all further non-lexical results and we're done.
if (!lexical_results.empty() &&
lexical_results.back().scope_index > index) {
return lexical_results.back().node_id;
return lexical_results.back().inst_id;
}

auto non_lexical_result =
Expand All @@ -245,7 +245,7 @@ auto Context::LookupUnqualifiedName(Parse::NodeId parse_node,
}

if (!lexical_results.empty()) {
return lexical_results.back().node_id;
return lexical_results.back().inst_id;
}

// We didn't find anything at all.
Expand Down
6 changes: 3 additions & 3 deletions toolchain/check/context.h
Original file line number Diff line number Diff line change
Expand Up @@ -400,9 +400,9 @@ class Context {

// A lookup result in the lexical lookup table `name_lookup_`.
struct LexicalLookupResult {
// The node that was added to lookup.
SemIR::InstId node_id;
// The scope in which the node was added.
// The instruction that was added to lookup.
SemIR::InstId inst_id;
// The scope in which the instruction was added.
ScopeIndex scope_index;
};

Expand Down

0 comments on commit 18c51ea

Please sign in to comment.