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

runtime/vm/kernel_binary_flowgraph.cc

 // 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.
 
 #include "vm/kernel_binary_flowgraph.h"
 
 #include "vm/object_store.h"
 
 #if !defined(DART_PRECOMPILED_RUNTIME)
 
@@ skipping 42 matching lines @@
 
     CacheConstantValue(offset, result_);
   }
   // We return a new `ZoneHandle` here on purpose: The intermediate language
   // instructions do not make a copy of the handle, so we do it.
   return dart::Instance::ZoneHandle(Z, result_.raw());
 }
 
 void StreamingConstantEvaluator::EvaluateStaticGet() {
   builder_->ReadPosition();
-  int canonical_name_index = builder_->ReadUInt();
-  CanonicalName* target = builder_->GetCanonicalName(canonical_name_index);
+  intptr_t target = builder_->ReadUInt() - 1;

[Vyacheslav Egorov (Google), 2017/05/03 06:28:48]

might be worth having a helper called ReadCanonicalNameReference similar to one
in the reader. 

otherwise -1 is way too confusing.

 
   if (H.IsField(target)) {
     const dart::Field& field =
         dart::Field::Handle(Z, H.LookupFieldByKernelField(target));
     if (field.StaticValue() == Object::sentinel().raw() ||
         field.StaticValue() == Object::transition_sentinel().raw()) {
       field.EvaluateInitializer();
       result_ = field.StaticValue();
       result_ = H.Canonicalize(result_);
       field.SetStaticValue(result_, true);
@@ skipping 229 matching lines @@
     case kNullLiteral:
       return BuildNullLiteral();
     default:
       UNREACHABLE();
   }
 
   return Fragment();
 }
 
 
-CanonicalName* StreamingFlowGraphBuilder::GetCanonicalName(intptr_t index) {
-  if (index == 0) return NULL;
-  --index;
-
-  if (canonical_names_ != NULL && canonical_names_entries_read_ > index) {
-    return canonical_names_[index];
-  }
-
-  intptr_t saved_offset = ReaderOffset();
-  if (canonical_names_ == NULL) {
-    // Find offset from where to read canonical names table.
-
-    // Skip the magic number.
-    reader_->set_offset(4);
-
-    // Skip the string table.  The last offset is the end offset of the last
-    // string which gives the length of the string data.
-    intptr_t list_length = ReadListLength();
-    intptr_t end_offset = 0;
-    for (intptr_t i = 0; i < list_length; ++i) {
-      end_offset = ReadUInt();
-    }
-    SkipBytes(end_offset);
-
-    // There is another string table for the source URIs.  Skip it as well.
-    list_length = ReadListLength();
-    end_offset = 0;
-    for (intptr_t i = 0; i < list_length; ++i) {
-      end_offset = ReadUInt();
-    }
-    SkipBytes(end_offset);
-
-    // Source code table
-    for (intptr_t i = 0; i < list_length; ++i) {
-      // Source code
-      intptr_t bytes = ReadUInt();
-      SkipBytes(bytes);
-
-      // Line starts table
-      intptr_t line_count = ReadUInt();
-      for (intptr_t j = 0; j < line_count; ++j) {
-        ReadUInt();
-      }
-    }
-
-    // Now at canonical names table.
-    canonical_names_size_ = ReadUInt();
-    canonical_names_ = new CanonicalName*[canonical_names_size_];
-    canonical_names_next_offset_ = ReaderOffset();
-  }
-
-  SetOffset(canonical_names_next_offset_);
-  for (; canonical_names_entries_read_ <= index;
-       ++canonical_names_entries_read_) {
-    intptr_t biased_parent_index = ReadUInt();
-    CanonicalName* parent;
-    if (biased_parent_index != 0) {
-      parent = canonical_names_[biased_parent_index - 1];
-    } else {
-      if (canonical_names_entries_read_ == 0) {
-        parent = CanonicalName::NewRoot();
-      } else {
-        parent = canonical_names_[0]->parent();
-      }
-    }
-    ASSERT(parent != NULL);
-    intptr_t name_index = ReadUInt();
-    CanonicalName* canonical_name = parent->AddChild(name_index);
-    canonical_names_[canonical_names_entries_read_] = canonical_name;
-  }
-
-  canonical_names_next_offset_ = ReaderOffset();
-
-  SetOffset(saved_offset);
-  return canonical_names_[index];
-}
-
-
 intptr_t StreamingFlowGraphBuilder::ReaderOffset() {
   return reader_->offset();
 }
 
 
 void StreamingFlowGraphBuilder::SetOffset(intptr_t offset) {
   reader_->set_offset(offset);
 }
 
 
@@ skipping 89 matching lines @@
   // The frontend will take care of emitting normal errors (like
   // [NoSuchMethodError]s) and only emit [InvalidExpression]s in very special
   // situations (e.g. an invalid annotation).
   return ThrowNoSuchMethodError();
 }
 
 
 Fragment StreamingFlowGraphBuilder::BuildStaticGet() {
   intptr_t saved_offset = ReaderOffset() - 1;  // Include the tag.
   TokenPosition position = ReadPosition();
-  int canonical_name_index = ReadUInt();
-  CanonicalName* target = GetCanonicalName(canonical_name_index);
+  intptr_t target = ReadUInt() - 1;

[Vyacheslav Egorov (Google), 2017/05/03 06:28:48]

ditto

 
   if (H.IsField(target)) {
     const dart::Field& field =
         dart::Field::ZoneHandle(Z, H.LookupFieldByKernelField(target));
     if (field.is_const()) {
       SetOffset(saved_offset);  // EvaluateExpression needs the tag.
       return Constant(constant_evaluator_.EvaluateExpression());
     } else {
       const dart::Class& owner = dart::Class::Handle(Z, field.Owner());
       const dart::String& getter_name = H.DartGetterName(target);
@@ skipping 85 matching lines @@
 
 Fragment StreamingFlowGraphBuilder::BuildNullLiteral() {
   return Constant(Instance::ZoneHandle(Z, Instance::null()));
 }
 
 
 }  // namespace kernel
 }  // namespace dart
 
 #endif  // !defined(DART_PRECOMPILED_RUNTIME)