Split LoadStatic into two instructions: load static filed, load value.

runtime/vm/intermediate_language.cc

 // 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.
 
 #include "vm/intermediate_language.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/bit_vector.h"
 #include "vm/dart_entry.h"
 #include "vm/flow_graph_allocator.h"
@@ skipping 155 matching lines @@
   if (field() != NULL) {
     return (other_load->field() != NULL) &&
         (field()->raw() == other_load->field()->raw());
   }
   return (other_load->field() == NULL) &&
       (offset_in_bytes() == other_load->offset_in_bytes());
 }
 
 
 EffectSet LoadStaticFieldInstr::Dependencies() const {
-  return field().is_final() ? EffectSet::None() : EffectSet::All();
+  return StaticField().is_final() ? EffectSet::None() : EffectSet::All();
 }
 
 
 bool LoadStaticFieldInstr::AttributesEqual(Instruction* other) const {
   LoadStaticFieldInstr* other_load = other->AsLoadStaticField();
   ASSERT(other_load != NULL);
   // Assert that the field is initialized.
-  ASSERT(field().value() != Object::sentinel().raw());
-  ASSERT(field().value() != Object::transition_sentinel().raw());
-  return field().raw() == other_load->field().raw();
+  ASSERT(StaticField().value() != Object::sentinel().raw());
+  ASSERT(StaticField().value() != Object::transition_sentinel().raw());
+  return StaticField().raw() == other_load->StaticField().raw();
+}
+
+
+const Field& LoadStaticFieldInstr::StaticField() const {
+  Field& field = Field::Handle();
+  field ^= field_value()->BoundConstant().raw();
+  return field;
 }
 
 
 EffectSet LoadIndexedInstr::Dependencies() const {
   return EffectSet::All();
 }
 
 
 bool LoadIndexedInstr::AttributesEqual(Instruction* other) const {
   LoadIndexedInstr* other_load = other->AsLoadIndexed();
@@ skipping 2296 matching lines @@
     default:
       UNREACHABLE();
   }
   return kPowRuntimeEntry;
 }
 
 
 #undef __
 
 }  // namespace dart