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

fix: set StaticScope::NameStatus correctly for Associated Constants (#2752)

Browse Source 
The StaticScope::NameStatus pattern is not being correctly follow for associated constant deceleration.

Closes #2728
Closes #2730
This commit is contained in:
Manmeet Singh
2023-04-10 13:21:32 -07:00
committed by GitHub
parent 72d8f86e79
commit d9e37da4fb
3 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
explorer/interpreter/resolve_names.cpp
+5 -1
View File
@@ -227,7 +227,9 @@ auto NameResolver::AddExposedNames(const Declaration& declaration,
case DeclarationKind::AssociatedConstantDeclaration: {
const auto& let = cast<AssociatedConstantDeclaration>(declaration);
if (let.binding().name() != AnonymousName) {
CARBON_RETURN_IF_ERROR(enclosing_scope.Add(let.binding().name(), &let));
CARBON_RETURN_IF_ERROR(
enclosing_scope.Add(let.binding().name(), &let,
StaticScope::NameStatus::KnownButNotDeclared));
}
break;
}
@@ -829,7 +831,9 @@ auto NameResolver::ResolveNames(Declaration& declaration,
case DeclarationKind::AssociatedConstantDeclaration: {
auto& let = cast<AssociatedConstantDeclaration>(declaration);
StaticScope constant_scope(&enclosing_scope);
enclosing_scope.MarkDeclared(let.binding().name());
CARBON_RETURN_IF_ERROR(ResolveNames(let.binding(), constant_scope));
enclosing_scope.MarkUsable(let.binding().name());
break;
}
explorer/testdata/interface/fail_use_assoc_const_before_decl.carbon
Vendored
+19
View File
@@ -0,0 +1,19 @@
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
// Exceptions. See /LICENSE for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
// AUTOUPDATE
// RUN: %{not} %{explorer-run}
// RUN: %{not} %{explorer-run-trace}
package ExplorerTest api;
interface IFace {
// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/interface/fail_use_assoc_const_before_decl.carbon:[[@LINE+1]]: 'C' has not been declared yet
let B:! C;
let C:! IFace;
}
fn Main() -> i32 {
// return T;
}
explorer/testdata/interface/fail_use_assoc_const_in_defn.carbon
Vendored
+18
View File
@@ -0,0 +1,18 @@
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
// Exceptions. See /LICENSE for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
// AUTOUPDATE
// RUN: %{not} %{explorer-run}
// RUN: %{not} %{explorer-run-trace}
package ExplorerTest api;
interface IFace {
// CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/interface/fail_use_assoc_const_in_defn.carbon:[[@LINE+1]]: 'T' is not usable until after it has been completely declared
let T:! T.IFace;
}
fn Main() -> i32 {
return 0;
}