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

Refactor InstBlockStack to use ArrayStack. (#4104)

Browse Source 
The use of ArrayStack here is intended to simplify the logic, and also
make better use of the inst heap allocations. Prior changes #4101 and
#4103 removed the less related logic from InstBlockStack, although #4103
is the actual part that blocked using ArrayStack.

BTW, note the PrintForStackDump implementation was incorrect because it
didn't apply size_. This simplification fixes the issue.
This commit is contained in:
Jon Ross-Perkins
2024-07-03 19:19:57 +00:00
committed by GitHub
parent 9581a1867d
commit efa158d496
5 changed files with 88 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/inst_block_stack.cpp
+27 -30
View File
@@ -11,66 +11,63 @@
namespace Carbon::Check {
auto InstBlockStack::Push(SemIR::InstBlockId id) -> void {
CARBON_VLOG() << name_ << " Push " << size_ << "\n";
CARBON_CHECK(size_ < (1 << 20))
CARBON_VLOG() << name_ << " Push " << id_stack_.size() << "\n";
CARBON_CHECK(id_stack_.size() < (1 << 20))
<< "Excessive stack size: likely infinite loop";
if (size_ == static_cast<int>(stack_.size())) {
stack_.emplace_back();
}
stack_[size_].Reset(id);
++size_;
id_stack_.push_back(id);
insts_stack_.PushArray();
}
auto InstBlockStack::Push(SemIR::InstBlockId id,
llvm::ArrayRef<SemIR::InstId> inst_ids) -> void {
Push(id);
stack_[size_ - 1].content = inst_ids;
insts_stack_.AppendToTop(inst_ids);
}
auto InstBlockStack::PeekOrAdd(int depth) -> SemIR::InstBlockId {
CARBON_CHECK(size_ > depth) << "no such block";
int index = size_ - depth - 1;
auto& slot = stack_[index];
if (!slot.id.is_valid()) {
slot.id = sem_ir_->inst_blocks().AddDefaultValue();
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.is_valid()) {
slot = sem_ir_->inst_blocks().AddDefaultValue();
}
return slot.id;
return slot;
}
auto InstBlockStack::Pop() -> SemIR::InstBlockId {
CARBON_CHECK(!empty()) << "no current block";
--size_;
auto& back = stack_[size_];
auto id = id_stack_.pop_back_val();
auto insts = insts_stack_.PeekArray();
// Finalize the block.
if (!back.content.empty() && back.id != SemIR::InstBlockId::Unreachable) {
if (back.id.is_valid()) {
sem_ir_->inst_blocks().Set(back.id, back.content);
if (!insts.empty() && id != SemIR::InstBlockId::Unreachable) {
if (id.is_valid()) {
sem_ir_->inst_blocks().Set(id, insts);
} else {
back.id = sem_ir_->inst_blocks().Add(back.content);
id = sem_ir_->inst_blocks().Add(insts);
}
}
CARBON_VLOG() << name_ << " Pop " << size_ << ": " << back.id << "\n";
if (!back.id.is_valid()) {
return SemIR::InstBlockId::Empty;
}
return back.id;
insts_stack_.PopArray();
CARBON_VLOG() << name_ << " Pop " << id_stack_.size() << ": " << id << "\n";
return id.is_valid() ? id : SemIR::InstBlockId::Empty;
}
auto InstBlockStack::PopAndDiscard() -> void {
CARBON_CHECK(!empty()) << "no current block";
--size_;
CARBON_VLOG() << name_ << " PopAndDiscard " << size_ << "\n";
id_stack_.pop_back();
insts_stack_.PopArray();
CARBON_VLOG() << name_ << " PopAndDiscard " << id_stack_.size() << "\n";
}
auto InstBlockStack::PrintForStackDump(llvm::raw_ostream& output) const
-> void {
output << name_ << ":\n";
for (const auto& [i, entry] : llvm::enumerate(stack_)) {
output << "\t" << i << ".\t" << entry.id << "\t{";
for (const auto& [i, id] : llvm::enumerate(id_stack_)) {
output << "\t" << i << ".\t" << id << "\t{";
llvm::ListSeparator sep;
for (auto id : entry.content) {
for (auto id : insts_stack_.PeekArrayAt(i)) {
output << sep << id;
}
output << "}\n";