Add support for extended constant pool arrays.

src/arm/assembler-arm.cc

Index: src/arm/assembler-arm.cc
diff --git a/src/arm/assembler-arm.cc b/src/arm/assembler-arm.cc
index 46712d5e17db36548e05fb87fa1fc6741e0b8aab..82df653be479e4bdfe6fbc842ac3ee8ee1f6fa14 100644
--- a/src/arm/assembler-arm.cc
+++ b/src/arm/assembler-arm.cc
@@ -3587,10 +3587,15 @@ Handle<ConstantPoolArray> ConstantPoolBuilder::New(Isolate* isolate) {
 
 void ConstantPoolBuilder::Populate(Assembler* assm,
                                    ConstantPoolArray* constant_pool) {
-  ASSERT(constant_pool->count_of_int64_entries() == count_of_64bit_);
-  ASSERT(constant_pool->count_of_code_ptr_entries() == count_of_code_ptr_);
-  ASSERT(constant_pool->count_of_heap_ptr_entries() == count_of_heap_ptr_);
-  ASSERT(constant_pool->count_of_int32_entries() == count_of_32bit_);
+  ConstantPoolArray::LayoutSection section = ConstantPoolArray::SMALL_SECTION;
+  ASSERT(count_of_64bit_ ==
+      constant_pool->number_of_entries(ConstantPoolArray::INT64, section));
+  ASSERT(count_of_code_ptr_ ==
+      constant_pool->number_of_entries(ConstantPoolArray::CODE_PTR, section));
+  ASSERT(count_of_heap_ptr_ ==
+      constant_pool->number_of_entries(ConstantPoolArray::HEAP_PTR, section));
+  ASSERT(count_of_32bit_ ==
+      constant_pool->number_of_entries(ConstantPoolArray::INT32, section));
   ASSERT(entries_.size() == merged_indexes_.size());
 
   int index_64bit = 0;
@@ -3616,7 +3621,7 @@ void ConstantPoolBuilder::Populate(Assembler* assm,
         offset = constant_pool->OffsetOfElementAt(index_code_ptr) -
             kHeapObjectTag;
         constant_pool->set(index_code_ptr++,
-                           reinterpret_cast<Object *>(rinfo->data()));
+                           reinterpret_cast<Address>(rinfo->data()));
       } else {
         ASSERT(IsHeapPtrEntry(rmode));
         offset = constant_pool->OffsetOfElementAt(index_heap_ptr) -