[kernel] Don't use kernel ast nodes as keys

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 483 matching lines @@
     return name;
   }
 
   CanonicalName* ReadDefiningCanonicalNameReference(LinkedNode* node_to_link) {
     CanonicalName* name = ReadCanonicalNameReference();
     ASSERT(name != NULL);
     name->BindTo(node_to_link);
     return name;
   }
 
+  int64_t offset() { return offset_; }
+
  private:
   const uint8_t* buffer_;
   int64_t size_;
   int64_t offset_;
   ReaderHelper builder_;
   TokenPosition max_position_;
   TokenPosition min_position_;
   intptr_t current_script_id_;
 
   friend class PositionScope;
@@ skipping 285 matching lines @@
   int index = reader->ReadUInt();
   return reader->helper()->program()->string_table().strings()[index];
 }
 
 
 Field* Field::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
   Tag tag = reader->ReadTag();
   ASSERT(tag == kField);
 
+  kernelFileOffset_ = reader->offset();
   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);
@@ skipping 561 matching lines @@
   TRACE_READ_OFFSET();
   AwaitExpression* await = new AwaitExpression();
   await->operand_ = Expression::ReadFrom(reader);
   return await;
 }
 
 
 FunctionExpression* FunctionExpression::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
   VariableScope<ReaderHelper> parameters(reader->helper());
-  FunctionExpression* expr = new FunctionExpression();
+  FunctionExpression* expr = new FunctionExpression(reader->offset());
   expr->function_ = FunctionNode::ReadFrom(reader);
   return expr;
 }
 
 
 Let* Let::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
   VariableScope<ReaderHelper> vars(reader->helper());
   PositionScope scope(reader);
 
-  Let* let = new Let();
+  Let* let = new Let(reader->offset());
   let->variable_ = VariableDeclaration::ReadFromImpl(reader);
   let->body_ = Expression::ReadFrom(reader);
   let->position_ = reader->min_position();
   let->end_position_ = reader->max_position();
 
   return let;
 }
 
 
 Statement* Statement::ReadFrom(Reader* reader) {
@@ skipping 59 matching lines @@
   TRACE_READ_OFFSET();
   return new ExpressionStatement(Expression::ReadFrom(reader));
 }
 
 
 Block* Block::ReadFromImpl(Reader* reader) {
   TRACE_READ_OFFSET();
   PositionScope scope(reader);
 
   VariableScope<ReaderHelper> vars(reader->helper());
-  Block* block = new Block();
+  Block* block = new Block(reader->offset());
   block->statements().ReadFromStatic<Statement>(reader);
   block->position_ = reader->min_position();
   block->end_position_ = reader->max_position();
 
   return block;
 }
 
 
 EmptyStatement* EmptyStatement::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
@@ skipping 45 matching lines @@
   dostmt->condition_ = Expression::ReadFrom(reader);
   return dostmt;
 }
 
 
 ForStatement* ForStatement::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
   VariableScope<ReaderHelper> vars(reader->helper());
   PositionScope scope(reader);
 
-  ForStatement* forstmt = new ForStatement();
+  ForStatement* forstmt = new ForStatement(reader->offset());
   forstmt->variables_.ReadFromStatic<VariableDeclarationImpl>(reader);
   forstmt->condition_ = reader->ReadOptional<Expression>();
   forstmt->updates_.ReadFromStatic<Expression>(reader);
   forstmt->body_ = Statement::ReadFrom(reader);
   forstmt->end_position_ = reader->max_position();
   forstmt->position_ = reader->min_position();
 
   return forstmt;
 }
 
 
 ForInStatement* ForInStatement::ReadFrom(Reader* reader, bool is_async) {
   TRACE_READ_OFFSET();
   VariableScope<ReaderHelper> vars(reader->helper());
   PositionScope scope(reader);
 
-  ForInStatement* forinstmt = new ForInStatement();
+  ForInStatement* forinstmt = new ForInStatement(reader->offset());
   forinstmt->is_async_ = is_async;
   forinstmt->position_ = reader->ReadPosition();
   forinstmt->variable_ = VariableDeclaration::ReadFromImpl(reader);
   forinstmt->iterable_ = Expression::ReadFrom(reader);
   forinstmt->body_ = Statement::ReadFrom(reader);
   forinstmt->end_position_ = reader->max_position();
   if (!forinstmt->position_.IsReal()) {
     forinstmt->position_ = reader->min_position();
   }
   forinstmt->variable_->set_end_position(forinstmt->position_);
@@ skipping 73 matching lines @@
 
   return tc;
 }
 
 
 Catch* Catch::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
   VariableScope<ReaderHelper> vars(reader->helper());
   PositionScope scope(reader);
 
-  Catch* c = new Catch();
+  Catch* c = new Catch(reader->offset());
   c->guard_ = DartType::ReadFrom(reader);
   c->exception_ =
       reader->ReadOptional<VariableDeclaration, VariableDeclarationImpl>();
   c->stack_trace_ =
       reader->ReadOptional<VariableDeclaration, VariableDeclarationImpl>();
   c->body_ = Statement::ReadFrom(reader);
   c->end_position_ = reader->max_position();
   c->position_ = reader->min_position();
 
   return c;
@@ skipping 25 matching lines @@
   Tag tag = reader->ReadTag();
   ASSERT(tag == kVariableDeclaration);
   return VariableDeclaration::ReadFromImpl(reader);
 }
 
 
 VariableDeclaration* VariableDeclaration::ReadFromImpl(Reader* reader) {
   TRACE_READ_OFFSET();
   PositionScope scope(reader);
 
-  VariableDeclaration* decl = new VariableDeclaration();
+  VariableDeclaration* decl = new VariableDeclaration(reader->offset());
   decl->position_ = reader->ReadPosition();
   decl->equals_position_ = reader->ReadPosition();
   decl->flags_ = reader->ReadFlags();
   decl->name_ = Reference::ReadStringFrom(reader);
   decl->type_ = DartType::ReadFrom(reader);
   decl->inferred_value_ = reader->ReadOptional<InferredValue>();
   decl->initializer_ = reader->ReadOptional<Expression>();
 
   // Go to next token position so it ends *after* the last potentially
   // debuggable position in the initializer.
   TokenPosition position = reader->max_position();
   if (position.IsReal()) position.Next();
   decl->end_position_ = position;
   reader->helper()->variables().Push(decl);
 
   return decl;
 }
 
 
 FunctionDeclaration* FunctionDeclaration::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
-  FunctionDeclaration* decl = new FunctionDeclaration();
+  FunctionDeclaration* decl = new FunctionDeclaration(reader->offset());
   decl->position_ = reader->ReadPosition();
   decl->variable_ = VariableDeclaration::ReadFromImpl(reader);
   VariableScope<ReaderHelper> parameters(reader->helper());
   decl->function_ = FunctionNode::ReadFrom(reader);
   return decl;
 }
 
 
 Name* Name::ReadFrom(Reader* reader) {
   String* string = Reference::ReadStringFrom(reader);
@@ skipping 161 matching lines @@
 #endif
 
   return program;
 }
 
 
 FunctionNode* FunctionNode::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
   TypeParameterScope<ReaderHelper> scope(reader->helper());
 
-  FunctionNode* function = new FunctionNode();
+  FunctionNode* function = new FunctionNode(reader->offset());
   function->position_ = reader->ReadPosition();
   function->end_position_ = reader->ReadPosition();
   function->async_marker_ =
       static_cast<FunctionNode::AsyncMarker>(reader->ReadByte());
   function->dart_async_marker_ =
       static_cast<FunctionNode::AsyncMarker>(reader->ReadByte());
   function->type_parameters().ReadFrom(reader);
   function->required_parameter_count_ = reader->ReadUInt();
   function->positional_parameters().ReadFromStatic<VariableDeclarationImpl>(
       reader);
@@ skipping 22 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)