| Index: src/objects-inl.h
|
| diff --git a/src/objects-inl.h b/src/objects-inl.h
|
| index 937cddfe3129d5df4b9eb0ae1deb4730b3c89449..6a50bcbe1de4815ff7364c6f75d2c0941fbe5dfb 100644
|
| --- a/src/objects-inl.h
|
| +++ b/src/objects-inl.h
|
| @@ -3037,20 +3037,12 @@ void DescriptorArray::Get(int descriptor_number, Descriptor* desc) {
|
| }
|
|
|
|
|
| -void DescriptorArray::Set(int descriptor_number,
|
| - Descriptor* desc,
|
| - const WhitenessWitness&) {
|
| +void DescriptorArray::SetDescriptor(int descriptor_number, Descriptor* desc) {
|
| // Range check.
|
| DCHECK(descriptor_number < number_of_descriptors());
|
| -
|
| - NoIncrementalWriteBarrierSet(this,
|
| - ToKeyIndex(descriptor_number),
|
| - *desc->GetKey());
|
| - NoIncrementalWriteBarrierSet(this,
|
| - ToValueIndex(descriptor_number),
|
| - *desc->GetValue());
|
| - NoIncrementalWriteBarrierSet(this, ToDetailsIndex(descriptor_number),
|
| - desc->GetDetails().AsSmi());
|
| + set(ToKeyIndex(descriptor_number), *desc->GetKey());
|
| + set(ToValueIndex(descriptor_number), *desc->GetValue());
|
| + set(ToDetailsIndex(descriptor_number), desc->GetDetails().AsSmi());
|
| }
|
|
|
|
|
| @@ -3091,19 +3083,6 @@ void DescriptorArray::SwapSortedKeys(int first, int second) {
|
| }
|
|
|
|
|
| -DescriptorArray::WhitenessWitness::WhitenessWitness(DescriptorArray* array)
|
| - : marking_(array->GetHeap()->incremental_marking()) {
|
| - marking_->EnterNoMarkingScope();
|
| - DCHECK(!marking_->IsMarking() ||
|
| - Marking::Color(array) == Marking::WHITE_OBJECT);
|
| -}
|
| -
|
| -
|
| -DescriptorArray::WhitenessWitness::~WhitenessWitness() {
|
| - marking_->LeaveNoMarkingScope();
|
| -}
|
| -
|
| -
|
| PropertyType DescriptorArray::Entry::type() { return descs_->GetType(index_); }
|
|
|
|
|
|
|