Merged r16529, r16742 into trunk branch.

src/objects-debug.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 672 matching lines @@
 void JSArray::JSArrayVerify() {
   JSObjectVerify();
   CHECK(length()->IsNumber() || length()->IsUndefined());
   // TODO(hpayer): deal gracefully with partially constructed JSObjects, when
   // allocation folding is turned off.
   if (reinterpret_cast<Map*>(elements()) !=
       GetHeap()->one_pointer_filler_map()) {
     CHECK(elements()->IsUndefined() ||
           elements()->IsFixedArray() ||
           elements()->IsFixedDoubleArray());
-    // TODO(mvstanton): to diagnose chromium bug 284577, remove after.
-    AllocationMemento* memento = AllocationMemento::FindForJSObject(this);
-    if (memento != NULL && memento->IsValid()) {
-      memento->AllocationMementoVerify();
-    }
   }
 }
 
 
 void JSSet::JSSetVerify() {
   CHECK(IsJSSet());
   JSObjectVerify();
   VerifyHeapPointer(table());
   CHECK(table()->IsHashTable() || table()->IsUndefined());
 }
@@ skipping 479 matching lines @@
   for (int i = 0; i < number_of_transitions(); ++i) {
     if (!CheckOneBackPointer(current_map, GetTarget(i))) return false;
   }
   return true;
 }
 
 
 #endif  // DEBUG
 
 } }  // namespace v8::internal