Skip to content

Commit

Permalink
Revert "[vm, compiler] Unwind record alignment."
Browse files Browse the repository at this point in the history
This reverts commit b91dcdf.

Reason for revert: Broke g3 Windows cross compilation.
`unwinding_records_win.cc: 80: error: Failed to add growable function table: 0xc0000095`
https://ci.chromium.org/ui/p/dart/builders/ci.sandbox/google/42584/overview

Original change's description:
> [vm, compiler] Unwind record alignment.
>
> TEST=vm/dart/in_memory_elf_test
> Bug: #54206
> Change-Id: I3a0e15ee3f3b98602cd2cf8921f0334539e64a17
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/339225
> Reviewed-by: Alexander Aprelev <[email protected]>
> Commit-Queue: Ryan Macnak <[email protected]>

Bug: #54206
Change-Id: I8b57862f53af254040d0425e78abab0e608e33e7
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/339942
Reviewed-by: Martin Kustermann <[email protected]>
Commit-Queue: Daco Harkes <[email protected]>
Bot-Commit: Rubber Stamper <[email protected]>
Reviewed-by: Ivan Inozemtsev <[email protected]>
  • Loading branch information
dcharkes authored and Commit Queue committed Dec 5, 2023
1 parent f8ac221 commit 7abab94
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions runtime/bin/elf_loader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,12 @@ class MemoryMappable : public Mappable {
auto* memory = VirtualMemory::Allocate(
map_size, type == File::kReadExecute, "dart-compiled-image");
if (memory == nullptr) return nullptr;
result = new MappedMemory(memory->address(), length);
result = new MappedMemory(memory->address(), memory->size());
memory->release();
delete memory;
} else {
result = new MappedMemory(start, length, /*should_unmap=*/false);
result = new MappedMemory(start, map_size,
/*should_unmap=*/false);
}

size_t remainder = 0;
Expand Down

0 comments on commit 7abab94

Please sign in to comment.