From: mikhail.naganov@gmail.com <mikhail.naganov@gmail.com@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Thu, 15 Jul 2010 15:41:05 +0000 (+0000)
Subject: Fix TestHeapEntryIdsAndGC test. The assert was wrong.
X-Git-Tag: upstream/4.7.83~21481
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f2cf990de2c22d1c10bd03ee678df588f9b43c1e;p=platform%2Fupstream%2Fv8.git

Fix TestHeapEntryIdsAndGC test. The assert was wrong.

TBR=ager@chromium.org

Review URL: http://codereview.chromium.org/2861051

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@5082 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
---

diff --git a/src/profile-generator.cc b/src/profile-generator.cc
index 4e0cb71..9ec6b7d 100644
--- a/src/profile-generator.cc
+++ b/src/profile-generator.cc
@@ -1533,12 +1533,14 @@ uint64_t HeapObjectsMap::FindObject(Address addr) {
 
 
 void HeapObjectsMap::MoveObject(Address from, Address to) {
+  if (from == to) return;
   HashMap::Entry* entry = entries_map_.Lookup(from, AddressHash(from), false);
   if (entry != NULL) {
     void* value = entry->value;
     entries_map_.Remove(from, AddressHash(from));
     entry = entries_map_.Lookup(to, AddressHash(to), true);
-    ASSERT(entry->value == NULL);
+    // We can have an entry at the new location, it is OK, as GC can overwrite
+    // dead objects with alive objects being moved.
     entry->value = value;
   }
 }