Revert "Remove definitions from Kernel canonical names."

runtime/vm/kernel_binary.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.
 #if !defined(DART_PRECOMPILED_RUNTIME)
 
 #include "platform/globals.h"
 #include "vm/flags.h"
 #include "vm/growable_array.h"
 #include "vm/kernel.h"
 #include "vm/kernel_to_il.h"
@@ skipping 476 matching lines @@
   ReaderHelper* helper() { return &builder_; }
 
   CanonicalName* ReadCanonicalNameReference() {
     int index = ReadUInt();
     if (index == 0) return NULL;
     CanonicalName* name = builder_.GetCanonicalName(index - 1);
     ASSERT(name != NULL);
     return name;
   }
 
+  CanonicalName* ReadDefiningCanonicalNameReference(LinkedNode* node_to_link) {
+    CanonicalName* name = ReadCanonicalNameReference();
+    ASSERT(name != NULL);
+    name->BindTo(node_to_link);
+    return name;
+  }
+
   intptr_t offset() { return offset_; }
 
  private:
   const uint8_t* buffer_;
   intptr_t size_;
   intptr_t offset_;
   ReaderHelper builder_;
   TokenPosition max_position_;
   TokenPosition min_position_;
   intptr_t current_script_id_;
@@ skipping 166 matching lines @@
     line_starts_[i] = line_starts;
   }
 }
 
 
 Library* Library::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
   int flags = reader->ReadFlags();
   ASSERT(flags == 0);  // external libraries not supported
 
-  canonical_name_ = reader->ReadCanonicalNameReference();
+  CanonicalName* canonical_name =
+      reader->ReadDefiningCanonicalNameReference(this);
+
   name_ = Reference::ReadStringFrom(reader);
-  import_uri_ = canonical_name_->name();
+  import_uri_ = canonical_name->name();
   source_uri_index_ = reader->ReadUInt();
   reader->set_current_script_id(source_uri_index_);
 
   int num_imports = reader->ReadUInt();
   if (num_imports != 0) {
     FATAL("Deferred imports not implemented in VM");
   }
   int num_classes = reader->ReadUInt();
   classes().EnsureInitialized(num_classes);
   for (intptr_t i = 0; i < num_classes; i++) {
     Tag tag = reader->ReadTag();
     ASSERT(tag == kClass);
     NormalClass* klass = classes().GetOrCreate<NormalClass>(i, this);
     klass->ReadFrom(reader);
   }
 
   fields().ReadFrom<Field>(reader, this);
   procedures().ReadFrom<Procedure>(reader, this);
   return this;
 }
 
 
 Class* Class::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
 
-  canonical_name_ = reader->ReadCanonicalNameReference();
+  reader->ReadDefiningCanonicalNameReference(this);
   position_ = reader->ReadPosition(false);
   is_abstract_ = reader->ReadBool();
   name_ = Reference::ReadStringFrom(reader);
   source_uri_index_ = reader->ReadUInt();
   reader->set_current_script_id(source_uri_index_);
   reader->record_token_position(position_);
   annotations_.ReadFromStatic<Expression>(reader);
 
   return this;
 }
@@ skipping 71 matching lines @@
   return reader->helper()->program()->string_table().strings()[index];
 }
 
 
 Field* Field::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
   kernel_offset_ = reader->offset();  // Notice the ReadTag() below.
   Tag tag = reader->ReadTag();
   ASSERT(tag == kField);
 
-  canonical_name_ = reader->ReadCanonicalNameReference();
+  reader->ReadDefiningCanonicalNameReference(this);
   position_ = reader->ReadPosition(false);
   end_position_ = reader->ReadPosition(false);
   flags_ = reader->ReadFlags();
   name_ = Name::ReadFrom(reader);
   source_uri_index_ = reader->ReadUInt();
   reader->set_current_script_id(source_uri_index_);
   reader->record_token_position(position_);
   reader->record_token_position(end_position_);
   annotations_.ReadFromStatic<Expression>(reader);
   type_ = DartType::ReadFrom(reader);
   initializer_ = reader->ReadOptional<Expression>();
   return this;
 }
 
 
 Constructor* Constructor::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
   Tag tag = reader->ReadTag();
   ASSERT(tag == kConstructor);
 
-  canonical_name_ = reader->ReadCanonicalNameReference();
+  reader->ReadDefiningCanonicalNameReference(this);
   VariableScope<ReaderHelper> parameters(reader->helper());
   position_ = reader->ReadPosition();
   end_position_ = reader->ReadPosition();
   flags_ = reader->ReadFlags();
   name_ = Name::ReadFrom(reader);
   annotations_.ReadFromStatic<Expression>(reader);
   function_ = FunctionNode::ReadFrom(reader);
   initializers_.ReadFromStatic<Initializer>(reader);
   return this;
 }
 
 
 Procedure* Procedure::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
   Tag tag = reader->ReadTag();
   ASSERT(tag == kProcedure);
 
-  canonical_name_ = reader->ReadCanonicalNameReference();
+  reader->ReadDefiningCanonicalNameReference(this);
   VariableScope<ReaderHelper> parameters(reader->helper());
   position_ = reader->ReadPosition(false);
   end_position_ = reader->ReadPosition(false);
   kind_ = static_cast<ProcedureKind>(reader->ReadByte());
   flags_ = reader->ReadFlags();
   name_ = Name::ReadFrom(reader);
   source_uri_index_ = reader->ReadUInt();
   reader->set_current_script_id(source_uri_index_);
   reader->record_token_position(position_);
   reader->record_token_position(end_position_);
@@ skipping 1021 matching lines @@
   }
 
   int libraries = reader->ReadUInt();
   program->libraries().EnsureInitialized(libraries);
   for (intptr_t i = 0; i < libraries; i++) {
     program->libraries().GetOrCreate<Library>(i)->ReadFrom(reader);
   }
 
   program->main_method_reference_ = Reference::ReadMemberFrom(reader);
 
+#ifdef DEBUG
+  for (intptr_t i = 0; i < canonical_names; ++i) {
+    CanonicalName* name = reader->helper()->GetCanonicalName(i);
+    if (name->is_referenced() && name->definition() == NULL) {
+      FATAL("Missing definition for canonical name");
+    }
+  }
+#endif
+
   return program;
 }
 
 
 FunctionNode* FunctionNode::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
   TypeParameterScope<ReaderHelper> scope(reader->helper());
 
   FunctionNode* function = new FunctionNode();
   function->kernel_offset_ = reader->offset();  // FunctionNode has no tag.
@@ skipping 31 matching lines @@
 
 kernel::Program* ReadPrecompiledKernelFromBuffer(const uint8_t* buffer,
                                                  intptr_t buffer_length) {
   kernel::Reader reader(buffer, buffer_length);
   return kernel::Program::ReadFrom(&reader);
 }
 
 
 }  // namespace dart
 #endif  // !defined(DART_PRECOMPILED_RUNTIME)