mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-25 19:50:12 +01:00
High level, replacing `Id::Invalid` with `Id::None` and `Id::is_valid` with `Id::has_value` for clarity, as discussed [here](https://discord.com/channels/655572317891461132/655578254970716160/1331664574545395794). The `IntId` refactoring is needed together with `AnyIdBase` because it's also used with `ValueStore`. Note, trying to be careful not to rewrite `EnumBase::InvalidIndex`, or `is_valid` in general (e.g., `IdKind::is_valid`). I've tried to sequence commits here: 1. Automatic replacements: - `((?:Id|Index)(?: |::|\(|Base(?:\(|::)))Invalid((?:Index)?\W)` -> `$1None$2` - `<invalid>` -> `<none>` - `InvalidNodeId` -> `NoneNodeId` - `/\*invalid\*/` -> `/*none*/` - `id((?:_|\(\))(?:\.|->))is_valid` -> `id$1has_value` 2. Manual edits: - In `int.h` and `int_test.cpp` - `IntT` has `is_value`, which I'm renaming to `is_embedded_value`. - Manual edits to comments in this file. - `AnyIdBase` and `IdBase` - Declaration of `is_valid` -> `has_value`, `InvalidIndex` -> `NoneIndex`. - In `ids.h` and `ids.cpp` - `is_valid` -> `has_value` - `// An explicitly invalid ID.` -> `// An ID with no value.`; similar for index - Various math on `InvalidIndex` -> `NoneIndex` - Various mentions of "valid" in comments - In `value_store.h`, for `IdT::Invalid`, plus one comment - In `impl.h` and `tokenized_buffer.h`, we had different initialization of `::None` values (versus `ids.h` syntax) that I fixed manually. - Spot checks to compile - Particularly where `is_valid` replacements didn't catch spots due to different naming. 3. Autoupdate tests 4. verbose.carbon (NOAUTOUPDATE) 5. Comment spot checks Note there are probably other mentions of "Invalid" that should be swept up, but I'd like to argue for merging and separating out remaining cleanup since this is so sweeping (and likely to hit merge conflicts from churn). We'll probably have lingering mentions of "invalid" for a bit regardless, just because there are uses of "invalid" in non-Id APIs.
259 lines
9.7 KiB
C++
259 lines
9.7 KiB
C++
// 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
|
|
|
|
#include "toolchain/check/scope_stack.h"
|
|
|
|
#include "common/check.h"
|
|
#include "toolchain/sem_ir/ids.h"
|
|
|
|
namespace Carbon::Check {
|
|
|
|
auto ScopeStack::VerifyOnFinish() -> void {
|
|
CARBON_CHECK(scope_stack_.empty(), "{0}", scope_stack_.size());
|
|
}
|
|
|
|
auto ScopeStack::VerifyNextCompileTimeBindIndex(llvm::StringLiteral label,
|
|
const ScopeStackEntry& scope)
|
|
-> void {
|
|
CARBON_CHECK(
|
|
static_cast<int32_t>(compile_time_binding_stack_.all_values_size()) ==
|
|
scope.next_compile_time_bind_index.index,
|
|
"Wrong number of entries in compile-time binding stack after {0}: have "
|
|
"{1}, expected {2}",
|
|
label, compile_time_binding_stack_.all_values_size(),
|
|
scope.next_compile_time_bind_index.index);
|
|
}
|
|
|
|
auto ScopeStack::Push(SemIR::InstId scope_inst_id, SemIR::NameScopeId scope_id,
|
|
SemIR::SpecificId specific_id,
|
|
bool lexical_lookup_has_load_error) -> void {
|
|
// If this scope doesn't have a specific of its own, it lives in the enclosing
|
|
// scope's specific, if any.
|
|
auto enclosing_specific_id = specific_id;
|
|
if (!specific_id.has_value() && !scope_stack_.empty()) {
|
|
enclosing_specific_id = PeekSpecificId();
|
|
}
|
|
|
|
compile_time_binding_stack_.PushArray();
|
|
scope_stack_.push_back(
|
|
{.index = next_scope_index_,
|
|
.scope_inst_id = scope_inst_id,
|
|
.scope_id = scope_id,
|
|
.specific_id = enclosing_specific_id,
|
|
.next_compile_time_bind_index = SemIR::CompileTimeBindIndex(
|
|
compile_time_binding_stack_.all_values_size()),
|
|
.lexical_lookup_has_load_error =
|
|
LexicalLookupHasLoadError() || lexical_lookup_has_load_error});
|
|
if (scope_id.has_value()) {
|
|
non_lexical_scope_stack_.push_back({.scope_index = next_scope_index_,
|
|
.name_scope_id = scope_id,
|
|
.specific_id = enclosing_specific_id});
|
|
} else {
|
|
// For lexical lookups, unqualified lookup doesn't know how to find the
|
|
// associated specific, so if we start adding lexical scopes associated with
|
|
// specifics, we'll need to somehow track them in lookup.
|
|
CARBON_CHECK(!specific_id.has_value(),
|
|
"Lexical scope should not have an associated specific.");
|
|
}
|
|
|
|
// TODO: Handle this case more gracefully.
|
|
CARBON_CHECK(next_scope_index_.index != std::numeric_limits<int32_t>::max(),
|
|
"Ran out of scopes");
|
|
++next_scope_index_.index;
|
|
|
|
VerifyNextCompileTimeBindIndex("Push", scope_stack_.back());
|
|
}
|
|
|
|
auto ScopeStack::Pop() -> void {
|
|
auto scope = scope_stack_.pop_back_val();
|
|
|
|
scope.names.ForEach([&](SemIR::NameId str_id) {
|
|
auto& lexical_results = lexical_lookup_.Get(str_id);
|
|
CARBON_CHECK(lexical_results.back().scope_index == scope.index,
|
|
"Inconsistent scope index for name {0}", str_id);
|
|
lexical_results.pop_back();
|
|
});
|
|
|
|
if (scope.scope_id.has_value()) {
|
|
CARBON_CHECK(non_lexical_scope_stack_.back().scope_index == scope.index);
|
|
non_lexical_scope_stack_.pop_back();
|
|
}
|
|
|
|
if (scope.has_returned_var) {
|
|
CARBON_CHECK(!return_scope_stack_.empty());
|
|
CARBON_CHECK(return_scope_stack_.back().returned_var.has_value());
|
|
return_scope_stack_.back().returned_var = SemIR::InstId::None;
|
|
}
|
|
|
|
VerifyNextCompileTimeBindIndex("Pop", scope);
|
|
compile_time_binding_stack_.PopArray();
|
|
}
|
|
|
|
auto ScopeStack::PopTo(ScopeIndex index) -> void {
|
|
while (PeekIndex() > index) {
|
|
Pop();
|
|
}
|
|
CARBON_CHECK(PeekIndex() == index,
|
|
"Scope index {0} does not enclose the current scope {1}", index,
|
|
PeekIndex());
|
|
}
|
|
|
|
auto ScopeStack::LookupInLexicalScopesWithin(SemIR::NameId name_id,
|
|
ScopeIndex scope_index)
|
|
-> SemIR::InstId {
|
|
auto& lexical_results = lexical_lookup_.Get(name_id);
|
|
if (lexical_results.empty()) {
|
|
return SemIR::InstId::None;
|
|
}
|
|
|
|
auto result = lexical_results.back();
|
|
if (result.scope_index < scope_index) {
|
|
return SemIR::InstId::None;
|
|
}
|
|
|
|
return result.inst_id;
|
|
}
|
|
|
|
auto ScopeStack::LookupInLexicalScopes(SemIR::NameId name_id)
|
|
-> std::pair<SemIR::InstId, llvm::ArrayRef<NonLexicalScope>> {
|
|
// Find the results from lexical scopes. These will be combined with results
|
|
// from non-lexical scopes such as namespaces and classes.
|
|
llvm::ArrayRef<LexicalLookup::Result> lexical_results =
|
|
lexical_lookup_.Get(name_id);
|
|
|
|
// If we have no lexical results, check all non-lexical scopes.
|
|
if (lexical_results.empty()) {
|
|
return {LexicalLookupHasLoadError() ? SemIR::ErrorInst::SingletonInstId
|
|
: SemIR::InstId::None,
|
|
non_lexical_scope_stack_};
|
|
}
|
|
|
|
// Find the first non-lexical scope that is within the scope of the lexical
|
|
// lookup result.
|
|
auto* first_non_lexical_scope = llvm::lower_bound(
|
|
non_lexical_scope_stack_, lexical_results.back().scope_index,
|
|
[](const NonLexicalScope& scope, ScopeIndex index) {
|
|
return scope.scope_index < index;
|
|
});
|
|
return {
|
|
lexical_results.back().inst_id,
|
|
llvm::ArrayRef(first_non_lexical_scope, non_lexical_scope_stack_.end())};
|
|
}
|
|
|
|
auto ScopeStack::LookupOrAddName(SemIR::NameId name_id, SemIR::InstId target_id,
|
|
ScopeIndex scope_index) -> SemIR::InstId {
|
|
// Find the corresponding scope depth.
|
|
//
|
|
// TODO: Consider passing in the depth rather than performing a scan for it.
|
|
// We only do this scan when declaring an entity such as a class within a
|
|
// function, so it should be relatively rare, but it's still not necesasry to
|
|
// recompute this.
|
|
int scope_depth = scope_stack_.size() - 1;
|
|
if (scope_index.has_value()) {
|
|
scope_depth =
|
|
std::lower_bound(scope_stack_.begin(), scope_stack_.end(), scope_index,
|
|
[](const ScopeStackEntry& entry, ScopeIndex index) {
|
|
return entry.index < index;
|
|
}) -
|
|
scope_stack_.begin();
|
|
CARBON_CHECK(scope_stack_[scope_depth].index == scope_index,
|
|
"Declaring name in scope that has already ended");
|
|
} else {
|
|
scope_index = scope_stack_[scope_depth].index;
|
|
}
|
|
|
|
// If this name has already been declared in this scope or an inner scope,
|
|
// return the existing result.
|
|
auto& lexical_results = lexical_lookup_.Get(name_id);
|
|
if (!lexical_results.empty() &&
|
|
lexical_results.back().scope_index >= scope_index) {
|
|
return lexical_results.back().inst_id;
|
|
}
|
|
|
|
// Add the name into the scope.
|
|
bool inserted = scope_stack_[scope_depth].names.Insert(name_id).is_inserted();
|
|
CARBON_CHECK(inserted, "Name in scope but not in lexical lookups");
|
|
++scope_stack_[scope_depth].num_names;
|
|
|
|
// Add a corresponding lexical lookup result.
|
|
lexical_results.push_back({.inst_id = target_id, .scope_index = scope_index});
|
|
return SemIR::InstId::None;
|
|
}
|
|
|
|
auto ScopeStack::SetReturnedVarOrGetExisting(SemIR::InstId inst_id)
|
|
-> SemIR::InstId {
|
|
CARBON_CHECK(!return_scope_stack_.empty(), "`returned var` in no function");
|
|
auto& returned_var = return_scope_stack_.back().returned_var;
|
|
if (returned_var.has_value()) {
|
|
return returned_var;
|
|
}
|
|
|
|
returned_var = inst_id;
|
|
CARBON_CHECK(!scope_stack_.back().has_returned_var,
|
|
"Scope has returned var but none is set");
|
|
if (inst_id.has_value()) {
|
|
scope_stack_.back().has_returned_var = true;
|
|
}
|
|
return SemIR::InstId::None;
|
|
}
|
|
|
|
auto ScopeStack::Suspend() -> SuspendedScope {
|
|
CARBON_CHECK(!scope_stack_.empty(), "No scope to suspend");
|
|
SuspendedScope result = {.entry = scope_stack_.pop_back_val(),
|
|
.suspended_items = {}};
|
|
if (result.entry.scope_id.has_value()) {
|
|
non_lexical_scope_stack_.pop_back();
|
|
}
|
|
|
|
auto peek_compile_time_bindings = compile_time_binding_stack_.PeekArray();
|
|
result.suspended_items.reserve(result.entry.num_names +
|
|
peek_compile_time_bindings.size());
|
|
|
|
result.entry.names.ForEach([&](SemIR::NameId name_id) {
|
|
auto [index, inst_id] = lexical_lookup_.Suspend(name_id);
|
|
CARBON_CHECK(index !=
|
|
SuspendedScope::ScopeItem::IndexForCompileTimeBinding);
|
|
result.suspended_items.push_back({.index = index, .inst_id = inst_id});
|
|
});
|
|
CARBON_CHECK(static_cast<int>(result.suspended_items.size()) ==
|
|
result.entry.num_names);
|
|
|
|
// Move any compile-time bindings into the suspended scope.
|
|
for (auto inst_id : peek_compile_time_bindings) {
|
|
result.suspended_items.push_back(
|
|
{.index = SuspendedScope::ScopeItem::IndexForCompileTimeBinding,
|
|
.inst_id = inst_id});
|
|
}
|
|
compile_time_binding_stack_.PopArray();
|
|
|
|
// This would be easy to support if we had a need, but currently we do not.
|
|
CARBON_CHECK(!result.entry.has_returned_var,
|
|
"Should not suspend a scope with a returned var.");
|
|
return result;
|
|
}
|
|
|
|
auto ScopeStack::Restore(SuspendedScope scope) -> void {
|
|
compile_time_binding_stack_.PushArray();
|
|
for (auto [index, inst_id] : scope.suspended_items) {
|
|
if (index == SuspendedScope::ScopeItem::IndexForCompileTimeBinding) {
|
|
compile_time_binding_stack_.AppendToTop(inst_id);
|
|
} else {
|
|
lexical_lookup_.Restore({.index = index, .inst_id = inst_id},
|
|
scope.entry.index);
|
|
}
|
|
}
|
|
|
|
VerifyNextCompileTimeBindIndex("Restore", scope.entry);
|
|
|
|
if (scope.entry.scope_id.has_value()) {
|
|
non_lexical_scope_stack_.push_back(
|
|
{.scope_index = scope.entry.index,
|
|
.name_scope_id = scope.entry.scope_id,
|
|
.specific_id = scope.entry.specific_id});
|
|
}
|
|
scope_stack_.push_back(std::move(scope.entry));
|
|
}
|
|
|
|
} // namespace Carbon::Check
|