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

Explorer: move deallocation to StepCleanUp (#2547)

Browse Source 
Move deallocation logic to `StepCleanUp` to have all necessary cleanup actions in the same place. Currently this means `DestroyAction` and `heap_.Deallocate`.
This commit is contained in:
Adrien Leravat
2023-01-24 12:24:05 -08:00
committed by GitHub
parent b4e3a3e6cc
commit 7222f349d6
3 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
explorer/interpreter/action.cpp
-7
View File
@@ -35,13 +35,6 @@ auto RuntimeScope::operator=(RuntimeScope&& rhs) noexcept -> RuntimeScope& {
return *this;
}
RuntimeScope::~RuntimeScope() {
for (auto allocation : allocations_) {
// TODO: move this into StepCleanUp
heap_->Deallocate(allocation);
}
}
void RuntimeScope::Print(llvm::raw_ostream& out) const {
out << "{";
llvm::ListSeparator sep;
explorer/interpreter/action.h
-3
View File
@@ -42,9 +42,6 @@ class RuntimeScope {
RuntimeScope(RuntimeScope&&) noexcept;
auto operator=(RuntimeScope&&) noexcept -> RuntimeScope&;
// Deallocates any allocations in this scope from `heap`.
~RuntimeScope();
void Print(llvm::raw_ostream& out) const;
LLVM_DUMP_METHOD void Dump() const { Print(llvm::errs()); }
explorer/interpreter/interpreter.cpp
+14 -9
View File
@@ -2214,16 +2214,21 @@ auto Interpreter::StepDestroy() -> ErrorOr<Success> {
auto Interpreter::StepCleanUp() -> ErrorOr<Success> {
const Action& act = todo_.CurrentAction();
const auto& cleanup = cast<CleanUpAction>(act);
if (act.pos() < cleanup.allocations_count()) {
auto allocation =
act.scope()->allocations()[cleanup.allocations_count() - act.pos() - 1];
const auto* lvalue = arena_->New<LValue>(Address(allocation));
SourceLocation source_loc("destructor", 1);
auto value = heap_.Read(lvalue->address(), source_loc);
// Step over uninitialized values
if (value.ok()) {
return todo_.Spawn(std::make_unique<DestroyAction>(lvalue, *value));
if (act.pos() < cleanup.allocations_count() * 2) {
const size_t alloc_index = cleanup.allocations_count() - act.pos() / 2 - 1;
auto allocation = act.scope()->allocations()[alloc_index];
if (act.pos() % 2 == 0) {
auto* lvalue = arena_->New<LValue>(Address(allocation));
auto value =
heap_.Read(lvalue->address(), SourceLocation("destructor", 1));
// Step over uninitialized values.
if (value.ok()) {
return todo_.Spawn(std::make_unique<DestroyAction>(lvalue, *value));
} else {
return todo_.RunAgain();
}
} else {
heap_.Deallocate(allocation);
return todo_.RunAgain();
}
}