[Isolates] Merge r 6300:6500 from bleeding_edge to isolates.

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 653 matching lines @@
 void JSFunctionResultCache::JSFunctionResultCacheVerify() {
   JSFunction::cast(get(kFactoryIndex))->Verify();
 
   int size = Smi::cast(get(kCacheSizeIndex))->value();
   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((finger < size) || (finger == kEntriesIndex && finger == size));
   ASSERT_EQ(0, finger % kEntrySize);
 
   if (FLAG_enable_slow_asserts) {
     for (int i = kEntriesIndex; i < size; i++) {
       ASSERT(!get(i)->IsTheHole());
       get(i)->Verify();
     }
     for (int i = size; i < length(); i++) {
       ASSERT(get(i)->IsTheHole());
       get(i)->Verify();
@@ skipping 13 matching lines @@
         ASSERT(e->IsUndefined());
       }
     }
   }
 }
 
 
 #endif  // DEBUG
 
 } }  // namespace v8::internal