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

runtime/vm/raw_object_snapshot.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 "vm/object_store.h"
 #include "vm/snapshot.h"
 #include "vm/stub_code.h"
 #include "vm/symbols.h"
 #include "vm/visitor.h"
@@ skipping 795 matching lines @@
   // Write out the class and tags information.
   writer->WriteVMIsolateObject(kFieldCid);
   writer->WriteTags(writer->GetObjectTags(this));
 
   // Write out all the non object fields.
   writer->Write<int32_t>(ptr()->token_pos_);
   writer->Write<int32_t>(ptr()->guarded_cid_);
   writer->Write<int32_t>(ptr()->is_nullable_);
   writer->Write<uint8_t>(ptr()->kind_bits_);
 
-  // Write out all the object pointer fields.
-  SnapshotWriterVisitor visitor(writer);
-  visitor.VisitPointers(from(), to());
+  // Write out the name.

[rmacnak, 2015/09/01 16:54:55]

WriteObjectImpl doesn't care about the C++ type of the object it is writing, so
I don't think this change is needed.

[siva, 2015/09/03 23:32:10]

As discussed offline this is used to ensure that we write out the saved initial
value for static fields. I have added a comment to make that clear.

+  writer->WriteObjectImpl(ptr()->name_, kAsReference);
+  // Write out the owner.
+  writer->WriteObjectImpl(ptr()->owner_, kAsReference);
+  // Write out the type.
+  writer->WriteObjectImpl(ptr()->type_, kAsReference);
+  // Write out the initial static value or field offset.
+  if (Field::StaticBit::decode(ptr()->kind_bits_)) {
+    writer->WriteObjectImpl(ptr()->initializer_.value_, kAsReference);

[rmacnak, 2015/09/01 16:54:55]

value_.value_

[rmacnak, 2015/09/01 18:28:51]

Okay, nvm. Add a comment in the then branch that we are overwriting the
staticValue with the saved_initial_value.

[siva, 2015/09/03 23:32:10]

Acknowledged.

[siva, 2015/09/03 23:32:10]

initializer_.saved_value_;

+  } else {
+    writer->WriteObjectImpl(ptr()->value_.value_, kAsReference);
+  }
+  // Write out the dependent code.
+  writer->WriteObjectImpl(ptr()->dependent_code_, kAsReference);
+  // Write out the initializer value.
+  writer->WriteObjectImpl(ptr()->initializer_.value_, kAsReference);
+  // Write out the guarded list length.
+  writer->WriteObjectImpl(ptr()->guarded_list_length_, kAsReference);
 }
 
 
 RawLiteralToken* LiteralToken::ReadFrom(SnapshotReader* reader,
                                         intptr_t object_id,
                                         intptr_t tags,
                                         Snapshot::Kind kind) {
   ASSERT(reader != NULL);
   ASSERT(kind != Snapshot::kMessage);
 
@@ skipping 2488 matching lines @@
     // We do not allow objects with native fields in an isolate message.
     writer->SetWriteException(Exceptions::kArgument,
                               "Illegal argument in isolate message"
                               " : (object is a UserTag)");
   } else {
     UNREACHABLE();
   }
 }
 
 }  // namespace dart