Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(125)

Side by Side Diff: runtime/vm/scavenger.cc

Issue 9398014: Ignore deleted handles when processing weak roots. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« runtime/vm/gc_marker.cc ('K') | « runtime/vm/gc_marker.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #include "vm/scavenger.h" 5 #include "vm/scavenger.h"
6 6
7 #include "vm/dart.h" 7 #include "vm/dart.h"
8 #include "vm/dart_api_state.h" 8 #include "vm/dart_api_state.h"
9 #include "vm/isolate.h" 9 #include "vm/isolate.h"
10 #include "vm/object.h" 10 #include "vm/object.h"
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 133
134 class ScavengerWeakVisitor : public HandleVisitor { 134 class ScavengerWeakVisitor : public HandleVisitor {
135 public: 135 public:
136 explicit ScavengerWeakVisitor(Scavenger* scavenger) : scavenger_(scavenger) { 136 explicit ScavengerWeakVisitor(Scavenger* scavenger) : scavenger_(scavenger) {
137 } 137 }
138 138
139 void VisitHandle(uword addr) { 139 void VisitHandle(uword addr) {
140 WeakPersistentHandle* handle = 140 WeakPersistentHandle* handle =
141 reinterpret_cast<WeakPersistentHandle*>(addr); 141 reinterpret_cast<WeakPersistentHandle*>(addr);
142 RawObject* raw_obj = handle->raw(); 142 RawObject* raw_obj = handle->raw();
143 if (!raw_obj->IsHeapObject()) {
144 // Deleted handles are identified by a Smi as the raw object value.
145 return;
146 }
143 uword raw_addr = RawObject::ToAddr(raw_obj); 147 uword raw_addr = RawObject::ToAddr(raw_obj);
144 if (scavenger_->from_->Contains(raw_addr)) { 148 if (scavenger_->from_->Contains(raw_addr)) {
145 uword header = *reinterpret_cast<uword*>(raw_addr); 149 uword header = *reinterpret_cast<uword*>(raw_addr);
146 if (IsForwarding(header)) { 150 if (IsForwarding(header)) {
147 handle->set_raw(RawObject::FromAddr(ForwardedAddr(header))); 151 handle->set_raw(RawObject::FromAddr(ForwardedAddr(header)));
148 } else { 152 } else {
149 WeakPersistentHandle::Finalize(handle); 153 WeakPersistentHandle::Finalize(handle);
150 } 154 }
151 } 155 }
152 } 156 }
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 OS::PrintErr(" done.\n"); 301 OS::PrintErr(" done.\n");
298 } 302 }
299 303
300 count_++; 304 count_++;
301 // Done scavenging. Reset the marker. 305 // Done scavenging. Reset the marker.
302 ASSERT(scavenging_); 306 ASSERT(scavenging_);
303 scavenging_ = false; 307 scavenging_ = false;
304 } 308 }
305 309
306 } // namespace dart 310 } // namespace dart
OLDNEW
« runtime/vm/gc_marker.cc ('K') | « runtime/vm/gc_marker.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698