AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Ensure that all non-stable maps created by Map::AddMissingTransitions() are marked as such.

Browse Source 
BUG=chromium:570131
LOG=N

Review URL: https://codereview.chromium.org/1546933002

Cr-Commit-Position: refs/heads/master@{#33029}
This commit is contained in:
ishell 2015-12-23 07:34:54 -08:00 committed by Commit bot
parent fc23b49498
commit 5b3fbf231c
4 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/objects-debug.cc
View File

@ -330,6 +330,8 @@ void Map::MapVerify() {
CHECK(instance_size() == kVariableSizeSentinel ||
(kPointerSize <= instance_size() &&
instance_size() < heap->Capacity()));
CHECK(GetBackPointer()->IsUndefined() ||
!Map::cast(GetBackPointer())->is_stable());
VerifyHeapPointer(prototype());
VerifyHeapPointer(instance_descriptors());
SLOW_DCHECK(instance_descriptors()->IsSortedNoDuplicates());

2
src/objects.cc
View File

@ -9311,6 +9311,7 @@ Handle<Map> Map::AddMissingTransitions(
InstallDescriptors(map, new_map, i, descriptors, full_layout_descriptor);
map = new_map;
}
map->NotifyLeafMapLayoutChange();
InstallDescriptors(map, last_map, nof_descriptors - 1, descriptors,
full_layout_descriptor);
return last_map;
@ -9427,6 +9428,7 @@ Handle<Map> Map::AsLanguageMode(Handle<Map> initial_map,
if (maybe_transition != NULL) {
return handle(maybe_transition, isolate);
}
initial_map->NotifyLeafMapLayoutChange();
// Create new map taking descriptors from the |function_map| and all
// the other details from the |initial_map|.

11
test/cctest/test-field-type-tracking.cc
View File

@ -621,6 +621,17 @@ static void TestGeneralizeRepresentation(
CHECK_EQ(expected_field_type_dependency, info.dependencies()->HasAborted());
}
{
// Check that all previous maps are not stable.
Map* tmp = *new_map;
while (true) {
Object* back = tmp->GetBackPointer();
if (back->IsUndefined()) break;
tmp = Map::cast(back);
CHECK(!tmp->is_stable());
}
}
info.dependencies()->Rollback(); // Properly cleanup compilation info.
// Update all deprecated maps and check that they are now the same.

2
test/cctest/test-unboxed-doubles.cc
View File

@ -759,12 +759,14 @@ static Handle<LayoutDescriptor> TestLayoutDescriptorAppendIfFastOrUseFull(
int descriptors_length = descriptors->number_of_descriptors();
std::vector<Handle<Map>> maps(descriptors_length);
{
CHECK(last_map->is_stable());
Map* map = *last_map;
for (int i = 0; i < descriptors_length; i++) {
maps[descriptors_length - 1 - i] = handle(map, isolate);
Object* maybe_map = map->GetBackPointer();
CHECK(maybe_map->IsMap());
map = Map::cast(maybe_map);
CHECK(!map->is_stable());
}
CHECK_EQ(1, maps[0]->NumberOfOwnDescriptors());
}