Fix the types used in bit fields.

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 "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 1784 matching lines @@
                        intptr_t token_pos);
 
   static intptr_t value_offset() { return OFFSET_OF(RawField, value_); }
 
   intptr_t token_pos() const { return raw_ptr()->token_pos_; }
 
   bool has_initializer() const {
     return HasInitializerBit::decode(raw_ptr()->kind_bits_);
   }
   void set_has_initializer(bool has_initializer) const {
-    uword bits = raw_ptr()->kind_bits_;
-    raw_ptr()->kind_bits_ = HasInitializerBit::update(has_initializer, bits);
+    raw_ptr()->kind_bits_ = static_cast<uint8_t>(
+        HasInitializerBit::update(has_initializer, raw_ptr()->kind_bits_));
   }
 
   // Constructs getter and setter names for fields and vice versa.
   static RawString* GetterName(const String& field_name);
   static RawString* GetterSymbol(const String& field_name);
   static RawString* SetterName(const String& field_name);
   static RawString* SetterSymbol(const String& field_name);
   static RawString* NameFromGetter(const String& getter_name);
   static RawString* NameFromSetter(const String& setter_name);
   static bool IsGetterName(const String& function_name);
   static bool IsSetterName(const String& function_name);
 
  private:
   enum {
     kConstBit = 1,
     kStaticBit,
     kFinalBit,
     kHasInitializerBit,
   };
   class ConstBit : public BitField<bool, kConstBit, 1> {};
   class StaticBit : public BitField<bool, kStaticBit, 1> {};
   class FinalBit : public BitField<bool, kFinalBit, 1> {};
   class HasInitializerBit : public BitField<bool, kHasInitializerBit, 1> {};
 
   void set_name(const String& value) const;
   void set_is_static(bool is_static) const {
-    uword bits = raw_ptr()->kind_bits_;
-    raw_ptr()->kind_bits_ = StaticBit::update(is_static, bits);
+    set_kind_bits(StaticBit::update(is_static, raw_ptr()->kind_bits_));
   }
   void set_is_final(bool is_final) const {
-    uword bits = raw_ptr()->kind_bits_;
-    raw_ptr()->kind_bits_ = FinalBit::update(is_final, bits);
+    set_kind_bits(FinalBit::update(is_final, raw_ptr()->kind_bits_));
   }
   void set_is_const(bool value) const {
-    uword bits = raw_ptr()->kind_bits_;
-    raw_ptr()->kind_bits_ = ConstBit::update(value, bits);
+    set_kind_bits(ConstBit::update(value, raw_ptr()->kind_bits_));
   }
   void set_owner(const Class& value) const {
     StorePointer(&raw_ptr()->owner_, value.raw());
   }
   void set_token_pos(intptr_t token_pos) const {
     raw_ptr()->token_pos_ = token_pos;
   }
   void set_kind_bits(intptr_t value) const {
-    raw_ptr()->kind_bits_ = value;
+    raw_ptr()->kind_bits_ = static_cast<uint8_t>(value);
   }
   static RawField* New();
 
   HEAP_OBJECT_IMPLEMENTATION(Field, Object);
   friend class Class;
   friend class HeapProfiler;
 };
 
 
 class LiteralToken : public Object {
@@ skipping 66 matching lines @@
     RawObject* CurrentToken() const;
     RawString* CurrentLiteral() const;
     RawString* MakeLiteralToken(const Object& obj) const;
 
    private:
     // Read token from the token stream (could be a simple token or an index
     // into the token objects array for IDENT or literal tokens).
     intptr_t ReadToken() {
       int64_t value = stream_.ReadUnsigned();
       ASSERT((value >= 0) && (value <= kIntptrMax));
-      return value;
+      return static_cast<intptr_t>(value);
     }
 
     const TokenStream& tokens_;
     const ExternalUint8Array& data_;
     ReadStream stream_;
     Array& token_objects_;
     Object& obj_;
     intptr_t cur_token_pos_;
     Token::Kind cur_token_kind_;
     intptr_t cur_token_obj_index_;
@@ skipping 3701 matching lines @@
     if (this->CharAt(i) != str.CharAt(begin_index + i)) {
       return false;
     }
   }
   return true;
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_