Skip to content

Internal change #2073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Jun 17, 2026
Merged

Internal change #2073

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions checker/internal/type_checker_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ class ResolveVisitor : public AstVisitorBase {
struct AttributeResolution {
const VariableDecl* decl;
bool requires_disambiguation;
bool local;
};

ResolveVisitor(NamespaceGenerator namespace_generator,
Expand Down Expand Up @@ -1001,7 +1002,7 @@ void ResolveVisitor::ResolveSimpleIdentifier(const Expr& expr,
const VariableDecl* local_decl = LookupLocalIdentifier(name);

if (local_decl != nullptr && !absl::StartsWith(name, ".")) {
attributes_[&expr] = {local_decl, false};
attributes_[&expr] = {local_decl, false, /*local=*/true};
types_[&expr] =
inference_context_->InstantiateTypeParams(local_decl->type());
return;
Expand All @@ -1016,8 +1017,13 @@ void ResolveVisitor::ResolveSimpleIdentifier(const Expr& expr,
});

if (decl != nullptr) {
attributes_[&expr] = {decl,
/* requires_disambiguation= */ local_decl != nullptr};
attributes_[&expr] = {
decl,
/* requires_disambiguation= */ local_decl != nullptr,
// There is some oddity here, `.` prefixed idents should never be local.
// So LookupLocalIdentifier above should never return a valid decl.
// Perhaps this is a refactor holdover?
/*local=*/false};
types_[&expr] = inference_context_->InstantiateTypeParams(decl->type());
return;
}
Expand Down Expand Up @@ -1072,9 +1078,14 @@ void ResolveVisitor::ResolveQualifiedIdentifier(
root = &root->select_expr().operand();
}

attributes_[root] = {decl,
/* requires_disambiguation= */ decl != local_decl &&
local_decl != nullptr};
attributes_[root] = {
decl,
/* requires_disambiguation= */ decl != local_decl &&
local_decl != nullptr,
// There is some oddity here, `.` prefixed idents should never be local.
// So LookupLocalIdentifier above should never return a valid decl.
// Perhaps this is a refactor holdover?
/*local=*/local_decl == decl};
types_[root] = inference_context_->InstantiateTypeParams(decl->type());

// fix-up select operations that were deferred.
Expand Down
Loading