Refactor AOT deduplication steps so they can run before an app-jit snapshot as well.

runtime/vm/precompiler.h

Index: runtime/vm/precompiler.h
diff --git a/runtime/vm/precompiler.h b/runtime/vm/precompiler.h
index 3989c1feae6b6a30e678ccb5d297c5ca27e565bf..911ba8d4c534965699ab3d9dabbfd515fdeabb8e 100644
--- a/runtime/vm/precompiler.h
+++ b/runtime/vm/precompiler.h
@@ -66,97 +66,6 @@ class SymbolKeyValueTrait {
 
 typedef DirectChainedHashMap<SymbolKeyValueTrait> SymbolSet;
 
-class StackMapKeyValueTrait {
- public:
-  // Typedefs needed for the DirectChainedHashMap template.
-  typedef const StackMap* Key;
-  typedef const StackMap* Value;
-  typedef const StackMap* Pair;
-
-  static Key KeyOf(Pair kv) { return kv; }
-
-  static Value ValueOf(Pair kv) { return kv; }
-
-  static inline intptr_t Hashcode(Key key) { return key->PcOffset(); }
-
-  static inline bool IsKeyEqual(Pair pair, Key key) {
-    return pair->Equals(*key);
-  }
-};
-
-typedef DirectChainedHashMap<StackMapKeyValueTrait> StackMapSet;
-
-
-class CodeSourceMapKeyValueTrait {
- public:
-  // Typedefs needed for the DirectChainedHashMap template.
-  typedef const CodeSourceMap* Key;
-  typedef const CodeSourceMap* Value;
-  typedef const CodeSourceMap* Pair;
-
-  static Key KeyOf(Pair kv) { return kv; }
-
-  static Value ValueOf(Pair kv) { return kv; }
-
-  static inline intptr_t Hashcode(Key key) { return key->Length(); }
-
-  static inline bool IsKeyEqual(Pair pair, Key key) {
-    return pair->Equals(*key);
-  }
-};
-
-typedef DirectChainedHashMap<CodeSourceMapKeyValueTrait> CodeSourceMapSet;
-
-
-class ArrayKeyValueTrait {
- public:
-  // Typedefs needed for the DirectChainedHashMap template.
-  typedef const Array* Key;
-  typedef const Array* Value;
-  typedef const Array* Pair;
-
-  static Key KeyOf(Pair kv) { return kv; }
-
-  static Value ValueOf(Pair kv) { return kv; }
-
-  static inline intptr_t Hashcode(Key key) { return key->Length(); }
-
-  static inline bool IsKeyEqual(Pair pair, Key key) {
-    if (pair->Length() != key->Length()) {
-      return false;
-    }
-    for (intptr_t i = 0; i < pair->Length(); i++) {
-      if (pair->At(i) != key->At(i)) {
-        return false;
-      }
-    }
-    return true;
-  }
-};
-
-typedef DirectChainedHashMap<ArrayKeyValueTrait> ArraySet;
-
-
-class InstructionsKeyValueTrait {
- public:
-  // Typedefs needed for the DirectChainedHashMap template.
-  typedef const Instructions* Key;
-  typedef const Instructions* Value;
-  typedef const Instructions* Pair;
-
-  static Key KeyOf(Pair kv) { return kv; }
-
-  static Value ValueOf(Pair kv) { return kv; }
-
-  static inline intptr_t Hashcode(Key key) { return key->Size(); }
-
-  static inline bool IsKeyEqual(Pair pair, Key key) {
-    return pair->Equals(*key);
-  }
-};
-
-typedef DirectChainedHashMap<InstructionsKeyValueTrait> InstructionsSet;
-
 
 class UnlinkedCallKeyValueTrait {
  public:
@@ -498,11 +407,6 @@ class Precompiler : public ValueObject {
 
   void BindStaticCalls();
   void SwitchICCalls();
-  void ShareMegamorphicBuckets();
-  void DedupStackMaps();
-  void DedupCodeSourceMaps();
-  void DedupLists();
-  void DedupInstructions();
   void ResetPrecompilerState();
 
   void CollectDynamicFunctionNames();