Declare the index as an intptr_t when the count is also an intptr_t.

runtime/vm/raw_object_snapshot.cc

 // Copyright (c) 2011, 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.
 
 #include "vm/bigint_operations.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/snapshot.h"
 #include "vm/visitor.h"
 
@@ skipping 295 matching lines @@
                                   bool classes_serialized) {
   ASSERT(reader != NULL);
 
   // Read the length so that we can determine instance size to allocate.
   RawSmi* smi_len = GetSmi(reader->Read<intptr_t>());
   intptr_t len = Smi::Value(smi_len);
 
   TypeArray& type_array = TypeArray::Handle(TypeArray::New(len));
   reader->AddBackwardReference(object_id, &type_array);
   Type& type = Type::Handle();
-  for (int i = 0; i < len; i++) {
+  for (intptr_t i = 0; i < len; i++) {
     type ^= reader->ReadObject();
     type_array.SetTypeAt(i, type);
   }
   return type_array.raw();
 }
 
 
 void RawTypeArray::WriteTo(SnapshotWriter* writer,
                            intptr_t object_id,
                            bool serialize_classes) {
   ASSERT(writer != NULL);
 
   // Write out the serialization header value for this object.
   writer->WriteObjectHeader(kInlined, object_id);
 
   // Write out the class information.
   writer->WriteObjectHeader(kObjectId, Object::kTypeArrayClass);
 
   // Write out the length field.
   writer->Write<RawObject*>(ptr()->length_);
 
   // Write out the individual types.
   intptr_t len = Smi::Value(ptr()->length_);
-  for (int i = 0; i < len; i++) {
+  for (intptr_t i = 0; i < len; i++) {
     writer->WriteObject(ptr()->types_[i]);
   }
 }
 
 
 RawInstantiatedTypeArguments* InstantiatedTypeArguments::ReadFrom(
     SnapshotReader* reader,
     intptr_t object_id,
     bool classes_serialized) {
   ASSERT(reader != NULL);
@@ skipping 149 matching lines @@
   // Read the length so that we can determine number of tokens to read.
   RawSmi* smi_len = GetSmi(reader->Read<intptr_t>());
   intptr_t len = Smi::Value(smi_len);
 
   // Create the token stream object.
   TokenStream& token_stream = TokenStream::ZoneHandle(TokenStream::New(len));
   reader->AddBackwardReference(object_id, &token_stream);
 
   // Read the token stream into the TokenStream.
   String& literal = String::Handle();
-  for (int i = 0; i < len; i++) {
+  for (intptr_t i = 0; i < len; i++) {
     Token::Kind kind = static_cast<Token::Kind>(
         Smi::Value(GetSmi(reader->Read<intptr_t>())));
     literal ^= reader->ReadObject();
     token_stream.SetTokenAt(i, kind, literal);
   }
   return token_stream.raw();
 }
 
 
 void RawTokenStream::WriteTo(SnapshotWriter* writer,
@@ skipping 504 matching lines @@
   // Write out the class information.
   writer->WriteObjectHeader(kObjectId, ObjectStore::kOneByteStringClass);
 
   // Write out the length field.
   writer->Write<RawObject*>(ptr()->length_);
 
   // Write out the hash field.
   writer->Write<RawObject*>(ptr()->hash_);
 
   // Write out the string.
-  for (int i = 0; i < len; i++) {
+  for (intptr_t i = 0; i < len; i++) {
     writer->Write<uint8_t>(ptr()->data_[i]);
   }
 }
 
 
 RawTwoByteString* TwoByteString::ReadFrom(SnapshotReader* reader,
                                           intptr_t object_id,
                                           bool classes_serialized) {
   ASSERT(reader != NULL);
   // Read the length so that we can determine instance size to allocate.
   RawSmi* smi_len = GetSmi(reader->Read<intptr_t>());
   intptr_t len = Smi::Value(smi_len);
   RawSmi* smi_hash = GetSmi(reader->Read<intptr_t>());
 
   // Set up the two byte string object.
   TwoByteString& str_obj = TwoByteString::ZoneHandle(
       TwoByteString::New(len, classes_serialized ? Heap::kOld : Heap::kNew));
-  for (int i = 0; i < len; i++) {
+  for (intptr_t i = 0; i < len; i++) {
     *str_obj.CharAddr(i) = reader->Read<uint16_t>();
   }
 
   reader->AddBackwardReference(object_id, &str_obj);
   RawTwoByteString* raw_str = str_obj.raw();
   raw_str->ptr()->hash_ = smi_hash;
   return str_obj.raw();
 }
 
 
 void RawTwoByteString::WriteTo(SnapshotWriter* writer,
                                intptr_t object_id,
                                bool serialize_classes) {
   ASSERT(writer != NULL);
   intptr_t len = Smi::Value(ptr()->length_);
 
   // Write out the serialization header value for this object.
   writer->WriteObjectHeader(kInlined, object_id);
 
   // Write out the class information.
   writer->WriteObjectHeader(kObjectId, ObjectStore::kTwoByteStringClass);
 
   // Write out the length field.
   writer->Write<RawObject*>(ptr()->length_);
 
   // Write out the hash field.
   writer->Write<RawObject*>(ptr()->hash_);
 
   // Write out the string.
-  for (int i = 0; i < len; i++) {
+  for (intptr_t i = 0; i < len; i++) {
     writer->Write<uint16_t>(ptr()->data_[i]);
   }
 }
 
 
 RawFourByteString* FourByteString::ReadFrom(SnapshotReader* reader,
                                             intptr_t object_id,
                                             bool classes_serialized) {
   ASSERT(reader != NULL);
   // Read the length so that we can determine instance size to allocate.
@@ skipping 27 matching lines @@
   // Write out the class information.
   writer->WriteObjectHeader(kObjectId, ObjectStore::kFourByteStringClass);
 
   // Write out the length field.
   writer->Write<RawObject*>(ptr()->length_);
 
   // Write out the hash field.
   writer->Write<RawObject*>(ptr()->hash_);
 
   // Write out the string.
-  for (int i = 0; i < len; i++) {
+  for (intptr_t i = 0; i < len; i++) {
     writer->Write<uint32_t>(ptr()->data_[i]);
   }
 }
 
 
 RawBool* Bool::ReadFrom(SnapshotReader* reader,
                           intptr_t object_id,
                           bool classes_serialized) {
   UNREACHABLE();
   return Bool::null();
@@ skipping 18 matching lines @@
   intptr_t len = Smi::Value(smi_len);
   T& result = T::Handle(T::New(len,
                                classes_serialized ? Heap::kOld : Heap::kNew));
   reader->AddBackwardReference(object_id, &result);
 
   TypeArguments& type_arguments = TypeArguments::Handle();
   type_arguments ^= reader->ReadObject();
   result.SetTypeArguments(type_arguments);
 
   Object& obj = Object::Handle();
-  for (int i = 0; i < len; i++) {
+  for (intptr_t i = 0; i < len; i++) {
     obj = reader->ReadObject();
     result.SetAt(i, obj);
   }
   return result.raw();
 }
 
 
 RawArray* Array::ReadFrom(SnapshotReader* reader,
                           intptr_t object_id,
                           bool classes_serialized) {
@@ skipping 27 matching lines @@
   // Write out the class information.
   writer->WriteObjectHeader(kObjectId, kind);
 
   // Write out the length field.
   writer->Write<RawObject*>(length);
 
   // Write out the type arguments.
   writer->WriteObject(type_arguments);
 
   // Write out the individual objects.
-  for (int i = 0; i < len; i++) {
+  for (intptr_t i = 0; i < len; i++) {
     writer->WriteObject(data[i]);
   }
 }
 
 
 void RawArray::WriteTo(SnapshotWriter* writer,
                        intptr_t object_id,
                        bool serialize_classes) {
   ArrayWriteTo(writer,
                object_id,
@@ skipping 93 matching lines @@
   // Write out all the other fields.
   writer->Write<RawObject*>(ptr()->num_bracket_expressions_);
   writer->WriteObject(ptr()->pattern_);
   writer->Write<intptr_t>(ptr()->type_);
   writer->Write<intptr_t>(ptr()->flags_);
 
   // Do not write out the data part which is native.
 }
 
 }  // namespace dart