Revert "[kernel] Don't use kernel ast nodes as keys"

runtime/vm/kernel_to_il.h

 // Copyright (c) 2016, 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 RUNTIME_VM_KERNEL_TO_IL_H_
 #define RUNTIME_VM_KERNEL_TO_IL_H_
 
 #if !defined(DART_PRECOMPILED_RUNTIME)
 
 #include "vm/growable_array.h"
@@ skipping 63 matching lines @@
     } else {
       return pair->value;
     }
   }
 
   inline Pair* LookupPair(const Key& key) {
     return DirectChainedHashMap<RawPointerKeyValueTrait<K, V> >::Lookup(key);
   }
 };
 
-
-template <typename V>
-class IntKeyRawPointerValueTrait {
- public:
-  typedef intptr_t Key;
-  typedef V Value;
-
-  struct Pair {
-    Key key;
-    Value value;
-    Pair() : key(NULL), value() {}
-    Pair(const Key key, const Value& value) : key(key), value(value) {}
-    Pair(const Pair& other) : key(other.key), value(other.value) {}
-  };
-
-  static Key KeyOf(Pair kv) { return kv.key; }
-  static Value ValueOf(Pair kv) { return kv.value; }
-  static intptr_t Hashcode(Key key) { return reinterpret_cast<intptr_t>(key); }
-  static bool IsKeyEqual(Pair kv, Key key) { return kv.key == key; }
-};
-
-template <typename V>
-class IntMap : public DirectChainedHashMap<IntKeyRawPointerValueTrait<V> > {
- public:
-  typedef typename IntKeyRawPointerValueTrait<V>::Key Key;
-  typedef typename IntKeyRawPointerValueTrait<V>::Value Value;
-  typedef typename IntKeyRawPointerValueTrait<V>::Pair Pair;
-
-  inline void Insert(const Key& key, const Value& value) {
-    Pair pair(key, value);
-    DirectChainedHashMap<IntKeyRawPointerValueTrait<V> >::Insert(pair);
-  }
-
-  inline V Lookup(const Key& key) {
-    Pair* pair =
-        DirectChainedHashMap<IntKeyRawPointerValueTrait<V> >::Lookup(key);
-    if (pair == NULL) {
-      return V();
-    } else {
-      return pair->value;
-    }
-  }
-
-  inline Pair* LookupPair(const Key& key) {
-    return DirectChainedHashMap<IntKeyRawPointerValueTrait<V> >::Lookup(key);
-  }
-};
-
 template <typename K, typename V>
 class MallocMap
     : public MallocDirectChainedHashMap<RawPointerKeyValueTrait<K, V> > {
  public:
   typedef typename RawPointerKeyValueTrait<K, V>::Key Key;
   typedef typename RawPointerKeyValueTrait<K, V>::Value Value;
   typedef typename RawPointerKeyValueTrait<K, V>::Pair Pair;
 
   inline void Insert(const Key& key, const Value& value) {
     Pair pair(key, value);
@@ skipping 401 matching lines @@
   Zone* zone_;
   TranslationHelper& translation_helper_;
   DartTypeTranslator& type_translator_;
 
   Script& script_;
   Instance& result_;
 };
 
 
 struct FunctionScope {
-  intptr_t kernel_offset;
+  FunctionNode* function;
   LocalScope* scope;
 };
 
 
 class ScopeBuildingResult : public ZoneAllocated {
  public:
   ScopeBuildingResult()
       : this_variable(NULL),
         type_arguments_variable(NULL),
         switch_variable(NULL),
         finally_return_variable(NULL),
         setter_value(NULL),
         yield_jump_variable(NULL),
         yield_context_variable(NULL) {}
 
-  IntMap<LocalVariable*> locals;
-  IntMap<LocalScope*> scopes;
+  Map<VariableDeclaration, LocalVariable*> locals;
+  Map<TreeNode, LocalScope*> scopes;
   GrowableArray<FunctionScope> function_scopes;
 
   // Only non-NULL for instance functions.
   LocalVariable* this_variable;
 
   // Only non-NULL for factory constructor functions.
   LocalVariable* type_arguments_variable;
 
   // Non-NULL when the function contains a switch statement.
   LocalVariable* switch_variable;
@@ skipping 496 matching lines @@
 namespace kernel {
 
 RawObject* EvaluateMetadata(TreeNode* const kernel_node);
 RawObject* BuildParameterDescriptor(TreeNode* const kernel_node);
 
 }  // namespace kernel
 }  // namespace dart
 
 #endif  // !defined(DART_PRECOMPILED_RUNTIME)
 #endif  // RUNTIME_VM_KERNEL_TO_IL_H_