Fix a number of int type issues in dart:io File implementation to avoid implicit conversions that c…

runtime/bin/dartutils.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.
 
 #ifndef BIN_DARTUTILS_H_
 #define BIN_DARTUTILS_H_
 
 #include "bin/builtin.h"
 #include "bin/utils.h"
 #include "include/dart_api.h"
@@ skipping 58 matching lines @@
 
 
 class DartUtils {
  public:
   // TODO(turnidge): Clean up the implementations of these so that
   // they allow for proper error propagation.
 
   // Assumes that the value object is known to be an integer object
   // that fits in a signed 64-bit integer.
   static int64_t GetIntegerValue(Dart_Handle value_obj);
+  // Assumes that the value object is known to be an intptr_t. This should
+  // only be known when the value has been put into Dart as a pointer encoded
+  // in a 64-bit integer. This is the case for file and directory operations.
+  static intptr_t GetIntptrValue(Dart_Handle value_obj);
   // Checks that the value object is an integer object that fits in a
   // signed 64-bit integer. If it is, the value is returned in the
   // value out parameter and true is returned. Otherwise, false is
   // returned.
   static bool GetInt64Value(Dart_Handle value_obj, int64_t* value);
   static const char* GetStringValue(Dart_Handle str_obj);
   static bool GetBooleanValue(Dart_Handle bool_obj);
   static void SetIntegerField(Dart_Handle handle,
                               const char* name,
                               intptr_t val);
@@ skipping 114 matching lines @@
   static CObject* Bool(bool value);
   static Dart_CObject* NewInt32(int32_t value);
   static Dart_CObject* NewInt64(int64_t value);
   static Dart_CObject* NewIntptr(intptr_t value);
   // TODO(sgjesse): Add support for kBigint.
   static Dart_CObject* NewDouble(double value);
   static Dart_CObject* NewString(int length);
   static Dart_CObject* NewString(const char* str);
   static Dart_CObject* NewArray(int length);
   static Dart_CObject* NewUint8Array(int length);
-  static Dart_CObject* NewExternalUint8Array(int length,
+  static Dart_CObject* NewExternalUint8Array(int64_t length,
                                              uint8_t* data,
                                              void* peer,
                                              Dart_PeerFinalizer callback);
 
   Dart_CObject* AsApiCObject() { return cobject_; }
 
   // Create a new CObject array with an illegal arguments error.
   static CObject* IllegalArgumentError();
   // Create a new CObject array with a file closed error.
   static CObject* FileClosedError();
@@ skipping 77 matching lines @@
     ASSERT(cobject->type() == Dart_CObject::kInt64 ||
            cobject->type() == Dart_CObject::kInt32);
     cobject_ = cobject->AsApiCObject();
   }
 
   intptr_t Value()  {
     intptr_t result;
     if (type() == Dart_CObject::kInt32) {
       result = cobject_->value.as_int32;
     } else {
-      result = cobject_->value.as_int64;
+      ASSERT(sizeof(result) == 8);
+      result = static_cast<intptr_t>(cobject_->value.as_int64);
     }
     return result;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CObjectIntptr);
 };
 
 
 class CObjectBigint : public CObject {
@@ skipping 68 matching lines @@
   void* Peer() const { return cobject_->value.as_external_byte_array.peer; }
   Dart_PeerFinalizer Callback() const {
     return cobject_->value.as_external_byte_array.callback;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CObjectExternalUint8Array);
 };
 
 #endif  // BIN_DARTUTILS_H_