VM: Compute static guarded cid for final instance fields.

runtime/vm/hash_map.h

 // Copyright (c) 2012, 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_HASH_MAP_H_
 #define VM_HASH_MAP_H_
 
 #include "vm/growable_array.h"  // For Malloc, EmptyBase
 #include "vm/zone.h"
 
@@ skipping 150 matching lines @@
   const typename KeyValueTrait::Value kNoValue =
       KeyValueTrait::ValueOf(typename KeyValueTrait::Pair());
   typename KeyValueTrait::Pair* pair = Lookup(key);
   return (pair == NULL) ? kNoValue : KeyValueTrait::ValueOf(*pair);
 }
 
 
 template<typename KeyValueTrait, typename B, typename Allocator>
 typename KeyValueTrait::Pair*
     BaseDirectChainedHashMap<KeyValueTrait, B, Allocator>::Iterator::Next() {
-  const typename KeyValueTrait::Pair kNoPair = typename KeyValueTrait::Pair();
+  const typename KeyValueTrait::Value kNoValue =
+      KeyValueTrait::ValueOf(typename KeyValueTrait::Pair());
 
   if (array_index_ < map_.array_size_) {
     // If we're not in the middle of a list, find the next array slot.
     if (list_index_ == kNil) {
-      while ((map_.array_[array_index_].kv == kNoPair) &&
-             (array_index_ < map_.array_size_)) {
+      while (KeyValueTrait::ValueOf(map_.array_[array_index_].kv) == kNoValue &&
+             array_index_ < map_.array_size_) {
         array_index_++;
       }
       if (array_index_ < map_.array_size_) {
         // When we're done with the list, we'll continue with the next array
         // slot.
         const intptr_t old_array_index = array_index_;
         array_index_++;
         list_index_ = map_.array_[old_array_index].next;
         return &map_.array_[old_array_index].kv;
       } else {
@@ skipping 171 matching lines @@
 
   static intptr_t KeyOf(Pair kv) { return kv.first(); }
   static T ValueOf(Pair kv) { return kv; }
   static inline intptr_t Hashcode(Key key) { return key; }
   static inline bool IsKeyEqual(Pair kv, Key key) { return kv.first() == key; }
 };
 
 }  // namespace dart
 
 #endif  // VM_HASH_MAP_H_