- Fix a lot of warnings generated by -Wshorten-64-to-32

runtime/vm/object.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/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 15195 matching lines @@
 RawInteger* Integer::NewCanonical(const String& str) {
   // We are not supposed to have integers represented as two byte strings.
   ASSERT(str.IsOneByteString());
   int64_t value;
   if (!OS::StringToInt64(str.ToCString(), &value)) {
     const Bigint& big = Bigint::Handle(Bigint::NewCanonical(str));
     ASSERT(!BigintOperations::FitsIntoSmi(big));
     ASSERT(!BigintOperations::FitsIntoInt64(big));
     return big.raw();
   }
-  if ((value <= Smi::kMaxValue) && (value >= Smi::kMinValue)) {
-    return Smi::New(value);
+  if (Smi::IsValid(value)) {
+    return Smi::New(static_cast<intptr_t>(value));
   }
   return Mint::NewCanonical(value);
 }
 
 
 // dart2js represents integers as double precision floats, which can represent
 // anything in the range -2^53 ... 2^53.
 static bool IsJavascriptInt(int64_t value) {
   return ((-0x20000000000000LL <= value) && (value <= 0x20000000000000LL));
 }
 
 
 RawInteger* Integer::New(int64_t value, Heap::Space space, const bool silent) {
-  const bool is_smi = (value <= Smi::kMaxValue) && (value >= Smi::kMinValue);
+  const bool is_smi = Smi::IsValid(value);
   if (!silent &&
       FLAG_throw_on_javascript_int_overflow &&
       !IsJavascriptInt(value)) {
-    const Integer& i = is_smi ? Integer::Handle(Smi::New(value))
-                              : Integer::Handle(Mint::New(value));
+    const Integer& i = is_smi ?
+        Integer::Handle(Smi::New(static_cast<intptr_t>(value))) :
+        Integer::Handle(Mint::New(value));
     ThrowJavascriptIntegerOverflow(i);
   }
   if (is_smi) {
-    return Smi::New(value);
+    return Smi::New(static_cast<intptr_t>(value));
   }
   return Mint::New(value, space);
 }
 
 
 RawInteger* Integer::NewFromUint64(uint64_t value, Heap::Space space) {
   if (value > static_cast<uint64_t>(Mint::kMaxValue)) {
     if (FLAG_throw_on_javascript_int_overflow) {
       const Integer &i =
           Integer::Handle(BigintOperations::NewFromUint64(value));
@@ skipping 56 matching lines @@
 RawInteger* Integer::AsValidInteger() const {
   if (FLAG_throw_on_javascript_int_overflow &&
       CheckJavascriptIntegerOverflow()) {
     ThrowJavascriptIntegerOverflow(*this);
   }
   if (IsSmi()) return raw();
   if (IsMint()) {
     Mint& mint = Mint::Handle();
     mint ^= raw();
     if (Smi::IsValid(mint.value())) {
-      return Smi::New(mint.value());
+      return Smi::New(static_cast<intptr_t>(mint.value()));
     } else {
       return raw();
     }
   }
   ASSERT(IsBigint());
   Bigint& big_value = Bigint::Handle();
   big_value ^= raw();
   if (BigintOperations::FitsIntoSmi(big_value)) {
     return BigintOperations::ToSmi(big_value);
   } else if (BigintOperations::FitsIntoInt64(big_value)) {
@@ skipping 3836 matching lines @@
   return tag_label.ToCString();
 }
 
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 
 }  // namespace dart