mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +01:00
Jon Ross-Perkins
138ecf108f
Undoes a chunk of #4125 because nobody's really in favor of keeping the formatting, and it's occasionally caused a crash in Formatter to dominate output (and even when working, it can be verbose; the source location in (5) is often more helpful). Basically goes back to: ``` 4. Check::Context NodeStack: 0. LetIntroducer: no value 1. BindingPattern: inst+15 2. LetInitializer: no value 3. StructLiteralStart: no value inst_block_stack_: 0. block<invalid> {inst+0, inst+1, inst+6, inst+7, inst+8, inst+9, inst+10, inst+11, inst+12} 1. global_init {} pattern_block_stack_: 0. block<invalid> {} param_and_arg_refs_stack: 0. block<invalid> {} args_type_info_stack_: 0. block<invalid> {} 5. alias_of_alias.carbon:15:12: checking StructLiteral let d: c = {}; ^~ ``` Fixes #4145
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.is_valid()) {
|
|
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.is_valid()) {
|
|
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.is_valid() ? 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
|