Chromium Code Reviews| Index: src/heap/mark-compact.cc |
| diff --git a/src/heap/mark-compact.cc b/src/heap/mark-compact.cc |
| index f387c990f2f27ff03655dae93c319b23e01ec140..5644f662aa2b208fbc126cbaa6226c2f4171166f 100644 |
| --- a/src/heap/mark-compact.cc |
| +++ b/src/heap/mark-compact.cc |
| @@ -3210,7 +3210,6 @@ bool MarkCompactCollector::IsSlotInLiveObject(Address slot) { |
| return false; |
| } |
| -#if V8_DOUBLE_FIELDS_UNBOXING |
| // |object| is NULL only when the slot belongs to large object space. |
| DCHECK(object != NULL || |
| Page::FromAnyPointerAddress(heap_, slot)->owner() == |
| @@ -3218,15 +3217,30 @@ bool MarkCompactCollector::IsSlotInLiveObject(Address slot) { |
| // We don't need to check large objects' layout descriptor since it can't |
| // contain in-object fields anyway. |
| if (object != NULL) { |
| - // Filter out slots that happens to point to unboxed double fields. |
| - LayoutDescriptorHelper helper(object->map()); |
| - bool has_only_tagged_fields = helper.all_fields_tagged(); |
| - if (!has_only_tagged_fields && |
| - !helper.IsTagged(static_cast<int>(slot - object->address()))) { |
| - return false; |
| + InstanceType type = object->map()->instance_type(); |
| + // Slots in maps and code can't be invalid because they are never shrunk. |
| + if (type == MAP_TYPE || type == CODE_TYPE) return true; |
| + if (type == CONSTANT_POOL_ARRAY_TYPE) { |
| + if (FLAG_enable_ool_constant_pool) { |
| + // TODO(ishell): implement constant pool support if we ever enable it. |
| + UNIMPLEMENTED(); |
| + } else { |
| + // This is left here just to make constant pool unit tests work. |
| + return true; |
| + } |
| + } |
| + // Consider slots in objects that contain ONLY raw data as invalid. |
| + if (object->MayContainRawValues()) return false; |
| + if (FLAG_unbox_double_fields) { |
| + // Filter out slots that happens to point to unboxed double fields. |
|
Hannes Payer (out of office)
2015/04/28 06:31:36
happen
|
| + LayoutDescriptorHelper helper(object->map()); |
| + bool has_only_tagged_fields = helper.all_fields_tagged(); |
| + if (!has_only_tagged_fields && |
| + !helper.IsTagged(static_cast<int>(slot - object->address()))) { |
| + return false; |
| + } |
| } |
| } |
| -#endif |
| return true; |
| } |