diff options
Diffstat (limited to 'deps/v8/src/objects/layout-descriptor.cc')
| -rw-r--r-- | deps/v8/src/objects/layout-descriptor.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/deps/v8/src/objects/layout-descriptor.cc b/deps/v8/src/objects/layout-descriptor.cc index 2b588a58bf..034680e297 100644 --- a/deps/v8/src/objects/layout-descriptor.cc +++ b/deps/v8/src/objects/layout-descriptor.cc @@ -65,7 +65,7 @@ Handle<LayoutDescriptor> LayoutDescriptor::AppendIfFastOrUseFull( Isolate* isolate, Handle<Map> map, PropertyDetails details, Handle<LayoutDescriptor> full_layout_descriptor) { DisallowHeapAllocation no_allocation; - LayoutDescriptor layout_descriptor = map->layout_descriptor(); + LayoutDescriptor layout_descriptor = map->layout_descriptor(kAcquireLoad); if (layout_descriptor.IsSlowLayout()) { return full_layout_descriptor; } @@ -164,8 +164,8 @@ bool LayoutDescriptor::IsTagged(int field_index, int max_sequence_length, } } } else { // Fast layout. - sequence_length = Min(base::bits::CountTrailingZeros(value), - static_cast<unsigned>(kBitsInSmiLayout)) - + sequence_length = std::min(base::bits::CountTrailingZeros(value), + static_cast<unsigned>(kBitsInSmiLayout)) - layout_bit_index; if (is_tagged && (field_index + sequence_length == capacity())) { // The contiguous sequence of tagged fields lasts till the end of the @@ -174,7 +174,7 @@ bool LayoutDescriptor::IsTagged(int field_index, int max_sequence_length, sequence_length = std::numeric_limits<int>::max(); } } - *out_sequence_length = Min(sequence_length, max_sequence_length); + *out_sequence_length = std::min(sequence_length, max_sequence_length); return is_tagged; } @@ -200,7 +200,7 @@ bool LayoutDescriptorHelper::IsTagged( return true; } int max_sequence_length = (end_offset - offset_in_bytes) / kTaggedSize; - int field_index = Max(0, (offset_in_bytes - header_size_) / kTaggedSize); + int field_index = std::max(0, (offset_in_bytes - header_size_) / kTaggedSize); int sequence_length; bool tagged = layout_descriptor_.IsTagged(field_index, max_sequence_length, &sequence_length); @@ -257,7 +257,7 @@ LayoutDescriptor LayoutDescriptor::Trim(Heap* heap, Map map, bool LayoutDescriptor::IsConsistentWithMap(Map map, bool check_tail) { if (FLAG_unbox_double_fields) { - DescriptorArray descriptors = map.instance_descriptors(); + DescriptorArray descriptors = map.instance_descriptors(kRelaxedLoad); int last_field_index = 0; for (InternalIndex i : map.IterateOwnDescriptors()) { PropertyDetails details = descriptors.GetDetails(i); @@ -271,8 +271,8 @@ bool LayoutDescriptor::IsConsistentWithMap(Map map, bool check_tail) { if (tagged_actual != tagged_expected) return false; } last_field_index = - Max(last_field_index, - details.field_index() + details.field_width_in_words()); + std::max(last_field_index, + details.field_index() + details.field_width_in_words()); } if (check_tail) { int n = capacity(); |