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

runtime/vm/object.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 VM_OBJECT_H_
 #define VM_OBJECT_H_
 
-#include <limits>
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
 #include "vm/json_stream.h"
 #include "vm/bitmap.h"
 #include "vm/dart.h"
 #include "vm/globals.h"
 #include "vm/handles.h"
 #include "vm/heap.h"
 #include "vm/isolate.h"
@@ skipping 2977 matching lines @@
   void AddDescriptor(intptr_t index,
                      uword pc,
                      RawPcDescriptors::Kind kind,
                      int64_t deopt_id,
                      int64_t token_pos,  // Or deopt reason.
                      intptr_t try_index) const {  // Or deopt index.
     RawPcDescriptors::PcDescriptorRec* rec = recAt(index);
     rec->set_pc(pc);
     rec->set_kind(kind);
     ASSERT(Utils::IsInt(32, deopt_id));
-    rec->set_deopt_id(deopt_id);
+    rec->set_deopt_id(static_cast<int32_t>(deopt_id));
     ASSERT(Utils::IsInt(32, token_pos));
-    rec->set_token_pos(token_pos,
+    rec->set_token_pos(static_cast<int32_t>(token_pos),
         RecordSizeInBytes() == RawPcDescriptors::kCompressedRecSize);
     ASSERT(Utils::IsInt(16, try_index));
     rec->set_try_index(try_index);
     ASSERT(rec->try_index() == try_index);
     ASSERT(rec->token_pos() == token_pos);
   }
 
   static const intptr_t kMaxBytesPerElement =
       sizeof(RawPcDescriptors::PcDescriptorRec);
   static const intptr_t kMaxElements = kSmiMax / kMaxBytesPerElement;
@@ skipping 2052 matching lines @@
 
   virtual double AsDoubleValue() const;
   virtual int64_t AsInt64Value() const;
   virtual uint32_t AsTruncatedUint32Value() const;
 
   virtual int CompareWith(const Integer& other) const;
 
   static intptr_t InstanceSize() { return 0; }
 
   static RawSmi* New(intptr_t value) {
-    word raw_smi = (value << kSmiTagShift) | kSmiTag;
+    intptr_t raw_smi = (value << kSmiTagShift) | kSmiTag;
     ASSERT(ValueFromRaw(raw_smi) == value);
     return reinterpret_cast<RawSmi*>(raw_smi);
   }
 
   static RawClass* Class();
 
   static intptr_t Value(const RawSmi* raw_smi) {
     return ValueFromRaw(reinterpret_cast<uword>(raw_smi));
   }
 
   static intptr_t RawValue(intptr_t value) {
     return reinterpret_cast<intptr_t>(New(value));
   }
 
-  template <typename T>
-  static bool IsValid(T value) {
-    COMPILE_ASSERT(sizeof(kMinValue) == sizeof(kMaxValue));
-    COMPILE_ASSERT(std::numeric_limits<T>::is_integer);
-    if (sizeof(value) < sizeof(kMinValue)) {
-      return true;
-    }
-
-    T min_value = std::numeric_limits<T>::is_signed
-        ? static_cast<T>(kMinValue) : 0;
-    return (value >= min_value)
-        && (value <= static_cast<T>(kMaxValue));
+  static bool IsValid(int64_t value) {
+    return (value >= kMinValue) && (value <= kMaxValue);
   }
 
   RawInteger* ShiftOp(Token::Kind kind,
                       const Smi& other,
                       const bool silent = false) const;
 
   void operator=(RawSmi* value) {
     raw_ = value;
     CHECK_HANDLE();
   }
@@ skipping 2129 matching lines @@
 
 
 RawObject* MegamorphicCache::GetTargetFunction(const Array& array,
                                                intptr_t index) {
   return array.At((index * kEntryLength) + kTargetFunctionIndex);
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_