Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

Commit

Permalink
Put more information to the stack when crbug/454297 happens.
Browse files Browse the repository at this point in the history
Review URL: https://codereview.chromium.org/941693002

Cr-Commit-Position: refs/heads/master@{#26757}
  • Loading branch information
isheludko authored and Commit bot committed Feb 19, 2015
1 parent 2bf2d4d commit e011092
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions src/heap/mark-compact.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2827,10 +2827,14 @@ class PointersUpdatingVisitor : public ObjectVisitor {
// TODO(ishell): remove, once crbug/454297 is caught.
void PointersUpdatingVisitor::CheckLayoutDescriptorAndDie(Heap* heap,
Object** slot) {
const int kDataBufferSize = 1280;
const int kDataBufferSize = 128;
uintptr_t data[kDataBufferSize] = {0};
int index = 0;
data[index++] = 0x10aaaaaaaaUL; // begin marker

data[index++] = reinterpret_cast<uintptr_t>(slot);
data[index++] = 0x15aaaaaaaaUL;

Address slot_address = reinterpret_cast<Address>(slot);

uintptr_t space_owner_id = 0xb001;
Expand Down Expand Up @@ -2862,7 +2866,7 @@ void PointersUpdatingVisitor::CheckLayoutDescriptorAndDie(Heap* heap,
Object** map_slot = slot;
bool found = false;
const int kMaxDistanceToMap = 64;
for (int i = 0; i < kMaxDistanceToMap; i++, map_slot -= kPointerSize) {
for (int i = 0; i < kMaxDistanceToMap; i++, map_slot--) {
Address map_address = reinterpret_cast<Address>(*map_slot);
if (heap->map_space()->ContainsSafe(map_address)) {
found = true;
Expand All @@ -2871,6 +2875,9 @@ void PointersUpdatingVisitor::CheckLayoutDescriptorAndDie(Heap* heap,
}
data[index++] = found;
data[index++] = 0x30aaaaaaaaUL;
data[index++] = reinterpret_cast<uintptr_t>(map_slot);
data[index++] = 0x35aaaaaaaaUL;

if (found) {
Address obj_address = reinterpret_cast<Address>(map_slot);
Address end_of_page =
Expand Down

0 comments on commit e011092

Please sign in to comment.