Relax verification of JSFunction result caches.

src/objects-debug.cc

 // Copyright 2010 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 645 matching lines @@
     }
     current = hash;
   }
   return true;
 }
 
 
 void JSFunctionResultCache::JSFunctionResultCacheVerify() {
   JSFunction::cast(get(kFactoryIndex))->Verify();
 
   int size = Smi::cast(get(kCacheSizeIndex))->value();

[Vitaly Repeshko, 2011/01/14 21:22:27]

Probably needs USE(size) now.

   ASSERT(kEntriesIndex <= size);
   ASSERT(size <= length());
   ASSERT_EQ(0, size % kEntrySize);
 
   int finger = Smi::cast(get(kFingerIndex))->value();
   ASSERT(kEntriesIndex <= finger);
   ASSERT(finger < size || finger == kEntriesIndex);
   ASSERT_EQ(0, finger % kEntrySize);
 
   if (FLAG_enable_slow_asserts) {
-    for (int i = kEntriesIndex; i < size; i++) {
-      ASSERT(!get(i)->IsTheHole());
+    STATIC_ASSERT(2 == kEntrySize);
+    for (int i = kEntriesIndex; i < length(); i += kEntrySize) {
       get(i)->Verify();
-    }
-    for (int i = size; i < length(); i++) {
-      ASSERT(get(i)->IsTheHole());
-      get(i)->Verify();
+      get(i + 1)->Verify();
+      // Key and value must be either both the holes, or not.
+      ASSERT(get(i)->IsTheHole() == get(i + 1)->IsTheHole());
     }
   }
 }
 
 
 void NormalizedMapCache::NormalizedMapCacheVerify() {
   FixedArray::cast(this)->Verify();
   if (FLAG_enable_slow_asserts) {
     for (int i = 0; i < length(); i++) {
       Object* e = get(i);
       if (e->IsMap()) {
         Map::cast(e)->SharedMapVerify();
       } else {
         ASSERT(e->IsUndefined());
       }
     }
   }
 }
 
 
 #endif  // DEBUG
 
 } }  // namespace v8::internal