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

runtime/vm/intermediate_language.h

 // Copyright (c) 2013, 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_INTERMEDIATE_LANGUAGE_H_
 #define VM_INTERMEDIATE_LANGUAGE_H_
 
 #include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
@@ skipping 3445 matching lines @@
 
 
 class StoreInstanceFieldInstr : public TemplateDefinition<2, NoThrow> {
  public:
   StoreInstanceFieldInstr(const Field& field,
                           Value* instance,
                           Value* value,
                           StoreBarrierType emit_store_barrier,
                           intptr_t token_pos)
       : field_(field),
-        offset_in_bytes_(field.Offset()),
+        offset_in_bytes_(field.InstanceFieldOffset()),
         emit_store_barrier_(emit_store_barrier),
         token_pos_(token_pos),
         is_potential_unboxed_initialization_(false),
         is_object_reference_initialization_(false) {
     SetInputAt(kInstancePos, instance);
     SetInputAt(kValuePos, value);
   }
 
   StoreInstanceFieldInstr(intptr_t offset_in_bytes,
                           Value* instance,
@@ skipping 691 matching lines @@
 
   Definition* allocation() const { return allocation_; }
   const Class& cls() const { return cls_; }
 
   intptr_t num_variables() const {
     return num_variables_;
   }
 
   intptr_t FieldOffsetAt(intptr_t i) const {
     return slots_[i]->IsField()
-        ? Field::Cast(*slots_[i]).Offset()
+        ? Field::Cast(*slots_[i]).InstanceFieldOffset()
         : Smi::Cast(*slots_[i]).Value();
   }
 
   const Location& LocationAt(intptr_t i) {
     return locations_[i];
   }
 
   DECLARE_INSTRUCTION(MaterializeObject)
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
@@ skipping 172 matching lines @@
         token_pos_(token_pos) {
     ASSERT(offset_in_bytes >= 0);
     ASSERT(type.IsZoneHandle());  // May be null if field is not an instance.
     SetInputAt(0, instance);
   }
 
   LoadFieldInstr(Value* instance,
                  const Field* field,
                  const AbstractType& type,
                  intptr_t token_pos)
-      : offset_in_bytes_(field->Offset()),
+      : offset_in_bytes_(field->InstanceFieldOffset()),
         type_(type),
         result_cid_(kDynamicCid),
         immutable_(false),
         recognized_kind_(MethodRecognizer::kUnknown),
         field_(field),
         token_pos_(token_pos) {
     ASSERT(field->IsZoneHandle());
     ASSERT(type.IsZoneHandle());  // May be null if field is not an instance.
     SetInputAt(0, instance);
   }
@@ skipping 3723 matching lines @@
   LocationSummary* Name::MakeLocationSummary(Zone* zone, bool opt) const {    \
     UNIMPLEMENTED();                                                          \
     return NULL;                                                              \
   }                                                                           \
   void Name::EmitNativeCode(FlowGraphCompiler* compiler) { UNIMPLEMENTED(); }
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_