Consolidate a few fields in RawFunction using bitfields.

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 "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
 #include "vm/bootstrap.h"
@@ skipping 3624 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_ptr()->kind_ = value;
+  raw()->SetKind(value);
 }
 
 
 void Function::set_is_static(bool is_static) const {
-  raw_ptr()->is_static_ = is_static;
+  raw()->SetIsStatic(is_static);
 }
 
 
 void Function::set_is_const(bool is_const) const {
-  raw_ptr()->is_const_ = is_const;
+  raw()->SetIsConst(is_const);
 }
 
 
 void Function::set_token_pos(intptr_t pos) const {
   ASSERT(pos >= 0);
   raw_ptr()->token_pos_ = pos;
 }
 
 
 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_ptr()->is_optimizable_ = value;
+  raw()->SetIsOptimizable(value);
 }
 
 
 void Function::set_is_native(bool value) const {
-  raw_ptr()->is_native_ = value;
+  raw()->SetIsNative(value);
+}
+
+
+void Function::set_is_abstract(bool value) const {
+  raw()->SetIsAbstract(value);
 }
 
 
 intptr_t Function::NumberOfParameters() const {
   return num_fixed_parameters() + num_optional_parameters();
 }
 
 
 intptr_t Function::NumberOfImplicitParameters() const {
   if (kind() == RawFunction::kConstructor) {
@@ skipping 307 matching lines @@
                                     Function::InstanceSize(),
                                     Heap::kOld);
   return reinterpret_cast<RawFunction*>(raw);
 }
 
 
 RawFunction* Function::New(const String& name,
                            RawFunction::Kind kind,
                            bool is_static,
                            bool is_const,
+                           bool is_abstract,
                            intptr_t token_pos) {
   ASSERT(name.IsOneByteString());
   const Function& result = Function::Handle(Function::New());
   result.set_parameter_types(Array::Handle(Array::Empty()));
   result.set_parameter_names(Array::Handle(Array::Empty()));
   result.set_name(name);
   result.set_kind(kind);
   result.set_is_static(is_static);
   result.set_is_const(is_const);
   result.set_token_pos(token_pos);
   result.set_end_token_pos(token_pos);
   result.set_num_fixed_parameters(0);
   result.set_num_optional_parameters(0);
   result.set_usage_counter(0);
   result.set_deoptimization_counter(0);
   result.set_is_optimizable(true);
   result.set_is_native(false);
+  result.set_is_abstract(is_abstract);
   return result.raw();
 }
 
 
 RawFunction* Function::NewClosureFunction(const String& name,
                                           const Function& parent,
                                           intptr_t token_pos) {
   ASSERT(name.IsOneByteString());
   ASSERT(!parent.IsNull());
   const Class& parent_class = Class::Handle(parent.owner());
   ASSERT(!parent_class.IsNull());
   const Function& result = Function::Handle(
       Function::New(name,
                     RawFunction::kClosureFunction,
                     /* is_static = */ parent.is_static(),
                     /* is_const = */ false,
+                    /* is_abstract = */ false,
                     token_pos));
   result.set_parent_function(parent);
   result.set_owner(parent_class);
   return result.raw();
 }
 
 
 RawFunction* Function::ImplicitClosureFunction() const {
   // Return the existing implicit closure function if any.
   if (raw_ptr()->implicit_closure_function_ != Function::null()) {
@@ skipping 175 matching lines @@
   return true;
 }
 
 
 bool Function::HasOptimizedCode() const {
   return HasCode() && Code::Handle(raw_ptr()->code_).is_optimized();
 }
 
 
 const char* Function::ToCString() const {
-  const char* f0 = is_static() ? " static" : "";
-  const char* f1 = NULL;
-  const char* f2 = is_const() ? " const" : "";
+  const char* static_str = is_static() ? " static" : "";
+  const char* abstract_str = is_abstract() ? " abstract" : "";
+  const char* kind_str = NULL;
+  const char* const_str = is_const() ? " const" : "";
   switch (kind()) {
     case RawFunction::kFunction:
     case RawFunction::kClosureFunction:
     case RawFunction::kGetterFunction:
     case RawFunction::kSetterFunction:
-      f1 = "";
+      kind_str = "";
       break;
     case RawFunction::kSignatureFunction:
-      f1 = " signature";
-      break;
-    case RawFunction::kAbstract:
-      f1 = " abstract";
+      kind_str = " signature";
       break;
     case RawFunction::kConstructor:
-      f1 = is_static() ? " factory" : " constructor";
+      kind_str = is_static() ? " factory" : " constructor";
       break;
     case RawFunction::kImplicitGetter:
-      f1 = " getter";
+      kind_str = " getter";
       break;
     case RawFunction::kImplicitSetter:
-      f1 = " setter";
+      kind_str = " setter";
       break;
     case RawFunction::kConstImplicitGetter:
-      f1 = " const-getter";
+      kind_str = " const-getter";
       break;
     default:
       UNREACHABLE();
   }
-  const char* kFormat = "Function '%s':%s%s%s.";
+  const char* kFormat = "Function '%s':%s%s%s%s.";
   const char* function_name = String::Handle(name()).ToCString();
-  intptr_t len = OS::SNPrint(NULL, 0, kFormat, function_name, f0, f1, f2) + 1;
+  intptr_t len = OS::SNPrint(NULL, 0, kFormat, function_name,
+                             static_str, abstract_str, kind_str, const_str) + 1;
   char* chars = reinterpret_cast<char*>(
       Isolate::Current()->current_zone()->Allocate(len));
-  OS::SNPrint(chars, len, kFormat, function_name, f0, f1, f2);
+  OS::SNPrint(chars, len, kFormat, function_name,
+              static_str, abstract_str, kind_str, const_str);
   return chars;
 }
 
 
 RawString* Field::GetterName(const String& field_name) {
   String& str = String::Handle();
   str = String::New(kGetterPrefix);
   str = String::Concat(str, field_name);
   return str.raw();
 }
@@ skipping 6494 matching lines @@
   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 = reinterpret_cast<char*>(
       Isolate::Current()->current_zone()->Allocate(len + 1));
   OS::SNPrint(chars, (len + 1), format, str.ToCString(), Flags());
   return chars;
 }
 
 }  // namespace dart