Collect type feedback for fields.

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/bit_vector.h"
 #include "vm/dart_entry.h"
 #include "vm/flow_graph_allocator.h"
 #include "vm/flow_graph_builder.h"
@@ skipping 51 matching lines @@
 
 
 bool Value::Equals(Value* other) const {
   return definition() == other->definition();
 }
 
 
 CheckClassInstr::CheckClassInstr(Value* value,
                                  intptr_t deopt_id,
                                  const ICData& unary_checks)
-    : unary_checks_(unary_checks) {
+    : unary_checks_(unary_checks),
+      null_check_(false) {
   ASSERT(unary_checks.IsZoneHandle());
   // Expected useful check data.
   ASSERT(!unary_checks_.IsNull());
   ASSERT(unary_checks_.NumberOfChecks() > 0);
   ASSERT(unary_checks_.num_args_tested() == 1);
   SetInputAt(0, value);
   deopt_id_ = deopt_id;
   // Otherwise use CheckSmiInstr.
   ASSERT((unary_checks_.NumberOfChecks() != 1) ||
          (unary_checks_.GetReceiverClassIdAt(0) != kSmiCid));
@@ skipping 19 matching lines @@
 
 
 bool CheckClassInstr::AffectedBySideEffect() const {
   // The class-id of string objects is not invariant: Externalization of strings
   // via the API can change the class-id.
   return unary_checks().HasReceiverClassId(kOneByteStringCid)
       || unary_checks().HasReceiverClassId(kTwoByteStringCid);
 }
 
 
+bool GuardFieldInstr::AttributesEqual(Instruction* other) const {
+  return field().raw() == other->AsGuardField()->field().raw();
+}
+
+
+bool GuardFieldInstr::AffectedBySideEffect() const {
+  return false;
+}
+
+
 bool CheckArrayBoundInstr::AttributesEqual(Instruction* other) const {
   CheckArrayBoundInstr* other_check = other->AsCheckArrayBound();
   ASSERT(other_check != NULL);
   return array_type() == other_check->array_type();
 }
 
 
 bool AssertAssignableInstr::AttributesEqual(Instruction* other) const {
   AssertAssignableInstr* other_assert = other->AsAssertAssignable();
   ASSERT(other_assert != NULL);
@@ skipping 1179 matching lines @@
     if (value_cid == unary_checks().GetReceiverClassIdAt(i)) {
       // No checks needed.
       return NULL;
     }
   }
 
   return this;
 }
 
 
+Instruction* GuardFieldInstr::Canonicalize(FlowGraphOptimizer* optimizer) {
+  if (field().guarded_cid() == kDynamicCid) {
+    return NULL;  // Nothing to guard.
+  }
+
+  if (field().is_nullable() && value()->Type()->IsNull()) {
+    return NULL;
+  }
+
+  const intptr_t cid = field().is_nullable() ? value()->Type()->ToNullableCid()
+                                             : value()->Type()->ToCid();
+  if (field().guarded_cid() == cid) {
+    return NULL;  // Value is guaranteed to have this cid.
+  }
+
+

[Kevin Millikin (Google), 2013/03/13 16:03:36]

There is an extra blank line.

+  return this;
+}
+
+
 Instruction* CheckSmiInstr::Canonicalize(FlowGraphOptimizer* optimizer) {
   return (value()->Type()->ToCid() == kSmiCid) ?  NULL : this;
 }
 
 
 Instruction* CheckEitherNonSmiInstr::Canonicalize(
     FlowGraphOptimizer* optimizer) {
   if ((left()->Type()->ToCid() == kDoubleCid) ||
       (right()->Type()->ToCid() == kDoubleCid)) {
     return NULL;  // Remove from the graph.
@@ skipping 965 matching lines @@
     default:
       UNREACHABLE();
   }
   return kPowRuntimeEntry;
 }
 
 
 #undef __
 
 }  // namespace dart