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

Unified Diff: runtime/vm/intermediate_language.cc

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.cc
diff --git a/runtime/vm/intermediate_language.cc b/runtime/vm/intermediate_language.cc
index b7bacba5eda7e0c6eb1edf8f2b84d5ad58a7ed71..8927233a2a96ecb4349ada310674e70368f1509c 100644
--- a/runtime/vm/intermediate_language.cc
+++ b/runtime/vm/intermediate_language.cc
@@ -383,8 +383,8 @@ bool LoadFieldInstr::AttributesEqual(Instruction* other) const {
Instruction* InitStaticFieldInstr::Canonicalize(FlowGraph* flow_graph) {
const bool is_initialized =
- (field_.value() != Object::sentinel().raw()) &&
- (field_.value() != Object::transition_sentinel().raw());
+ (field_.StaticFieldValue() != Object::sentinel().raw()) &&
+ (field_.StaticFieldValue() != Object::transition_sentinel().raw());
return is_initialized ? NULL : this;
}
@@ -398,8 +398,9 @@ bool LoadStaticFieldInstr::AttributesEqual(Instruction* other) const {
LoadStaticFieldInstr* other_load = other->AsLoadStaticField();
ASSERT(other_load != NULL);
// Assert that the field is initialized.
- ASSERT(StaticField().value() != Object::sentinel().raw());
- ASSERT(StaticField().value() != Object::transition_sentinel().raw());
+ ASSERT(StaticField().StaticFieldValue() != Object::sentinel().raw());
+ ASSERT(StaticField().StaticFieldValue() !=
+ Object::transition_sentinel().raw());
return StaticField().raw() == other_load->StaticField().raw();
}

Powered by Google App Engine
This is Rietveld 408576698