mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +01:00
Jon Ross-Perkins
6b5eb1a101
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.
81 lines
2.4 KiB
C++
81 lines
2.4 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/inst_block_stack.h"
|
|
|
|
#include "common/vlog.h"
|
|
#include "llvm/ADT/STLExtras.h"
|
|
#include "llvm/ADT/StringExtras.h"
|
|
|
|
namespace Carbon::Check {
|
|
|
|
auto InstBlockStack::Push(SemIR::InstBlockId id) -> void {
|
|
CARBON_VLOG("{0} Push {1}\n", name_, id_stack_.size());
|
|
CARBON_CHECK(id_stack_.size() < (1 << 20),
|
|
"Excessive stack size: likely infinite loop");
|
|
id_stack_.push_back(id);
|
|
insts_stack_.PushArray();
|
|
}
|
|
|
|
auto InstBlockStack::Push(SemIR::InstBlockId id,
|
|
llvm::ArrayRef<SemIR::InstId> inst_ids) -> void {
|
|
Push(id);
|
|
insts_stack_.AppendToTop(inst_ids);
|
|
}
|
|
|
|
auto InstBlockStack::PeekOrAdd(int depth) -> SemIR::InstBlockId {
|
|
CARBON_CHECK(static_cast<int>(id_stack_.size()) > depth, "no such block");
|
|
int index = id_stack_.size() - depth - 1;
|
|
auto& slot = id_stack_[index];
|
|
if (!slot.has_value()) {
|
|
slot = sem_ir_->inst_blocks().AddDefaultValue();
|
|
}
|
|
return slot;
|
|
}
|
|
|
|
auto InstBlockStack::Pop() -> SemIR::InstBlockId {
|
|
CARBON_CHECK(!empty(), "no current block");
|
|
auto id = id_stack_.pop_back_val();
|
|
auto insts = insts_stack_.PeekArray();
|
|
|
|
// Finalize the block.
|
|
if (!insts.empty() && id != SemIR::InstBlockId::Unreachable) {
|
|
if (id.has_value()) {
|
|
sem_ir_->inst_blocks().Set(id, insts);
|
|
} else {
|
|
id = sem_ir_->inst_blocks().Add(insts);
|
|
}
|
|
}
|
|
|
|
insts_stack_.PopArray();
|
|
|
|
CARBON_VLOG("{0} Pop {1}: {2}\n", name_, id_stack_.size(), id);
|
|
return id.has_value() ? id : SemIR::InstBlockId::Empty;
|
|
}
|
|
|
|
auto InstBlockStack::PopAndDiscard() -> void {
|
|
CARBON_CHECK(!empty(), "no current block");
|
|
id_stack_.pop_back();
|
|
insts_stack_.PopArray();
|
|
CARBON_VLOG("{0} PopAndDiscard {1}\n", name_, id_stack_.size());
|
|
}
|
|
|
|
auto InstBlockStack::PrintForStackDump(int indent,
|
|
llvm::raw_ostream& output) const
|
|
-> void {
|
|
output.indent(indent);
|
|
output << name_ << ":\n";
|
|
for (const auto& [i, id] : llvm::enumerate(id_stack_)) {
|
|
output.indent(indent + 2);
|
|
output << i << ".\t" << id << "\t{";
|
|
llvm::ListSeparator sep;
|
|
for (auto id : insts_stack_.PeekArrayAt(i)) {
|
|
output << sep << id;
|
|
}
|
|
output << "}\n";
|
|
}
|
|
}
|
|
|
|
} // namespace Carbon::Check
|