Move the Kernel string offsets into the VM's heap.

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 "vm/kernel_binary.h"
 #include "platform/globals.h"
 #include "vm/flags.h"
 #include "vm/growable_array.h"
 #include "vm/kernel.h"
@@ skipping 69 matching lines @@
     reader->helper()->type_parameters().Push(parameter);
   }
 
   // Read all [TypeParameter]s and their bounds.
   for (intptr_t i = 0; i < length; i++) {
     (*this)[i]->ReadFrom(reader);
   }
 }
 
 
-template <typename A, typename B>
-Tuple<A, B>* Tuple<A, B>::ReadFrom(Reader* reader) {
+NamedParameter* NamedParameter::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
-  A* first = A::ReadFrom(reader);
-  B* second = B::ReadFrom(reader);
-  return new Tuple<A, B>(first, second);
+  intptr_t name_index = reader->ReadUInt();
+  DartType* type = DartType::ReadFrom(reader);
+  return new NamedParameter(name_index, type);
 }
 
 
 template <typename B, typename S>
 class DowncastReader {
  public:
   static S* ReadFrom(Reader* reader) {
     TRACE_READ_OFFSET();
     return S::Cast(B::ReadFrom(reader));
   }
 };
 
 
 class VariableDeclarationImpl {
  public:
   static VariableDeclaration* ReadFrom(Reader* reader) {
     TRACE_READ_OFFSET();
     return VariableDeclaration::ReadFromImpl(reader, false);
   }
 };
 
 
-String* String::ReadFrom(Reader* reader) {
-  TRACE_READ_OFFSET();
-  return Reference::ReadStringFrom(reader);
-}
-
-
-String* String::ReadRaw(Reader* reader, intptr_t size) {
-  ASSERT(reader->string_data_offset() >= 0);
-  String* result =
-      new String(reader->offset() - reader->string_data_offset(), size);
-  reader->Consume(size);
-  return result;
-}
-
-
-void StringTable::ReadFrom(Reader* reader) {
-  TRACE_READ_OFFSET();
-  // Read the table of end offsets.
-  intptr_t length = reader->ReadUInt();
-  intptr_t* end_offsets = new intptr_t[length];
-  for (intptr_t i = 0; i < length; ++i) {
-    end_offsets[i] = reader->ReadUInt();
-  }
-  // Read the UTF-8 encoded strings.
-  reader->MarkStringDataOffset();
-  strings_.EnsureInitialized(length);
-  intptr_t start_offset = 0;
-  for (intptr_t i = 0; i < length; ++i) {
-    ASSERT(strings_[i] == NULL);
-    strings_[i] = String::ReadRaw(reader, end_offsets[i] - start_offset);
-    start_offset = end_offsets[i];
-  }
-  delete[] end_offsets;
-}
-
-
 void SourceTable::ReadFrom(Reader* reader) {
   size_ = reader->ReadUInt();
   sources_ = new Source[size_];
 
   // Build a table of the URI offsets.
   intptr_t* end_offsets = new intptr_t[size_];
   for (intptr_t i = 0; i < size_; ++i) {
     end_offsets[i] = reader->ReadUInt();
   }
 
@@ skipping 35 matching lines @@
 
 
 Library* Library::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
   int flags = reader->ReadFlags();
   ASSERT(flags == 0);  // external libraries not supported
   kernel_data_ = reader->buffer();
   kernel_data_size_ = reader->size();
 
   canonical_name_ = reader->ReadCanonicalNameReference();
-  name_ = Reference::ReadStringFrom(reader);
-  import_uri_ = canonical_name_->name();
+  name_index_ = reader->ReadUInt();
+  import_uri_index_ = 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_typedefs = reader->ReadUInt();
   typedefs().EnsureInitialized(num_typedefs);
   for (intptr_t i = 0; i < num_typedefs; i++) {
@@ skipping 12 matching lines @@
   procedures().ReadFrom<Procedure>(reader, this);
   return this;
 }
 
 
 Typedef* Typedef::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
 
   canonical_name_ = reader->ReadCanonicalNameReference();
   position_ = reader->ReadPosition(false);
-  name_ = Reference::ReadStringFrom(reader);
+  name_index_ = reader->ReadUInt();
   source_uri_index_ = reader->ReadUInt();
   type_parameters_.ReadFrom(reader);
   type_ = DartType::ReadFrom(reader);
 
   return this;
 }
 
 
 Class* Class::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
 
   canonical_name_ = reader->ReadCanonicalNameReference();
   position_ = reader->ReadPosition(false);
   is_abstract_ = reader->ReadBool();
-  name_ = Reference::ReadStringFrom(reader);
+  name_index_ = reader->ReadUInt();
   source_uri_index_ = reader->ReadUInt();
   reader->set_current_script_id(source_uri_index_);
   reader->record_token_position(position_);
   annotations_.ReadFromStatic<Expression>(reader);
 
   return this;
 }
 
 
 NormalClass* NormalClass::ReadFrom(Reader* reader) {
@@ skipping 70 matching lines @@
   if (canonical_name == NULL) {
     FATAL("Expected a valid typedef reference, but got `null`");
   }
 
   canonical_name->set_referenced(true);
 
   return canonical_name;
 }
 
 
-String* Reference::ReadStringFrom(Reader* reader) {
-  int index = reader->ReadUInt();
-  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();
   position_ = reader->ReadPosition(false);
   end_position_ = reader->ReadPosition(false);
   flags_ = reader->ReadFlags();
@@ skipping 347 matching lines @@
   Arguments* arguments = new Arguments();
   arguments->types().ReadFromStatic<DartType>(reader);
   arguments->positional().ReadFromStatic<Expression>(reader);
   arguments->named().ReadFromStatic<NamedExpression>(reader);
   return arguments;
 }
 
 
 NamedExpression* NamedExpression::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
-  String* name = Reference::ReadStringFrom(reader);
+  intptr_t name_index = reader->ReadUInt();
   Expression* expression = Expression::ReadFrom(reader);
-  return new NamedExpression(name, expression);
+  return new NamedExpression(name_index, expression);
 }
 
 
 MethodInvocation* MethodInvocation::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
   MethodInvocation* invocation = new MethodInvocation();
   invocation->kernel_offset_ = reader->offset() - 1;  // -1 to include tag byte.
   invocation->position_ = reader->ReadPosition();
   invocation->receiver_ = Expression::ReadFrom(reader);
   invocation->name_ = Name::ReadFrom(reader);
@@ skipping 100 matching lines @@
   expr->position_ = reader->ReadPosition();
   expr->operand_ = Expression::ReadFrom(reader);
   expr->type_ = DartType::ReadFrom(reader);
   return expr;
 }
 
 
 StringLiteral* StringLiteral::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
   intptr_t offset = reader->offset() - 1;  // -1 to include tag byte.
-  StringLiteral* lit = new StringLiteral(Reference::ReadStringFrom(reader));
+  StringLiteral* lit = new StringLiteral(reader->ReadUInt());
   lit->kernel_offset_ = offset;
   return lit;
 }
 
 
 BigintLiteral* BigintLiteral::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
   intptr_t offset = reader->offset() - 1;  // -1 to include tag byte.
-  BigintLiteral* lit = new BigintLiteral(Reference::ReadStringFrom(reader));
+  BigintLiteral* lit = new BigintLiteral(reader->ReadUInt());
   lit->kernel_offset_ = offset;
   return lit;
 }
 
 
 IntLiteral* IntLiteral::ReadFrom(Reader* reader, bool is_negative) {
   TRACE_READ_OFFSET();
   IntLiteral* literal = new IntLiteral();
   literal->kernel_offset_ = reader->offset() - 1;  // -1 to include tag byte.
   literal->value_ = is_negative ? -static_cast<int64_t>(reader->ReadUInt())
                                 : reader->ReadUInt();
   return literal;
 }
 
 
 IntLiteral* IntLiteral::ReadFrom(Reader* reader, uint8_t payload) {
   TRACE_READ_OFFSET();
   IntLiteral* literal = new IntLiteral();
   literal->kernel_offset_ = reader->offset() - 1;  // -1 to include tag byte.
   literal->value_ = static_cast<int32_t>(payload) - SpecializedIntLiteralBias;
   return literal;
 }
 
 
 DoubleLiteral* DoubleLiteral::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
   DoubleLiteral* literal = new DoubleLiteral();
   literal->kernel_offset_ = reader->offset() - 1;  // -1 to include tag byte.
-  literal->value_ = Reference::ReadStringFrom(reader);
+  literal->value_index_ = reader->ReadUInt();
   return literal;
 }
 
 
 BoolLiteral* BoolLiteral::ReadFrom(Reader* reader, bool value) {
   TRACE_READ_OFFSET();
   BoolLiteral* lit = new BoolLiteral();
   lit->kernel_offset_ = reader->offset() - 1;  // -1 to include tag byte.
   lit->value_ = value;
   return lit;
 }
 
 
 NullLiteral* NullLiteral::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
   NullLiteral* lit = new NullLiteral();
   lit->kernel_offset_ = reader->offset() - 1;  // -1 to include tag byte.
   return lit;
 }
 
 
 SymbolLiteral* SymbolLiteral::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
   SymbolLiteral* lit = new SymbolLiteral();
   lit->kernel_offset_ = reader->offset() - 1;  // -1 to include tag byte.
-  lit->value_ = Reference::ReadStringFrom(reader);
+  lit->value_index_ = reader->ReadUInt();
   return lit;
 }
 
 
 TypeLiteral* TypeLiteral::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
   TypeLiteral* literal = new TypeLiteral();
   literal->kernel_offset_ = reader->offset() - 1;  // -1 to include tag byte.
   literal->type_ = DartType::ReadFrom(reader);
   return literal;
@@ skipping 457 matching lines @@
                                                        bool read_tag) {
   TRACE_READ_OFFSET();
   PositionScope scope(reader);
 
   VariableDeclaration* decl = new VariableDeclaration();
   // -1 or -0 depending on whether there's a tag or not.
   decl->kernel_offset_ = reader->offset() - (read_tag ? 1 : 0);
   decl->position_ = reader->ReadPosition();
   decl->equals_position_ = reader->ReadPosition();
   decl->flags_ = reader->ReadFlags();
-  decl->name_ = Reference::ReadStringFrom(reader);
+  decl->name_index_ = reader->ReadUInt();
   decl->type_ = DartType::ReadFrom(reader);
   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();
   decl->kernel_offset_ = reader->offset() - 1;  // -1 to include tag byte.
   decl->position_ = reader->ReadPosition();
   decl->variable_ = VariableDeclaration::ReadFromImpl(reader, false);
   VariableScope<ReaderHelper> parameters(reader->helper());
   decl->function_ = FunctionNode::ReadFrom(reader);
   return decl;
 }
 
 
 Name* Name::ReadFrom(Reader* reader) {
-  String* name = Reference::ReadStringFrom(reader);
-  if (name->size() >= 1 && reader->CharacterAt(name, 0) == '_') {
+  intptr_t name_index = reader->ReadUInt();
+  if ((reader->StringLength(name_index) >= 1) &&
+      (reader->CharacterAt(name_index, 0) == '_')) {
     CanonicalName* library_reference = reader->ReadCanonicalNameReference();
-    return new Name(name, library_reference);
+    return new Name(name_index, library_reference);
   } else {
-    return new Name(name, NULL);
+    return new Name(name_index, NULL);
   }
 }
 
 
 DartType* DartType::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
   Tag tag = reader->ReadTag();
   switch (tag) {
     case kInvalidType:
       return InvalidType::ReadFrom(reader);
@@ skipping 69 matching lines @@
 }
 
 
 FunctionType* FunctionType::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
   FunctionType* type = new FunctionType();
   TypeParameterScope<ReaderHelper> scope(reader->helper());
   type->type_parameters().ReadFrom(reader);
   type->required_parameter_count_ = reader->ReadUInt();
   type->positional_parameters().ReadFromStatic<DartType>(reader);
-  type->named_parameters().ReadFromStatic<Tuple<String, DartType> >(reader);
+  type->named_parameters().ReadFromStatic<NamedParameter>(reader);
   type->return_type_ = DartType::ReadFrom(reader);
   return type;
 }
 
 
 FunctionType* FunctionType::ReadFrom(Reader* reader, bool _is_simple_) {
   TRACE_READ_OFFSET();
   FunctionType* type = new FunctionType();
   ASSERT(_is_simple_);
   type->positional_parameters().ReadFromStatic<DartType>(reader);
@@ skipping 21 matching lines @@
 
 Program* Program::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
   uint32_t magic = reader->ReadUInt32();
   if (magic != kMagicProgramFile) FATAL("Invalid magic identifier");
 
   Program* program = new Program();
   program->canonical_name_root_ = CanonicalName::NewRoot();
   reader->helper()->set_program(program);
 
-  program->string_table_.ReadFrom(reader);
-  program->string_data_offset_ = reader->string_data_offset();
-  ASSERT(program->string_data_offset_ >= 0);
+  // Skip the table of string end offsets.
+  reader->MarkStringTableOffset();
+  intptr_t length = reader->ReadUInt();
+  reader->string_offsets_ = new intptr_t[length + 1];
+  intptr_t offset = 0;
+  for (intptr_t i = 0; i < length; ++i) {
+    reader->string_offsets_[i] = offset;
+    offset = reader->ReadUInt();
+  }
+  reader->string_offsets_[length] = offset;
+  // Skip the UTF-8 encoded strings.
+  reader->MarkStringDataOffset();
+  reader->Consume(offset);
+
+  program->string_table_offset_ = reader->string_table_offset();
+  ASSERT(program->string_table_offset_ >= 0);
   program->source_table_.ReadFrom(reader);
 
   int canonical_names = reader->ReadUInt();
   reader->helper()->SetCanonicalNameCount(canonical_names);
   for (int i = 0; i < canonical_names; ++i) {
     int biased_parent_index = reader->ReadUInt();
     CanonicalName* parent;
     if (biased_parent_index != 0) {
       parent = reader->helper()->GetCanonicalName(biased_parent_index - 1);
     } else {
       parent = program->canonical_name_root();
     }
     ASSERT(parent != NULL);
-    int name_index = reader->ReadUInt();
-    String* name = program->string_table().strings()[name_index];
-    CanonicalName* canonical_name = parent->AddChild(name);
+    intptr_t name_index = reader->ReadUInt();
+    CanonicalName* canonical_name = parent->AddChild(name_index);
     reader->helper()->SetCanonicalName(i, canonical_name);
   }
 
   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_ =
@@ skipping 25 matching lines @@
   LabelScope<ReaderHelper, BlockStack<LabeledStatement> > labels(
       reader->helper());
   VariableScope<ReaderHelper> vars(reader->helper());
   function->body_ = reader->ReadOptional<Statement>();
   return function;
 }
 
 
 TypeParameter* TypeParameter::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
-  name_ = Reference::ReadStringFrom(reader);
+  name_index_ = reader->ReadUInt();
   bound_ = DartType::ReadFrom(reader);
   return this;
 }
 
 
 }  // namespace kernel
 
 
 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)