Move the Kernel canonical name table into the VM's heap

runtime/vm/kernel_binary_flowgraph.h

 // Copyright (c) 2017, 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_BINARY_FLOWGRAPH_H_
 #define RUNTIME_VM_KERNEL_BINARY_FLOWGRAPH_H_
 
 #if !defined(DART_PRECOMPILED_RUNTIME)
 
 #include <map>
@@ skipping 42 matching lines @@
 
 
 class StreamingFlowGraphBuilder {
  public:
   StreamingFlowGraphBuilder(FlowGraphBuilder* flow_graph_builder,
                             const uint8_t* buffer,
                             intptr_t buffer_length)
       : flow_graph_builder_(flow_graph_builder),
         translation_helper_(flow_graph_builder->translation_helper_),
         zone_(flow_graph_builder->zone_),
-        reader_(new kernel::Reader(buffer, buffer_length)),
+        reader_(new Reader(buffer, buffer_length)),
         constant_evaluator_(this,
                             flow_graph_builder->zone_,
                             &flow_graph_builder->translation_helper_,
-                            &flow_graph_builder->type_translator_),
-        canonical_names_(NULL),
-        canonical_names_size_(-1),
-        canonical_names_entries_read_(0),
-        canonical_names_next_offset_(-1) {}
+                            &flow_graph_builder->type_translator_) {}
 
-  virtual ~StreamingFlowGraphBuilder() {
-    delete reader_;
-    // The canonical names themselves are not (yet) deallocated.
-    delete[] canonical_names_;
-  }
+  virtual ~StreamingFlowGraphBuilder() {}
 
   Fragment BuildAt(intptr_t kernel_offset);
 
  private:
-  CanonicalName* GetCanonicalName(intptr_t index);
-
   intptr_t ReaderOffset();
   void SetOffset(intptr_t offset);
   void SkipBytes(intptr_t skip);
   uint32_t ReadUInt();
   intptr_t ReadListLength();
   TokenPosition ReadPosition(bool record = true);
   Tag ReadTag(uint8_t* payload = NULL);
 
   CatchBlock* catch_block();
   ScopeBuildingResult* scopes();
@@ skipping 20 matching lines @@
   Fragment BuildStringLiteral();
   Fragment BuildIntLiteral(uint8_t payload);
   Fragment BuildIntLiteral(bool is_negative);
   Fragment BuildDoubleLiteral();
   Fragment BuildBoolLiteral(bool value);
   Fragment BuildNullLiteral();
 
   FlowGraphBuilder* flow_graph_builder_;
   TranslationHelper& translation_helper_;
   Zone* zone_;
-  kernel::Reader* reader_;
+  Reader* reader_;
   StreamingConstantEvaluator constant_evaluator_;
 
-  CanonicalName** canonical_names_;
-  intptr_t canonical_names_size_;
-  intptr_t canonical_names_entries_read_;
-  intptr_t canonical_names_next_offset_;
-
   friend class StreamingConstantEvaluator;
 };
 
 
 }  // namespace kernel
 }  // namespace dart
 
 #endif  // !defined(DART_PRECOMPILED_RUNTIME)
 #endif  // RUNTIME_VM_KERNEL_BINARY_FLOWGRAPH_H_