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

Extending map verification to also verify LastAdded/DescriptorArray consistency.

Browse Source 
Removed ASSERT now subsumed by extended map verification.

Review URL: https://chromiumcodereview.appspot.com/10827037

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@12204 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
verwaest@chromium.org 2012-07-26 14:55:22 +00:00
parent 3eb1df6580
commit bcc175ad43
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/heap.cc
View File

@ -4159,8 +4159,6 @@ MaybeObject* Heap::AllocateGlobalObject(JSFunction* constructor) {
MaybeObject* maybe_map = map->CopyDropDescriptors(); MaybeObject* maybe_map = map->CopyDropDescriptors();
if (!maybe_map->To(&new_map)) return maybe_map; if (!maybe_map->To(&new_map)) return maybe_map;
ASSERT(new_map->LastAdded() == Map::kNoneAdded);
// Set up the global object as a normalized object. // Set up the global object as a normalized object.
global->set_map(new_map); global->set_map(new_map);
global->set_properties(dictionary); global->set_properties(dictionary);

6
src/objects-debug.cc
View File

@ -302,6 +302,12 @@ void Map::MapVerify() {
instance_size() < HEAP->Capacity())); instance_size() < HEAP->Capacity()));
VerifyHeapPointer(prototype()); VerifyHeapPointer(prototype());
VerifyHeapPointer(instance_descriptors()); VerifyHeapPointer(instance_descriptors());
if (instance_descriptors()->number_of_descriptors() == 0) {
ASSERT(LastAdded() == kNoneAdded);
} else {
ASSERT(instance_descriptors()->GetDetails(LastAdded()).index() ==
instance_descriptors()->number_of_descriptors());
}
SLOW_ASSERT(instance_descriptors()->IsSortedNoDuplicates()); SLOW_ASSERT(instance_descriptors()->IsSortedNoDuplicates());
if (HasTransitionArray()) { if (HasTransitionArray()) {
SLOW_ASSERT(transitions()->IsSortedNoDuplicates()); SLOW_ASSERT(transitions()->IsSortedNoDuplicates());

2
src/objects.cc
View File

@ -4872,7 +4872,7 @@ MaybeObject* Map::CopyReplaceDescriptors(DescriptorArray* descriptors,
if (!maybe_result->To(&result)) return maybe_result; if (!maybe_result->To(&result)) return maybe_result;
if (last_added == kNoneAdded) { if (last_added == kNoneAdded) {
ASSERT(descriptors->IsEmpty()); ASSERT(descriptors->number_of_descriptors() == 0);
} else { } else {
ASSERT(descriptors->GetDetails(last_added).index() == ASSERT(descriptors->GetDetails(last_added).index() ==
descriptors->number_of_descriptors()); descriptors->number_of_descriptors());