Runtime support for evaluation of static field initializer expressions

runtime/vm/object.h

Index: runtime/vm/object.h
===================================================================
--- runtime/vm/object.h	(revision 39381)
+++ runtime/vm/object.h	(working copy)
@@ -1627,9 +1627,6 @@
   void set_saved_args_desc(const Array& array) const;
   RawArray* saved_args_desc() const;
 
-  void set_saved_static_field(const Field& array) const;
-  RawField* saved_static_field() const;
-
   bool IsMethodExtractor() const {
     return kind() == RawFunction::kMethodExtractor;
   }
@@ -1702,7 +1699,6 @@
       case RawFunction::kClosureFunction:
       case RawFunction::kConstructor:
       case RawFunction::kImplicitStaticFinalGetter:
-      case RawFunction::kStaticInitializer:
         return false;
       default:
         UNREACHABLE();
@@ -1720,7 +1716,6 @@
       case RawFunction::kImplicitGetter:
       case RawFunction::kImplicitSetter:
       case RawFunction::kImplicitStaticFinalGetter:
-      case RawFunction::kStaticInitializer:
         return true;
       case RawFunction::kClosureFunction:
       case RawFunction::kConstructor:
@@ -1933,11 +1928,6 @@
     return kind() == RawFunction::kImplicitSetter;
   }
 
-  // Returns true if this function represents an static initializer function.
-  bool IsStaticInitializerFunction() const {
-    return kind() == RawFunction::kStaticInitializer;
-  }
-
   // Returns true if this function represents a (possibly implicit) closure
   // function.
   bool IsClosureFunction() const {
@@ -2004,10 +1994,6 @@
                                       const Script& script,
                                       bool is_static);
 
-  // Creates a new static initializer function which is invoked in the implicit
-  // static getter function.
-  static RawFunction* NewStaticInitializer(const Field& field);
-
   // Allocate new function object, clone values from this function. The
   // owner of the clone is new_owner.
   RawFunction* Clone(const Class& new_owner) const;
@@ -2342,6 +2328,8 @@
 
   bool IsUninitialized() const;
 
+  void EvaluateInitializer() const;
+
   // Constructs getter and setter names for fields and vice versa.
   static RawString* GetterName(const String& field_name);
   static RawString* GetterSymbol(const String& field_name);