Make Array::kHeaderSize protected, and only use kHeaderSize of its subclasses...

test/cctest/test-mark-compact.cc

 // Copyright 2006-2008 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 68 matching lines @@
   // from new space.
   FLAG_gc_global = true;
   FLAG_always_compact = true;
   Heap::ConfigureHeap(2*256*KB, 4*MB);
 
   InitializeVM();
 
   v8::HandleScope sc;
 
   // Allocate a fixed array in the new space.
-  int array_size = (Heap::MaxObjectSizeInPagedSpace() - Array::kHeaderSize) /
+  int array_size =
+      (Heap::MaxObjectSizeInPagedSpace() - FixedArray::kHeaderSize) /
       (kPointerSize * 4);
   Object* obj = Heap::AllocateFixedArray(array_size);
   CHECK(!obj->IsFailure());
 
   Handle<FixedArray> array(FixedArray::cast(obj));
 
   // Array should be in the new space.
   CHECK(Heap::InSpace(*array, NEW_SPACE));
 
   // Call the m-c collector, so array becomes an old object.
@@ skipping 11 matching lines @@
   // Test the situation that some objects in new space are promoted to
   // the old space
   InitializeVM();
 
   v8::HandleScope sc;
 
   // Do a mark compact GC to shrink the heap.
   CHECK(Heap::CollectGarbage(0, OLD_POINTER_SPACE));
 
   // Allocate a big Fixed array in the new space.
-  int size = (Heap::MaxObjectSizeInPagedSpace() - Array::kHeaderSize) /
+  int size = (Heap::MaxObjectSizeInPagedSpace() - FixedArray::kHeaderSize) /
       kPointerSize;
   Object* obj = Heap::AllocateFixedArray(size);
 
   Handle<FixedArray> array(FixedArray::cast(obj));
 
   // Array still stays in the new space.
   CHECK(Heap::InSpace(*array, NEW_SPACE));
 
   // Allocate objects in the old space until out of memory.
   FixedArray* host = *array;
@@ skipping 174 matching lines @@
     Object** g2_objects[] = { g2s1.location(), g2s2.location() };
     GlobalHandles::AddGroup(g1_objects, 2);
     GlobalHandles::AddGroup(g2_objects, 2);
   }
 
   CHECK(Heap::CollectGarbage(0, OLD_POINTER_SPACE));
 
   // All objects should be gone. 5 global handles in total.
   CHECK_EQ(5, NumberOfWeakCalls);
 }