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

runtime/vm/precompiler.h

 // Copyright (c) 2015, 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_PRECOMPILER_H_
 #define RUNTIME_VM_PRECOMPILER_H_
 
 #include "vm/allocation.h"
 #include "vm/hash_map.h"
 #include "vm/hash_table.h"
@@ skipping 48 matching lines @@
 
   static inline intptr_t Hashcode(Key key) { return key->Hash(); }
 
   static inline bool IsKeyEqual(Pair pair, Key key) {
     return pair->raw() == key->raw();
   }
 };
 
 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:
   // Typedefs needed for the DirectChainedHashMap template.
   typedef const UnlinkedCall* Key;
   typedef const UnlinkedCall* Value;
   typedef const UnlinkedCall* Pair;
 
   static Key KeyOf(Pair kv) { return kv; }
 
@@ skipping 321 matching lines @@
   void DropFields();
   void TraceTypesFromRetainedClasses();
   void DropTypes();
   void DropTypeArguments();
   void DropScriptData();
   void DropClasses();
   void DropLibraries();
 
   void BindStaticCalls();
   void SwitchICCalls();
-  void ShareMegamorphicBuckets();
-  void DedupStackMaps();
-  void DedupCodeSourceMaps();
-  void DedupLists();
-  void DedupInstructions();
   void ResetPrecompilerState();
 
   void CollectDynamicFunctionNames();
 
   void PrecompileStaticInitializers();
   void PrecompileConstructors();
 
   void FinalizeAllClasses();
   void VerifyJITFeedback();
   RawScript* LookupScript(const char* uri);
@@ skipping 64 matching lines @@
   }
   static RawObject* NewKey(const Function& function) { return function.raw(); }
 };
 
 typedef UnorderedHashSet<FunctionsTraits> UniqueFunctionsSet;
 
 
 }  // namespace dart
 
 #endif  // RUNTIME_VM_PRECOMPILER_H_