Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(959)

Unified Diff: runtime/vm/intermediate_language.h

Issue 1289643005: Rename accessors of class Field to make it more apparent as to what is being accessed - static fiel… (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: self-code-review Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: runtime/vm/intermediate_language.h
diff --git a/runtime/vm/intermediate_language.h b/runtime/vm/intermediate_language.h
index 60f2db93e046a0e573d2f0424d8418bb7f322ea3..d6aa25a0daeb17ff488ca497cebc6061f8964ddc 100644
--- a/runtime/vm/intermediate_language.h
+++ b/runtime/vm/intermediate_language.h
@@ -3463,7 +3463,7 @@ class StoreInstanceFieldInstr : public TemplateDefinition<2, NoThrow> {
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),
@@ -4175,7 +4175,7 @@ class MaterializeObjectInstr : public Definition {
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();
}
@@ -4368,7 +4368,7 @@ class LoadFieldInstr : public TemplateDefinition<1, NoThrow> {
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),

Powered by Google App Engine
This is Rietveld 408576698