- WeakProperty keys in other generations are black. Avoid trying to

vm/scavenger.cc

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/scavenger.h"
 
 #include <algorithm>
 #include <map>
 #include <utility>
 
@@ skipping 481 matching lines @@
     }
     visitor->VisitingOldPointers(false);
   }
 }
 
 
 uword Scavenger::ProcessWeakProperty(RawWeakProperty* raw_weak,
                                      ScavengerVisitor* visitor) {
   // The fate of the weak property is determined by its key.
   RawObject* raw_key = raw_weak->ptr()->key_;
-  uword raw_addr = RawObject::ToAddr(raw_key);
-  uword header = *reinterpret_cast<uword*>(raw_addr);
-  if (!IsForwarding(header)) {
-    // Key is white.  Delay the weak property.
-    visitor->DelayWeakProperty(raw_weak);
-    return raw_weak->Size();
-  } else {
-    // Key is gray or black.  Make the weak property black.
-    return raw_weak->VisitPointers(visitor);
+  if (raw_key->IsHeapObject() && raw_key->IsNewObject()) {
+    uword raw_addr = RawObject::ToAddr(raw_key);
+    uword header = *reinterpret_cast<uword*>(raw_addr);
+    if (!IsForwarding(header)) {
+      // Key is white.  Delay the weak property.
+      visitor->DelayWeakProperty(raw_weak);
+      return raw_weak->Size();
+    }
   }
+  // Key is gray or black.  Make the weak property black.
+  return raw_weak->VisitPointers(visitor);
 }
 
 
 void Scavenger::ProcessPeerReferents() {
   PeerTable prev;
   std::swap(prev, peer_table_);
   for (PeerTable::iterator it = prev.begin(); it != prev.end(); ++it) {
     RawObject* raw_obj = it->first;
     ASSERT(raw_obj->IsHeapObject());
     uword raw_addr = RawObject::ToAddr(raw_obj);
@@ skipping 103 matching lines @@
   PeerTable::iterator it = peer_table_.find(raw_obj);
   return (it == peer_table_.end()) ? NULL : it->second;
 }
 
 
 int64_t Scavenger::PeerCount() const {
   return static_cast<int64_t>(peer_table_.size());
 }
 
 }  // namespace dart