Fixed arm/mac errors and presubmitting 2324.

src/objects-debug.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 726 matching lines @@
 
 void Proxy::ProxyPrint() {
   PrintF("proxy to %p", proxy());
 }
 
 
 void Proxy::ProxyVerify() {
   ASSERT(IsProxy());
 }
 
-
-void Dictionary::Print() {
-  int capacity = Capacity();
+template<typename Shape, typename Key>
+void Dictionary<Shape, Key>::Print() {
+  int capacity = HashTable<Shape, Key>::Capacity();
   for (int i = 0; i < capacity; i++) {
-    Object* k = KeyAt(i);
-    if (IsKey(k)) {
+    Object* k = HashTable<Shape, Key>::KeyAt(i);
+    if (HashTable<Shape, Key>::IsKey(k)) {
       PrintF(" ");
       if (k->IsString()) {
         String::cast(k)->StringPrint();
       } else {
         k->ShortPrint();
       }
       PrintF(": ");
       ValueAt(i)->ShortPrint();
       PrintF("\n");
     }
@@ skipping 247 matching lines @@
 
 
 void JSObject::IncrementSpillStatistics(SpillInformation* info) {
   info->number_of_objects_++;
   // Named properties
   if (HasFastProperties()) {
     info->number_of_objects_with_fast_properties_++;
     info->number_of_fast_used_fields_   += map()->NextFreePropertyIndex();
     info->number_of_fast_unused_fields_ += map()->unused_property_fields();
   } else {
-    Dictionary* dict = property_dictionary();
+    StringDictionary* dict = property_dictionary();
     info->number_of_slow_used_properties_ += dict->NumberOfElements();
     info->number_of_slow_unused_properties_ +=
         dict->Capacity() - dict->NumberOfElements();
   }
   // Indexed properties
   if (HasFastElements()) {
     info->number_of_objects_with_fast_elements_++;
     int holes = 0;
     FixedArray* e = FixedArray::cast(elements());
     int len = e->length();
     for (int i = 0; i < len; i++) {
       if (e->get(i) == Heap::the_hole_value()) holes++;
     }
     info->number_of_fast_used_elements_   += len - holes;
     info->number_of_fast_unused_elements_ += holes;
   } else {
-    Dictionary* dict = element_dictionary();
+    NumberDictionary* dict = element_dictionary();
     info->number_of_slow_used_elements_ += dict->NumberOfElements();
     info->number_of_slow_unused_elements_ +=
         dict->Capacity() - dict->NumberOfElements();
   }
 }
 
 
 void JSObject::SpillInformation::Clear() {
   number_of_objects_ = 0;
   number_of_objects_with_fast_properties_ = 0;
@@ skipping 61 matching lines @@
     }
     current = hash;
   }
   return true;
 }
 
 
 #endif  // DEBUG
 
 } }  // namespace v8::internal