Introduce classes for string and name indexes

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 78 matching lines @@
 
   // Read all [TypeParameter]s and their bounds.
   for (intptr_t i = 0; i < length; i++) {
     (*this)[i]->ReadFrom(reader);
   }
 }
 
 
 NamedParameter* NamedParameter::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
-  intptr_t name_index = reader->ReadUInt();
+  StringIndex 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();
@@ skipping 59 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_index_ = reader->ReadUInt();
+  name_index_ = StringIndex(reader->ReadUInt());
   import_uri_index_ = reader->CanonicalNameString(canonical_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);
@@ skipping 13 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_index_ = reader->ReadUInt();
+  name_index_ = StringIndex(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_index_ = reader->ReadUInt();
+  name_index_ = StringIndex(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 24 matching lines @@
   type_parameters_.ReadFrom(reader);
   first_ = InterfaceType::Cast(DartType::ReadFrom(reader));
   second_ = InterfaceType::Cast(DartType::ReadFrom(reader));
   implemented_classes_.ReadFromStatic<DowncastReader<DartType, InterfaceType> >(
       reader);
   constructors_.ReadFrom<Constructor>(reader, this);
   return this;
 }
 
 
-intptr_t Reference::ReadMemberFrom(Reader* reader, bool allow_null) {
+NameIndex Reference::ReadMemberFrom(Reader* reader, bool allow_null) {
   TRACE_READ_OFFSET();
-  intptr_t canonical_name = reader->ReadCanonicalNameReference();
+  NameIndex canonical_name = reader->ReadCanonicalNameReference();
   if ((canonical_name == -1) && !allow_null) {
     FATAL("Expected a valid member reference, but got `null`");
   }
   return canonical_name;
 }
 
 
-intptr_t Reference::ReadClassFrom(Reader* reader, bool allow_null) {
+NameIndex Reference::ReadClassFrom(Reader* reader, bool allow_null) {
   TRACE_READ_OFFSET();
-  intptr_t canonical_name = reader->ReadCanonicalNameReference();
+  NameIndex canonical_name = reader->ReadCanonicalNameReference();
   if ((canonical_name == -1) && !allow_null) {
     FATAL("Expected a valid class reference, but got `null`");
   }
   return canonical_name;
 }
 
 
-intptr_t Reference::ReadTypedefFrom(Reader* reader) {
+NameIndex Reference::ReadTypedefFrom(Reader* reader) {
   TRACE_READ_OFFSET();
-  intptr_t canonical_name = reader->ReadCanonicalNameReference();
+  NameIndex canonical_name = reader->ReadCanonicalNameReference();
   if (canonical_name == -1) {
     FATAL("Expected a valid typedef reference, but got `null`");
   }
   return canonical_name;
 }
 
 
 Field* Field::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
   kernel_offset_ = reader->offset();  // Notice the ReadTag() below.
@@ skipping 354 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();
-  intptr_t name_index = reader->ReadUInt();
+  StringIndex name_index(reader->ReadUInt());
   Expression* expression = Expression::ReadFrom(reader);
   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();
@@ skipping 102 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(reader->ReadUInt());
+  StringLiteral* lit = new StringLiteral(StringIndex(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(reader->ReadUInt());
+  BigintLiteral* lit = new BigintLiteral(StringIndex(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_index_ = reader->ReadUInt();
+  literal->value_index_ = StringIndex(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_index_ = reader->ReadUInt();
+  lit->value_index_ = StringIndex(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_index_ = reader->ReadUInt();
+  decl->name_index_ = StringIndex(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) {
-  intptr_t name_index = reader->ReadUInt();
+  StringIndex name_index(reader->ReadUInt());
   if ((reader->StringLength(name_index) >= 1) &&
       (reader->CharacterAt(name_index, 0) == '_')) {
     intptr_t library_reference = reader->ReadCanonicalNameReference();
     return new Name(name_index, library_reference);
   } else {
     return new Name(name_index, NULL);
   }
 }
 
 
@@ skipping 42 matching lines @@
 
 
 VoidType* VoidType::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
   return new VoidType();
 }
 
 
 InterfaceType* InterfaceType::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
-  intptr_t klass_name = Reference::ReadClassFrom(reader);
+  NameIndex klass_name = Reference::ReadClassFrom(reader);
   InterfaceType* type = new InterfaceType(klass_name);
   type->type_arguments().ReadFromStatic<DartType>(reader);
   return type;
 }
 
 
 InterfaceType* InterfaceType::ReadFrom(Reader* reader,
                                        bool _without_type_arguments_) {
   TRACE_READ_OFFSET();
-  intptr_t klass_name = Reference::ReadClassFrom(reader);
+  NameIndex klass_name = Reference::ReadClassFrom(reader);
   InterfaceType* type = new InterfaceType(klass_name);
   ASSERT(_without_type_arguments_);
   return type;
 }
 
 
 TypedefType* TypedefType::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
-  intptr_t typedef_name = Reference::ReadTypedefFrom(reader);
+  NameIndex typedef_name = Reference::ReadTypedefFrom(reader);
   TypedefType* type = new TypedefType(typedef_name);
   type->type_arguments().ReadFromStatic<DartType>(reader);
   return type;
 }
 
 
 FunctionType* FunctionType::ReadFrom(Reader* reader) {
   TRACE_READ_OFFSET();
   FunctionType* type = new FunctionType();
   TypeParameterScope<ReaderHelper> scope(reader->helper());
@@ skipping 55 matching lines @@
   // Skip the UTF-8 encoded strings.
   reader->MarkStringDataOffset();
   reader->Consume(offset);
 
   program->source_table_.ReadFrom(reader);
 
   // Deserialize the canonical name table to give fast access to canonical names
   // during deserialization.
   program->name_table_offset_ = reader->offset();
   intptr_t name_count = reader->ReadUInt();
-  reader->canonical_name_parents_ = new intptr_t[name_count];
-  reader->canonical_name_strings_ = new intptr_t[name_count];
+  reader->canonical_name_parents_ = new NameIndex[name_count];
+  reader->canonical_name_strings_ = new StringIndex[name_count];
   for (int i = 0; i < name_count; ++i) {
     // The parent name index is biased: 0 is the root name and otherwise N+1 is
     // the Nth name.
-    reader->canonical_name_parents_[i] = reader->ReadUInt() - 1;
-    reader->canonical_name_strings_[i] = reader->ReadUInt();
+    reader->canonical_name_parents_[i] = reader->ReadCanonicalNameReference();
+    reader->canonical_name_strings_[i] = StringIndex(reader->ReadUInt());
   }
 
   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, /*allow_null=*/true);
@@ skipping 24 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_index_ = reader->ReadUInt();
+  name_index_ = StringIndex(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)