- Address warnings about 64-bit to 32-bit conversions.

runtime/vm/dart_api_message.cc

 // 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.
 
 #include "vm/bigint_operations.h"
 #include "vm/dart_api_message.h"
 #include "vm/object.h"
 #include "vm/snapshot_ids.h"
 #include "vm/symbols.h"
 #include "vm/unicode.h"
@@ skipping 377 matching lines @@
   char* p = object->value.as_string;
   memmove(p, str->ptr()->data_, len);
   p[len] = '\0';
   ASSERT(vm_symbol_references_[symbol_id] == NULL);
   vm_symbol_references_[symbol_id] = object;
   return object;
 }
 
 
 Dart_CObject* ApiMessageReader::ReadObjectRef() {
-  int64_t value = Read<int64_t>();
-  if ((value & kSmiTagMask) == 0) {
-    int64_t untagged_value = value >> kSmiTagShift;
-    if (kMinInt32 <= untagged_value && untagged_value <= kMaxInt32) {
-      return AllocateDartCObjectInt32(untagged_value);
+  int64_t value64 = Read<int64_t>();
+  if ((value64 & kSmiTagMask) == 0) {
+    int64_t untagged_value = value64 >> kSmiTagShift;
+    if ((kMinInt32 <= untagged_value) && (untagged_value <= kMaxInt32)) {
+      return AllocateDartCObjectInt32(static_cast<int32_t>(untagged_value));
     } else {
       return AllocateDartCObjectInt64(untagged_value);
     }
   }
-  ASSERT((value <= kIntptrMax) && (value >= kIntptrMin));
+  ASSERT((value64 <= kIntptrMax) && (value64 >= kIntptrMin));
+  intptr_t value = static_cast<intptr_t>(value64);
   if (IsVMIsolateObject(value)) {
     return ReadVMIsolateObject(value);
   }
   if (SerializedHeaderTag::decode(value) == kObjectId) {
     return ReadIndexedObject(SerializedHeaderData::decode(value));
   }
   ASSERT(SerializedHeaderTag::decode(value) == kInlined);
   // Read the class header information and lookup the class.
   intptr_t class_header = ReadIntptrValue();
 
@@ skipping 87 matching lines @@
       int8_t type_state = Read<int8_t>();
       USE(type_state);
       Dart_CObject* parameterized_class = ReadObjectImpl();
       // The type parameter is finalized, therefore parameterized_class is null.
       ASSERT(parameterized_class->type == Dart_CObject_kNull);
       Dart_CObject* name = ReadObjectImpl();
       ASSERT(name->type == Dart_CObject_kString);
       return value;
     }
     case kMintCid: {
-      int64_t value = Read<int64_t>();
+      int64_t value64 = Read<int64_t>();
       Dart_CObject* object;
-      if (kMinInt32 <= value && value <= kMaxInt32) {
-        object = AllocateDartCObjectInt32(value);
+      if ((kMinInt32 <= value64) && (value64 <= kMaxInt32)) {
+        object = AllocateDartCObjectInt32(static_cast<int32_t>(value64));
       } else {
-        object = AllocateDartCObjectInt64(value);
+        object = AllocateDartCObjectInt64(value64);
       }
       AddBackRef(object_id, object, kIsDeserialized);
       return object;
     }
     case kBigintCid: {
       // Read in the hex string representation of the bigint.
       intptr_t len = ReadIntptrValue();
       Dart_CObject* object = AllocateDartCObjectBigint(len);
       AddBackRef(object_id, object, kIsDeserialized);
       char* p = object->value.as_bigint;
@@ skipping 180 matching lines @@
     if (!backward_references_[i]->is_deserialized()) {
       ReadObjectImpl();
       backward_references_[i]->set_state(kIsDeserialized);
     }
   }
   return value;
 }
 
 
 Dart_CObject* ApiMessageReader::ReadObjectImpl() {
-  int64_t value = Read<int64_t>();
-  if ((value & kSmiTagMask) == 0) {
-    int64_t untagged_value = value >> kSmiTagShift;
-    if (kMinInt32 <= untagged_value && untagged_value <= kMaxInt32) {
-      return AllocateDartCObjectInt32(untagged_value);
+  int64_t value64 = Read<int64_t>();
+  if ((value64 & kSmiTagMask) == 0) {
+    int64_t untagged_value = value64 >> kSmiTagShift;
+    if ((kMinInt32 <= untagged_value) && (untagged_value <= kMaxInt32)) {
+      return AllocateDartCObjectInt32(static_cast<int32_t>(untagged_value));
     } else {
       return AllocateDartCObjectInt64(untagged_value);
     }
   }
-  ASSERT((value <= kIntptrMax) && (value >= kIntptrMin));
+  ASSERT((value64 <= kIntptrMax) && (value64 >= kIntptrMin));
+  intptr_t value = static_cast<intptr_t>(value64);
   if (IsVMIsolateObject(value)) {
     return ReadVMIsolateObject(value);
   }
   if (SerializedHeaderTag::decode(value) == kObjectId) {
     return ReadIndexedObject(SerializedHeaderData::decode(value));
   }
   ASSERT(SerializedHeaderTag::decode(value) == kInlined);
   return ReadInlinedObject(SerializedHeaderData::decode(value));
 }
 
@@ skipping 99 matching lines @@
     ASSERT(new_list != NULL);
     forward_list_ = reinterpret_cast<Dart_CObject**>(new_list);
   }
   forward_list_[forward_id_] = object;
   forward_id_ += 1;
 }
 
 
 void ApiMessageWriter::WriteSmi(int64_t value) {
   ASSERT(Smi::IsValid64(value));
-  Write<RawObject*>(Smi::New(value));
+  Write<RawObject*>(Smi::New(static_cast<intptr_t>(value)));
 }
 
 
 void ApiMessageWriter::WriteNullObject() {
   WriteVMIsolateObject(kNullObject);
 }
 
 
 void ApiMessageWriter::WriteMint(Dart_CObject* object, int64_t value) {
   ASSERT(!Smi::IsValid64(value));
@@ skipping 309 matching lines @@
     if (!success) {
       UnmarkAllCObjects(object);
       return false;
     }
   }
   UnmarkAllCObjects(object);
   return true;
 }
 
 }  // namespace dart