| 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 2056 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2067 // and switches to a different marking system. JS interrupts interfere | 2067 // and switches to a different marking system. JS interrupts interfere |
| 2068 // with the C stack limit check. | 2068 // with the C stack limit check. |
| 2069 PostponeInterruptsScope postpone(isolate()); | 2069 PostponeInterruptsScope postpone(isolate()); |
| 2070 | 2070 |
| 2071 bool incremental_marking_overflowed = false; | 2071 bool incremental_marking_overflowed = false; |
| 2072 IncrementalMarking* incremental_marking = heap_->incremental_marking(); | 2072 IncrementalMarking* incremental_marking = heap_->incremental_marking(); |
| 2073 if (was_marked_incrementally_) { | 2073 if (was_marked_incrementally_) { |
| 2074 // Finalize the incremental marking and check whether we had an overflow. | 2074 // Finalize the incremental marking and check whether we had an overflow. |
| 2075 // Both markers use grey color to mark overflowed objects so | 2075 // Both markers use grey color to mark overflowed objects so |
| 2076 // non-incremental marker can deal with them as if overflow | 2076 // non-incremental marker can deal with them as if overflow |
| 2077 // occured during normal marking. | 2077 // occurred during normal marking. |
| 2078 // But incremental marker uses a separate marking deque | 2078 // But incremental marker uses a separate marking deque |
| 2079 // so we have to explicitly copy its overflow state. | 2079 // so we have to explicitly copy its overflow state. |
| 2080 incremental_marking->Finalize(); | 2080 incremental_marking->Finalize(); |
| 2081 incremental_marking_overflowed = | 2081 incremental_marking_overflowed = |
| 2082 incremental_marking->marking_deque()->overflowed(); | 2082 incremental_marking->marking_deque()->overflowed(); |
| 2083 incremental_marking->marking_deque()->ClearOverflowed(); | 2083 incremental_marking->marking_deque()->ClearOverflowed(); |
| 2084 } else { | 2084 } else { |
| 2085 // Abort any pending incremental activities e.g. incremental sweeping. | 2085 // Abort any pending incremental activities e.g. incremental sweeping. |
| 2086 incremental_marking->Abort(); | 2086 incremental_marking->Abort(); |
| 2087 } | 2087 } |
| (...skipping 2045 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4133 while (buffer != NULL) { | 4133 while (buffer != NULL) { |
| 4134 SlotsBuffer* next_buffer = buffer->next(); | 4134 SlotsBuffer* next_buffer = buffer->next(); |
| 4135 DeallocateBuffer(buffer); | 4135 DeallocateBuffer(buffer); |
| 4136 buffer = next_buffer; | 4136 buffer = next_buffer; |
| 4137 } | 4137 } |
| 4138 *buffer_address = NULL; | 4138 *buffer_address = NULL; |
| 4139 } | 4139 } |
| 4140 | 4140 |
| 4141 | 4141 |
| 4142 } } // namespace v8::internal | 4142 } } // namespace v8::internal |
| OLD | NEW |