Rename accessors of class Field to make it more apparent as to what is being accessed - static fiel…

runtime/vm/raw_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_RAW_OBJECT_H_
 #define VM_RAW_OBJECT_H_
 
 #include "platform/assert.h"
 #include "vm/atomic.h"
 #include "vm/globals.h"
@@ skipping 812 matching lines @@
 
 
 class RawField : public RawObject {
   RAW_HEAP_OBJECT_IMPLEMENTATION(Field);
 
   RawObject** from() { return reinterpret_cast<RawObject**>(&ptr()->name_); }
   RawString* name_;
   RawObject* owner_;  // Class or patch class or mixin class
                       // where this field is defined.
   RawAbstractType* type_;
-  RawInstance* value_;  // Offset in words for instance and value for static.
+  union {
+    RawInstance* static_value_;  // Value for static fields.
+    RawSmi* offset_;  // Offset in words for instance fields.
+  } value_;
   RawArray* dependent_code_;
-  RawFunction* initializer_;
+  union {
+    // When precompiling we need to save the static initializer function here
+    // so that code for it can be generated.
+    RawFunction* precompiled_;  // Static initializer function - precompiling.
+    // When generating script snapshots after running the application it is
+    // necessary to save the initial value of static fields so that we can
+    // restore the value back to the original initial value.
+    RawInstance* saved_value_;  // Saved initial value - static fields.
+  } initializer_;
   RawSmi* guarded_list_length_;
   RawObject** to() {
     return reinterpret_cast<RawObject**>(&ptr()->guarded_list_length_);
   }
 
   int32_t token_pos_;
   classid_t guarded_cid_;
   classid_t is_nullable_;  // kNullCid if field can contain null value and
                            // any other value otherwise.
   // Offset to the guarded length field inside an instance of class matching
@@ skipping 1367 matching lines @@
   COMPILE_ASSERT(kExternalTypedDataInt8ArrayCid ==
                  kTypedDataInt8ArrayViewCid + 15);
   COMPILE_ASSERT(kByteBufferCid == kExternalTypedDataInt8ArrayCid + 14);
   COMPILE_ASSERT(kNullCid == kByteBufferCid + 1);
   return (kNullCid - kTypedDataInt8ArrayCid);
 }
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_