Cleanups: int -> intptr_t for "array" lengths, memory sizes.

runtime/vm/growable_array.h

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 // Defines growable array classes, that differ where they are allocated:
 // - GrowableArray: allocate on stack.
 // - ZoneGrowableArray: allocated in the zone.
 
 #ifndef VM_GROWABLE_ARRAY_H_
 #define VM_GROWABLE_ARRAY_H_
 
 #include "platform/utils.h"
 #include "vm/allocation.h"
 #include "vm/isolate.h"
 #include "vm/zone.h"
 
 namespace dart {
 
 template<typename T, typename B>
 class BaseGrowableArray : public B {
  public:
   explicit BaseGrowableArray(Zone* zone)
       : length_(0), capacity_(0), data_(NULL), zone_(zone) {
     ASSERT(zone_ != NULL);
   }
 
-  BaseGrowableArray(int initial_capacity, Zone* zone)
+  BaseGrowableArray(intptr_t initial_capacity, Zone* zone)
       : length_(0), capacity_(0), data_(NULL), zone_(zone) {
     ASSERT(zone_ != NULL);
     if (initial_capacity > 0) {
       capacity_ = Utils::RoundUpToPowerOfTwo(initial_capacity);
       data_ = zone_->Alloc<T>(capacity_);
     }
   }
 
-  int length() const { return length_; }
+  intptr_t length() const { return length_; }
   T* data() const { return data_; }
   bool is_empty() const { return length_ == 0; }
 
   void TruncateTo(intptr_t length) {
     ASSERT(length_ >= length);
     length_ = length;
   }
 
   void Add(const T& value) {
     Resize(length() + 1);
     Last() = value;
   }
 
   T& RemoveLast() {
     ASSERT(length_ > 0);
     T& result = operator[](length_ - 1);
     length_--;
     return result;
   }
 
-  T& operator[](int index) const {
+  T& operator[](intptr_t index) const {
     ASSERT(0 <= index);
     ASSERT(index < length_);
     ASSERT(length_ <= capacity_);
     return data_[index];
   }
 
   T& Last() const {
     ASSERT(length_ > 0);
     return operator[](length_ - 1);
   }
@@ skipping 13 matching lines @@
     for (intptr_t i = length_ - 2; i >= idx; i--) {
       data_[i + 1] = data_[i];
     }
     data_[idx] = value;
   }
 
   // Sort the array in place.
   inline void Sort(int compare(const T*, const T*));
 
  private:
-  int length_;
-  int capacity_;
+  intptr_t length_;
+  intptr_t capacity_;
   T* data_;
   Zone* zone_;  // Zone in which we are allocating the array.
 
-  void Resize(int new_length);
+  void Resize(intptr_t new_length);
 
   DISALLOW_COPY_AND_ASSIGN(BaseGrowableArray);
 };
 
 
 template<typename T, typename B>
 inline void BaseGrowableArray<T, B>::Sort(
     int compare(const T*, const T*)) {
   typedef int (*CompareFunction)(const void*, const void*);
   qsort(data_, length_, sizeof(T), reinterpret_cast<CompareFunction>(compare));
 }
 
 
 template<typename T, typename B>
-void BaseGrowableArray<T, B>::Resize(int new_length) {
+void BaseGrowableArray<T, B>::Resize(intptr_t new_length) {
   if (new_length > capacity_) {
-    int new_capacity = Utils::RoundUpToPowerOfTwo(new_length);
+    intptr_t new_capacity = Utils::RoundUpToPowerOfTwo(new_length);
     T* new_data = zone_->Realloc<T>(data_, capacity_, new_capacity);
     ASSERT(new_data != NULL);
     data_ = new_data;
     capacity_ = new_capacity;
   }
   length_ = new_length;
 }
 
 
 template<typename T>
 class GrowableArray : public BaseGrowableArray<T, ValueObject> {
  public:
-  explicit GrowableArray(int initial_capacity)
+  explicit GrowableArray(intptr_t initial_capacity)
       : BaseGrowableArray<T, ValueObject>(
           initial_capacity,
           Isolate::Current()->current_zone()) {}
   GrowableArray()
       : BaseGrowableArray<T, ValueObject>(
           Isolate::Current()->current_zone()) {}
 };
 
 
 template<typename T>
 class ZoneGrowableArray : public BaseGrowableArray<T, ZoneAllocated> {
  public:
-  explicit ZoneGrowableArray(int initial_capacity)
+  explicit ZoneGrowableArray(intptr_t initial_capacity)
       : BaseGrowableArray<T, ZoneAllocated>(
           initial_capacity,
           Isolate::Current()->current_zone()) {}
   ZoneGrowableArray() :
       BaseGrowableArray<T, ZoneAllocated>(
           Isolate::Current()->current_zone()) {}
 };
 
 }  // namespace dart
 
 #endif  // VM_GROWABLE_ARRAY_H_