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

Add alias name to name resolution after processing the target to avoid self-referencing name crash (#1295)

Browse Source 
Fixes #1294
This commit is contained in:
pk19604014
2022-06-02 12:47:41 -07:00
committed by GitHub
parent e206c3123f
commit ccc6498993
4 changed files with 59 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
explorer/ast/static_scope.cpp
+24 -8
View File
@@ -9,17 +9,28 @@
namespace Carbon {
auto StaticScope::Add(std::string name, ValueNodeView entity)
-> ErrorOr<Success> {
auto [it, success] = declared_names_.insert({name, entity});
if (!success && it->second != entity) {
return CompilationError(entity.base().source_loc())
<< "Duplicate name `" << name << "` also found at "
<< it->second.base().source_loc();
auto StaticScope::Add(const std::string& name, ValueNodeView entity,
bool usable) -> ErrorOr<Success> {
auto [it, inserted] = declared_names_.insert({name, {entity, usable}});
if (!inserted) {
if (it->second.entity != entity) {
return CompilationError(entity.base().source_loc())
<< "Duplicate name `" << name << "` also found at "
<< it->second.entity.base().source_loc();
}
CARBON_CHECK(usable || !it->second.usable)
<< entity.base().source_loc() << " attempting to mark a usable name `"
<< name << "` as unusable";
}
return Success();
}
void StaticScope::MarkUsable(const std::string& name) {
auto it = declared_names_.find(name);
CARBON_CHECK(it != declared_names_.end()) << name << " not found";
it->second.usable = true;
}
auto StaticScope::Resolve(const std::string& name,
SourceLocation source_loc) const
-> ErrorOr<ValueNodeView> {
@@ -36,7 +47,12 @@ auto StaticScope::TryResolve(const std::string& name,
-> ErrorOr<std::optional<ValueNodeView>> {
auto it = declared_names_.find(name);
if (it != declared_names_.end()) {
return std::make_optional(it->second);
if (!it->second.usable) {
return CompilationError(source_loc)
<< "'" << name
<< "' is not usable until after it has been completely declared";
}
return std::make_optional(it->second.entity);
}
std::optional<ValueNodeView> result;
for (Nonnull<const StaticScope*> parent : parent_scopes_) {