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

runtime/vm/object_test.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 "platform/globals.h"
 
 #include "vm/assembler.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
@@ skipping 270 matching lines @@
   const Array& one_fields = Array::Handle(Array::New(1));
   const String& field_name = String::Handle(Symbols::New("the_field"));
   const Field& field = Field::Handle(
       Field::New(field_name, false, false, false, true, one_field_class, 0));
   one_fields.SetAt(0, field);
   one_field_class.SetFields(one_fields);
   one_field_class.Finalize();
   intptr_t header_size = sizeof(RawObject);
   EXPECT_EQ(Utils::RoundUp((header_size + (1 * kWordSize)), kObjectAlignment),
             one_field_class.instance_size());
-  EXPECT_EQ(header_size, field.Offset());
+  EXPECT_EQ(header_size, field.InstanceFieldOffset());
   EXPECT(!one_field_class.is_implemented());
   one_field_class.set_is_implemented();
   EXPECT(one_field_class.is_implemented());
 }
 
 
 TEST_CASE(Smi) {
   const Smi& smi = Smi::Handle(Smi::New(5));
   Object& smi_object = Object::Handle(smi.raw());
   EXPECT(smi.IsSmi());
@@ skipping 4401 matching lines @@
   EXPECT(iterator.MoveNext());
   object = iterator.CurrentKey();
   EXPECT_STREQ("z", object.ToCString());
   object = iterator.CurrentValue();
   EXPECT_STREQ("5", object.ToCString());
 
   EXPECT(!iterator.MoveNext());
 }
 
 }  // namespace dart