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

Avoid adjusting live bytes in JSObject::MigrateFastToFast() if the size delta is zero.

Browse Source 
BUG=chromium:388880
LOG=N
R=hpayer@chromium.org

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

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22031 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
ishell@chromium.org 2014-06-26 08:34:34 +00:00
parent 2c45989333
commit 37651f4f01
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/objects.cc
View File

@ -2248,12 +2248,6 @@ void JSObject::MigrateFastToFast(Handle<JSObject> object, Handle<Map> new_map) {
object->FastPropertyAtPut(index, array->get(external + i));
}
// Create filler object past the new instance size.
int new_instance_size = new_map->instance_size();
int instance_size_delta = old_map->instance_size() - new_instance_size;
ASSERT(instance_size_delta >= 0);
Address address = object->address() + new_instance_size;
Heap* heap = isolate->heap();
// If there are properties in the new backing store, trim it to the correct
@ -2263,8 +2257,17 @@ void JSObject::MigrateFastToFast(Handle<JSObject> object, Handle<Map> new_map) {
object->set_properties(*array);
}
heap->CreateFillerObjectAt(address, instance_size_delta);
heap->AdjustLiveBytes(address, -instance_size_delta, Heap::FROM_MUTATOR);
// Create filler object past the new instance size.
int new_instance_size = new_map->instance_size();
int instance_size_delta = old_map->instance_size() - new_instance_size;
ASSERT(instance_size_delta >= 0);
if (instance_size_delta > 0) {
Address address = object->address();
heap->CreateFillerObjectAt(
address + new_instance_size, instance_size_delta);
heap->AdjustLiveBytes(address, -instance_size_delta, Heap::FROM_MUTATOR);
}
// We are storing the new map using release store after creating a filler for
// the left-over space to avoid races with the sweeper thread.