carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-06 09:34:42 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Avoid poisoning non identifier names (#4884)

Browse Source 
There are different use cases where we call
`Context::LookupQualifiedName()` on non identifiers, like
`NameId::SelfType`, which implicitly triggers poisoning these names. I
don't think poisoning non identifiers like`Self` is ever useful.

Use cases where `Self` is being poisoned:
* Checking allowed access:
https://github.com/carbon-language/carbon-lang/blob/e257051612e4217295e206fd3274fc75e22d206a/toolchain/check/member_access.cpp#L62,
for example, in
https://github.com/carbon-language/carbon-lang/blob/e257051612e4217295e206fd3274fc75e22d206a/toolchain/check/testdata/alias/no_prelude/fail_aliased_name_in_diag.carbon#L21
* Using the type `Self` as a parameter type:
https://github.com/carbon-language/carbon-lang/blob/e257051612e4217295e206fd3274fc75e22d206a/core/prelude/operators/arithmetic.carbon#L78

Part of #4622.
This commit is contained in:
Boaz Brickner
2025-02-13 20:00:54 +00:00
committed by GitHub
parent aa71f31787
commit 23e5677c8e
4 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/sem_ir/name_scope_test.cpp
+35 -8
View File
@@ -195,8 +195,9 @@ TEST(NameScope, Lookup) {
EXPECT_EQ(name_scope.GetEntry(*lookup), entry3);
NameId unknown_name_id(++id);
lookup = name_scope.Lookup(unknown_name_id);
EXPECT_EQ(lookup, std::nullopt);
EXPECT_EQ(name_scope.Lookup(unknown_name_id), std::nullopt);
// Check that this is different from LookupOrPoison() - doesn't get poisoned.
EXPECT_EQ(name_scope.Lookup(unknown_name_id), std::nullopt);
}
TEST(NameScope, LookupOrPoison) {
@@ -222,24 +223,50 @@ TEST(NameScope, LookupOrPoison) {
InstId(++id), AccessKind::Private)};
name_scope.AddRequired(entry3);
LocId poisoning_loc_id(++id);
auto lookup = name_scope.LookupOrPoison(poisoning_loc_id, entry1.name_id);
LocId poisoning_loc_id_known_entries(++id);
auto lookup =
name_scope.LookupOrPoison(poisoning_loc_id_known_entries, entry1.name_id);
ASSERT_NE(lookup, std::nullopt);
EXPECT_EQ(static_cast<NameScope&>(name_scope).GetEntry(*lookup), entry1);
EXPECT_EQ(static_cast<const NameScope&>(name_scope).GetEntry(*lookup),
entry1);
lookup = name_scope.LookupOrPoison(poisoning_loc_id, entry2.name_id);
lookup =
name_scope.LookupOrPoison(poisoning_loc_id_known_entries, entry2.name_id);
ASSERT_NE(lookup, std::nullopt);
EXPECT_EQ(name_scope.GetEntry(*lookup), entry2);
lookup = name_scope.LookupOrPoison(poisoning_loc_id, entry3.name_id);
lookup =
name_scope.LookupOrPoison(poisoning_loc_id_known_entries, entry3.name_id);
ASSERT_NE(lookup, std::nullopt);
EXPECT_EQ(name_scope.GetEntry(*lookup), entry3);
NameId unknown_name_id(++id);
lookup = name_scope.LookupOrPoison(poisoning_loc_id, unknown_name_id);
EXPECT_EQ(lookup, std::nullopt);
LocId poisoning_loc_id_unknown_entry(++id);
EXPECT_EQ(name_scope.LookupOrPoison(poisoning_loc_id_unknown_entry,
unknown_name_id),
std::nullopt);
// Check that this is different from Lookup() - does get poisoned.
lookup = name_scope.Lookup(unknown_name_id);
ASSERT_NE(lookup, std::nullopt);
EXPECT_EQ(name_scope.GetEntry(*lookup).result,
ScopeLookupResult::MakePoisoned(poisoning_loc_id_unknown_entry));
}
TEST(NameScope, LookupOrPoisonNotIdentifier) {
int id = 0;
InstId scope_inst_id(++id);
NameId scope_name_id(++id);
NameScopeId parent_scope_id(++id);
NameScope name_scope(scope_inst_id, scope_name_id, parent_scope_id);
LocId poisoning_loc_id(++id);
EXPECT_EQ(name_scope.LookupOrPoison(poisoning_loc_id, NameId::SelfType),
std::nullopt);
// Check that this is different from the identifier use case - doesn't get
// poisoned.
EXPECT_EQ(name_scope.Lookup(NameId::SelfType), std::nullopt);
}
TEST(NameScope, LookupOrAdd) {