| OLD | NEW |
| 1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 the V8 project authors. All rights reserved. |
| 2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
| 3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
| 4 // met: | 4 // met: |
| 5 // | 5 // |
| 6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
| 7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
| 8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
| 9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
| 10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
| (...skipping 2726 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2737 void DescriptorArray::SwapSortedKeys(int first, int second) { | 2737 void DescriptorArray::SwapSortedKeys(int first, int second) { |
| 2738 int first_key = GetSortedKeyIndex(first); | 2738 int first_key = GetSortedKeyIndex(first); |
| 2739 SetSortedKey(first, GetSortedKeyIndex(second)); | 2739 SetSortedKey(first, GetSortedKeyIndex(second)); |
| 2740 SetSortedKey(second, first_key); | 2740 SetSortedKey(second, first_key); |
| 2741 } | 2741 } |
| 2742 | 2742 |
| 2743 | 2743 |
| 2744 DescriptorArray::WhitenessWitness::WhitenessWitness(FixedArray* array) | 2744 DescriptorArray::WhitenessWitness::WhitenessWitness(FixedArray* array) |
| 2745 : marking_(array->GetHeap()->incremental_marking()) { | 2745 : marking_(array->GetHeap()->incremental_marking()) { |
| 2746 marking_->EnterNoMarkingScope(); | 2746 marking_->EnterNoMarkingScope(); |
| 2747 ASSERT(Marking::Color(array) == Marking::WHITE_OBJECT); | 2747 ASSERT(!marking_->IsMarking() || |
| 2748 Marking::Color(array) == Marking::WHITE_OBJECT); |
| 2748 } | 2749 } |
| 2749 | 2750 |
| 2750 | 2751 |
| 2751 DescriptorArray::WhitenessWitness::~WhitenessWitness() { | 2752 DescriptorArray::WhitenessWitness::~WhitenessWitness() { |
| 2752 marking_->LeaveNoMarkingScope(); | 2753 marking_->LeaveNoMarkingScope(); |
| 2753 } | 2754 } |
| 2754 | 2755 |
| 2755 | 2756 |
| 2756 template<typename Shape, typename Key> | 2757 template<typename Shape, typename Key> |
| 2757 int HashTable<Shape, Key>::ComputeCapacity(int at_least_space_for) { | 2758 int HashTable<Shape, Key>::ComputeCapacity(int at_least_space_for) { |
| (...skipping 4006 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6764 #undef READ_UINT32_FIELD | 6765 #undef READ_UINT32_FIELD |
| 6765 #undef WRITE_UINT32_FIELD | 6766 #undef WRITE_UINT32_FIELD |
| 6766 #undef READ_SHORT_FIELD | 6767 #undef READ_SHORT_FIELD |
| 6767 #undef WRITE_SHORT_FIELD | 6768 #undef WRITE_SHORT_FIELD |
| 6768 #undef READ_BYTE_FIELD | 6769 #undef READ_BYTE_FIELD |
| 6769 #undef WRITE_BYTE_FIELD | 6770 #undef WRITE_BYTE_FIELD |
| 6770 | 6771 |
| 6771 } } // namespace v8::internal | 6772 } } // namespace v8::internal |
| 6772 | 6773 |
| 6773 #endif // V8_OBJECTS_INL_H_ | 6774 #endif // V8_OBJECTS_INL_H_ |
| OLD | NEW |