1. Write out only the kind_tag_ field of a function in the snapshot instead of the individual bits …

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/bigint_operations.h"
@@ skipping 3596 matching lines @@
   parameter_names.SetAt(index, value);
 }
 
 
 void Function::set_parameter_names(const Array& value) const {
   StorePointer(&raw_ptr()->parameter_names_, value.raw());
 }
 
 
 void Function::set_kind(RawFunction::Kind value) const {
-  raw()->SetKind(value);
+  uword bits = raw_ptr()->kind_tag_;
+  raw_ptr()->kind_tag_ = KindBits::update(value, bits);
 }
 
 
 void Function::set_is_static(bool is_static) const {
-  raw()->SetIsStatic(is_static);
+  uword bits = raw_ptr()->kind_tag_;
+  raw_ptr()->kind_tag_ = StaticBit::update(is_static, bits);
 }
 
 
 void Function::set_is_const(bool is_const) const {
-  raw()->SetIsConst(is_const);
+  uword bits = raw_ptr()->kind_tag_;
+  raw_ptr()->kind_tag_ = ConstBit::update(is_const, bits);
 }
 
 
 void Function::set_is_external(bool is_external) const {
-  raw()->SetIsExternal(is_external);
+  uword bits = raw_ptr()->kind_tag_;
+  raw_ptr()->kind_tag_ = ExternalBit::update(is_external, bits);
 }
 
 
 void Function::set_token_pos(intptr_t pos) const {
   ASSERT(pos >= 0);
   raw_ptr()->token_pos_ = pos;
 }
 
 
+void Function::set_kind_tag(intptr_t value) const {
+  raw_ptr()->kind_tag_ = value;
+}
+
+
 void Function::set_num_fixed_parameters(intptr_t n) const {
   ASSERT(n >= 0);
   raw_ptr()->num_fixed_parameters_ = n;
 }
 
 
 void Function::set_num_optional_parameters(intptr_t n) const {
   ASSERT(n >= 0);
   raw_ptr()->num_optional_parameters_ = n;
 }
 
 
 void Function::set_is_optimizable(bool value) const {
-  raw()->SetIsOptimizable(value);
+  uword bits = raw_ptr()->kind_tag_;
+  raw_ptr()->kind_tag_ = OptimizableBit::update(value, bits);
 }
 
 
 void Function::set_has_finally(bool value) const {
-  raw()->SetHasFinally(value);
+  uword bits = raw_ptr()->kind_tag_;
+  raw_ptr()->kind_tag_ = HasFinallyBit::update(value, bits);
 }
 
 
 void Function::set_is_native(bool value) const {
-  raw()->SetIsNative(value);
+  uword bits = raw_ptr()->kind_tag_;
+  raw_ptr()->kind_tag_ = NativeBit::update(value, bits);
 }
 
 
 void Function::set_is_abstract(bool value) const {
-  raw()->SetIsAbstract(value);
+  uword bits = raw_ptr()->kind_tag_;
+  raw_ptr()->kind_tag_ = AbstractBit::update(value, bits);
 }
 
 
 intptr_t Function::NumberOfParameters() const {
   return num_fixed_parameters() + num_optional_parameters();
 }
 
 
 intptr_t Function::NumberOfImplicitParameters() const {
   if (kind() == RawFunction::kConstructor) {
@@ skipping 7304 matching lines @@
 const char* JSRegExp::ToCString() const {
   const String& str = String::Handle(pattern());
   const char* format = "JSRegExp: pattern=%s flags=%s";
   intptr_t len = OS::SNPrint(NULL, 0, format, str.ToCString(), Flags());
   char* chars = Isolate::Current()->current_zone()->Alloc<char>(len + 1);
   OS::SNPrint(chars, (len + 1), format, str.ToCString(), Flags());
   return chars;
 }
 
 }  // namespace dart