Introduce classes for string and name indexes

runtime/vm/kernel.h

 // 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.
 
 #ifndef RUNTIME_VM_KERNEL_H_
 #define RUNTIME_VM_KERNEL_H_
 
 #if !defined(DART_PRECOMPILED_RUNTIME)
 #include "platform/assert.h"
 #include "vm/allocation.h"
@@ skipping 274 matching lines @@
 
   // The number of entries in the table.
   intptr_t size_;
 
   // An array of sources.
   Source* sources_;
 
   DISALLOW_COPY_AND_ASSIGN(SourceTable);
 };
 
+
+class StringIndex {
+ public:
+  StringIndex() : value_(-1) {}
+  explicit StringIndex(int value) : value_(value) {}
+
+  operator int() const { return value_; }
+
+ private:
+  int value_;
+};
+
+
+class NameIndex {
+ public:
+  NameIndex() : value_(-1) {}
+  explicit NameIndex(int value) : value_(value) {}
+
+  operator int() const { return value_; }
+
+ private:
+  int value_;
+};
+
+
 // Forward declare all classes.
 #define DO(name) class name;
 KERNEL_ALL_NODES_DO(DO)
 KERNEL_VISITORS_DO(DO)
 #undef DO
 
 
 #define DEFINE_CASTING_OPERATIONS(klass)                                       \
   virtual bool Is##klass() { return true; }                                    \
                                                                                \
@@ skipping 66 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TreeNode);
 };
 
 
 class LinkedNode : public TreeNode {
  public:
   virtual ~LinkedNode();
 
-  intptr_t canonical_name() { return canonical_name_; }
+  NameIndex canonical_name() { return canonical_name_; }
 
  protected:
   LinkedNode() {}
 
-  intptr_t canonical_name_;
+  NameIndex canonical_name_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LinkedNode);
 };
 
 
 class Library : public LinkedNode {
  public:
   Library* ReadFrom(Reader* reader);
 
   virtual ~Library();
 
   DEFINE_CASTING_OPERATIONS(Library);
 
   virtual void AcceptTreeVisitor(TreeVisitor* visitor);
   virtual void VisitChildren(Visitor* visitor);
 
-  intptr_t import_uri() { return import_uri_index_; }
+  StringIndex import_uri() { return import_uri_index_; }
   intptr_t source_uri_index() { return source_uri_index_; }
-  intptr_t name() { return name_index_; }
+  StringIndex name() { return name_index_; }
   List<Typedef>& typedefs() { return typedefs_; }
   List<Class>& classes() { return classes_; }
   List<Field>& fields() { return fields_; }
   List<Procedure>& procedures() { return procedures_; }
 
   const uint8_t* kernel_data() { return kernel_data_; }
   intptr_t kernel_data_size() { return kernel_data_size_; }
 
  private:
-  Library() : name_index_(-1), kernel_data_(NULL), kernel_data_size_(-1) {}
+  Library() : kernel_data_(NULL), kernel_data_size_(-1) {}
 
   template <typename T>
   friend class List;
 
-  intptr_t name_index_;
-  intptr_t import_uri_index_;
+  StringIndex name_index_;
+  StringIndex import_uri_index_;
   intptr_t source_uri_index_;
   List<Typedef> typedefs_;
   List<Class> classes_;
   List<Field> fields_;
   List<Procedure> procedures_;
   const uint8_t* kernel_data_;
   intptr_t kernel_data_size_;
 
   DISALLOW_COPY_AND_ASSIGN(Library);
 };
 
 
 class Typedef : public LinkedNode {
  public:
   Typedef* ReadFrom(Reader* reader);
 
   virtual ~Typedef();
 
   DEFINE_CASTING_OPERATIONS(Typedef);
 
   virtual void AcceptTreeVisitor(TreeVisitor* visitor);
   virtual void VisitChildren(Visitor* visitor);
 
   Library* parent() { return parent_; }
-  intptr_t name() { return name_index_; }
+  StringIndex name() { return name_index_; }
   intptr_t source_uri_index() { return source_uri_index_; }
   TokenPosition position() { return position_; }
   TypeParameterList& type_parameters() { return type_parameters_; }
   DartType* type() { return type_; }
 
  protected:
   Typedef() : position_(TokenPosition::kNoSource) {}
 
  private:
   template <typename T>
   friend class List;
 
+  StringIndex name_index_;
   Ref<Library> parent_;
-  intptr_t name_index_;
   intptr_t source_uri_index_;
   TokenPosition position_;
   TypeParameterList type_parameters_;
   Child<DartType> type_;
 };
 
 
 class Class : public LinkedNode {
  public:
   Class* ReadFrom(Reader* reader);
 
   virtual ~Class();
 
   DEFINE_CASTING_OPERATIONS(Class);
 
   virtual void AcceptTreeVisitor(TreeVisitor* visitor);
   virtual void AcceptClassVisitor(ClassVisitor* visitor) = 0;
 
   Library* parent() { return parent_; }
-  intptr_t name() { return name_index_; }
+  StringIndex name() { return name_index_; }
   intptr_t source_uri_index() { return source_uri_index_; }
   bool is_abstract() { return is_abstract_; }
   List<Expression>& annotations() { return annotations_; }
   TokenPosition position() { return position_; }
 
   virtual List<TypeParameter>& type_parameters() = 0;
   virtual List<InterfaceType>& implemented_classes() = 0;
   virtual List<Field>& fields() = 0;
   virtual List<Constructor>& constructors() = 0;
   virtual List<Procedure>& procedures() = 0;
 
  protected:
   Class() : is_abstract_(false), position_(TokenPosition::kNoSource) {}
 
  private:
   template <typename T>
   friend class List;
 
+  StringIndex name_index_;
   Ref<Library> parent_;
-  intptr_t name_index_;
   intptr_t source_uri_index_;
   bool is_abstract_;
   List<Expression> annotations_;
   TokenPosition position_;
 
   DISALLOW_COPY_AND_ASSIGN(Class);
 };
 
 
 class NormalClass : public Class {
@@ skipping 277 matching lines @@
  public:
   static FieldInitializer* ReadFromImpl(Reader* reader);
 
   virtual ~FieldInitializer();
 
   DEFINE_CASTING_OPERATIONS(FieldInitializer);
 
   virtual void AcceptInitializerVisitor(InitializerVisitor* visitor);
   virtual void VisitChildren(Visitor* visitor);
 
-  intptr_t field() { return field_reference_; }
+  NameIndex field() { return field_reference_; }
   Expression* value() { return value_; }
 
  private:
   FieldInitializer() {}
 
-  intptr_t field_reference_;  // Field canonical name.
+  NameIndex field_reference_;  // Field canonical name.
   Child<Expression> value_;
 
   DISALLOW_COPY_AND_ASSIGN(FieldInitializer);
 };
 
 
 class SuperInitializer : public Initializer {
  public:
   static SuperInitializer* ReadFromImpl(Reader* reader);
 
   virtual ~SuperInitializer();
 
   DEFINE_CASTING_OPERATIONS(SuperInitializer);
 
   virtual void AcceptInitializerVisitor(InitializerVisitor* visitor);
   virtual void VisitChildren(Visitor* visitor);
 
-  intptr_t target() { return target_reference_; }
+  NameIndex target() { return target_reference_; }
   Arguments* arguments() { return arguments_; }
 
  private:
   SuperInitializer() {}
 
-  intptr_t target_reference_;  // Constructor canonical name.
+  NameIndex target_reference_;  // Constructor canonical name.
   Child<Arguments> arguments_;
 
   DISALLOW_COPY_AND_ASSIGN(SuperInitializer);
 };
 
 
 class RedirectingInitializer : public Initializer {
  public:
   static RedirectingInitializer* ReadFromImpl(Reader* reader);
 
   virtual ~RedirectingInitializer();
 
   DEFINE_CASTING_OPERATIONS(RedirectingInitializer);
 
   virtual void AcceptInitializerVisitor(InitializerVisitor* visitor);
   virtual void VisitChildren(Visitor* visitor);
 
-  intptr_t target() { return target_reference_; }
+  NameIndex target() { return target_reference_; }
   Arguments* arguments() { return arguments_; }
 
  private:
   RedirectingInitializer() {}
 
-  intptr_t target_reference_;  // Constructor canonical name.
+  NameIndex target_reference_;  // Constructor canonical name.
   Child<Arguments> arguments_;
 
   DISALLOW_COPY_AND_ASSIGN(RedirectingInitializer);
 };
 
 
 class LocalInitializer : public Initializer {
  public:
   static LocalInitializer* ReadFromImpl(Reader* reader);
 
@@ skipping 168 matching lines @@
 
   virtual void AcceptExpressionVisitor(ExpressionVisitor* visitor);
   virtual void VisitChildren(Visitor* visitor);
 
   Expression* receiver() { return receiver_; }
   Name* name() { return name_; }
 
  private:
   PropertyGet() {}
 
+  NameIndex interface_target_reference_;
   Child<Expression> receiver_;
   Child<Name> name_;
-  intptr_t interface_target_reference_;
 
   DISALLOW_COPY_AND_ASSIGN(PropertyGet);
 };
 
 
 class PropertySet : public Expression {
  public:
   static PropertySet* ReadFrom(Reader* reader);
 
   virtual ~PropertySet();
 
   DEFINE_CASTING_OPERATIONS(PropertySet);
 
   virtual void AcceptExpressionVisitor(ExpressionVisitor* visitor);
   virtual void VisitChildren(Visitor* visitor);
 
   Expression* receiver() { return receiver_; }
   Name* name() { return name_; }
   Expression* value() { return value_; }
 
  private:
   PropertySet() {}
 
+  NameIndex interface_target_reference_;
   Child<Expression> receiver_;
   Child<Name> name_;
   Child<Expression> value_;
-  intptr_t interface_target_reference_;
 
   DISALLOW_COPY_AND_ASSIGN(PropertySet);
 };
 
 
 class DirectPropertyGet : public Expression {
  public:
   static DirectPropertyGet* ReadFrom(Reader* reader);
 
   virtual ~DirectPropertyGet();
 
   DEFINE_CASTING_OPERATIONS(DirectPropertyGet);
 
   virtual void AcceptExpressionVisitor(ExpressionVisitor* visitor);
   virtual void VisitChildren(Visitor* visitor);
 
   Expression* receiver() { return receiver_; }
-  intptr_t target() { return target_reference_; }
+  NameIndex target() { return target_reference_; }
 
  private:
   DirectPropertyGet() {}
 
+  NameIndex target_reference_;  // Member canonical name.
   Child<Expression> receiver_;
-  intptr_t target_reference_;  // Member canonical name.
 
   DISALLOW_COPY_AND_ASSIGN(DirectPropertyGet);
 };
 
 
 class DirectPropertySet : public Expression {
  public:
   static DirectPropertySet* ReadFrom(Reader* reader);
 
   virtual ~DirectPropertySet();
 
   DEFINE_CASTING_OPERATIONS(DirectPropertySet);
 
   virtual void AcceptExpressionVisitor(ExpressionVisitor* visitor);
   virtual void VisitChildren(Visitor* visitor);
 
+  NameIndex target() { return target_reference_; }
   Expression* receiver() { return receiver_; }
-  intptr_t target() { return target_reference_; }
   Expression* value() { return value_; }
 
  private:
   DirectPropertySet() {}
 
+  NameIndex target_reference_;  // Member canonical name.
   Child<Expression> receiver_;
-  intptr_t target_reference_;  // Member canonical name.
   Child<Expression> value_;
 
   DISALLOW_COPY_AND_ASSIGN(DirectPropertySet);
 };
 
 
 class StaticGet : public Expression {
  public:
-  explicit StaticGet(intptr_t target) : target_reference_(target) {}
+  explicit StaticGet(NameIndex target) : target_reference_(target) {}
 
   static StaticGet* ReadFrom(Reader* reader);
 
   virtual ~StaticGet();
 
   DEFINE_CASTING_OPERATIONS(StaticGet);
 
   virtual void AcceptExpressionVisitor(ExpressionVisitor* visitor);
   virtual void VisitChildren(Visitor* visitor);
 
-  intptr_t target() { return target_reference_; }
+  NameIndex target() { return target_reference_; }
 
  private:
   StaticGet() {}
 
-  intptr_t target_reference_;  // Member canonical name.
+  NameIndex target_reference_;  // Member canonical name.
 
   DISALLOW_COPY_AND_ASSIGN(StaticGet);
 };
 
 
 class StaticSet : public Expression {
  public:
   static StaticSet* ReadFrom(Reader* reader);
 
   virtual ~StaticSet();
 
   DEFINE_CASTING_OPERATIONS(StaticSet);
 
   virtual void AcceptExpressionVisitor(ExpressionVisitor* visitor);
   virtual void VisitChildren(Visitor* visitor);
 
-  intptr_t target() { return target_reference_; }
+  NameIndex target() { return target_reference_; }
   Expression* expression() { return expression_; }
 
  private:
   StaticSet() {}
 
-  intptr_t target_reference_;  // Member canonical name.
+  NameIndex target_reference_;  // Member canonical name.
   Child<Expression> expression_;
 
   DISALLOW_COPY_AND_ASSIGN(StaticSet);
 };
 
 
 class Arguments : public TreeNode {
  public:
   static Arguments* ReadFrom(Reader* reader);
 
@@ skipping 18 matching lines @@
   List<NamedExpression> named_;
 
   DISALLOW_COPY_AND_ASSIGN(Arguments);
 };
 
 
 class NamedExpression : public TreeNode {
  public:
   static NamedExpression* ReadFrom(Reader* reader);
 
-  NamedExpression(intptr_t name_index, Expression* expr)
+  NamedExpression(StringIndex name_index, Expression* expr)
       : name_index_(name_index), expression_(expr) {}
   virtual ~NamedExpression();
 
   DEFINE_CASTING_OPERATIONS(NamedExpression);
 
   virtual void AcceptTreeVisitor(TreeVisitor* visitor);
   virtual void VisitChildren(Visitor* visitor);
 
-  intptr_t name() { return name_index_; }
+  StringIndex name() { return name_index_; }
   Expression* expression() { return expression_; }
 
  private:
   NamedExpression() {}
 
-  intptr_t name_index_;
+  StringIndex name_index_;
   Child<Expression> expression_;
 
   DISALLOW_COPY_AND_ASSIGN(NamedExpression);
 };
 
 
 class MethodInvocation : public Expression {
  public:
   static MethodInvocation* ReadFrom(Reader* reader);
 
   virtual ~MethodInvocation();
 
   DEFINE_CASTING_OPERATIONS(MethodInvocation);
 
   virtual void AcceptExpressionVisitor(ExpressionVisitor* visitor);
   virtual void VisitChildren(Visitor* visitor);
 
   Expression* receiver() { return receiver_; }
   Name* name() { return name_; }
   Arguments* arguments() { return arguments_; }
 
  private:
   MethodInvocation() {}
 
+  NameIndex interface_target_reference_;
   Child<Expression> receiver_;
   Child<Name> name_;
   Child<Arguments> arguments_;
-  intptr_t interface_target_reference_;
 
   DISALLOW_COPY_AND_ASSIGN(MethodInvocation);
 };
 
 
 class DirectMethodInvocation : public Expression {
  public:
   static DirectMethodInvocation* ReadFrom(Reader* reader);
 
   virtual ~DirectMethodInvocation();
 
   DEFINE_CASTING_OPERATIONS(DirectMethodInvocation);
 
   virtual void AcceptExpressionVisitor(ExpressionVisitor* visitor);
   virtual void VisitChildren(Visitor* visitor);
 
   Expression* receiver() { return receiver_; }
-  intptr_t target() { return target_reference_; }
+  NameIndex target() { return target_reference_; }
   Arguments* arguments() { return arguments_; }
 
  private:
   DirectMethodInvocation() {}
 
+  NameIndex target_reference_;  // Procedure canonical name.
   Child<Expression> receiver_;
-  intptr_t target_reference_;  // Procedure canonical name.
   Child<Arguments> arguments_;
 
   DISALLOW_COPY_AND_ASSIGN(DirectMethodInvocation);
 };
 
 
 class StaticInvocation : public Expression {
  public:
   static StaticInvocation* ReadFrom(Reader* reader, bool is_const);
   ~StaticInvocation();
 
   DEFINE_CASTING_OPERATIONS(StaticInvocation);
 
   virtual void AcceptExpressionVisitor(ExpressionVisitor* visitor);
   virtual void VisitChildren(Visitor* visitor);
 
-  intptr_t procedure() { return procedure_reference_; }
+  NameIndex procedure() { return procedure_reference_; }
   Arguments* arguments() { return arguments_; }
   bool is_const() { return is_const_; }
 
  private:
   StaticInvocation() {}
 
-  intptr_t procedure_reference_;  // Procedure canonical name.
+  NameIndex procedure_reference_;  // Procedure canonical name.
+  bool is_const_;
   Child<Arguments> arguments_;
-  bool is_const_;
 
   DISALLOW_COPY_AND_ASSIGN(StaticInvocation);
 };
 
 
 class ConstructorInvocation : public Expression {
  public:
   static ConstructorInvocation* ReadFrom(Reader* reader, bool is_const);
 
   virtual ~ConstructorInvocation();
 
   DEFINE_CASTING_OPERATIONS(ConstructorInvocation);
 
   virtual void AcceptExpressionVisitor(ExpressionVisitor* visitor);
   virtual void VisitChildren(Visitor* visitor);
 
   bool is_const() { return is_const_; }
-  intptr_t target() { return target_reference_; }
+  NameIndex target() { return target_reference_; }
   Arguments* arguments() { return arguments_; }
 
  private:
   ConstructorInvocation() {}
 
   bool is_const_;
-  intptr_t target_reference_;  // Constructor canonical name.
+  NameIndex target_reference_;  // Constructor canonical name.
   Child<Arguments> arguments_;
 
   DISALLOW_COPY_AND_ASSIGN(ConstructorInvocation);
 };
 
 
 class Not : public Expression {
  public:
   static Not* ReadFrom(Reader* reader);
 
@@ skipping 148 matching lines @@
   virtual void VisitChildren(Visitor* visitor);
 };
 
 
 class StringLiteral : public BasicLiteral {
  public:
   static StringLiteral* ReadFrom(Reader* reader);
 
   virtual void AcceptExpressionVisitor(ExpressionVisitor* visitor);
 
-  explicit StringLiteral(intptr_t string_index) : value_index_(string_index) {}
+  explicit StringLiteral(StringIndex string_index)
+      : value_index_(string_index) {}
   virtual ~StringLiteral();
 
   DEFINE_CASTING_OPERATIONS(StringLiteral);
 
-  intptr_t value() { return value_index_; }
+  StringIndex value() { return value_index_; }
 
  protected:
   StringLiteral() {}
 
-  intptr_t value_index_;
+  StringIndex value_index_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(StringLiteral);
 };
 
 
 class BigintLiteral : public StringLiteral {
  public:
   static BigintLiteral* ReadFrom(Reader* reader);
 
   virtual void AcceptExpressionVisitor(ExpressionVisitor* visitor);
 
-  explicit BigintLiteral(intptr_t string_index) : StringLiteral(string_index) {}
+  explicit BigintLiteral(StringIndex string_index)
+      : StringLiteral(string_index) {}
   virtual ~BigintLiteral();
 
   DEFINE_CASTING_OPERATIONS(BigintLiteral);
 
  private:
   BigintLiteral() {}
 
   DISALLOW_COPY_AND_ASSIGN(BigintLiteral);
 };
 
@@ skipping 23 matching lines @@
 class DoubleLiteral : public BasicLiteral {
  public:
   static DoubleLiteral* ReadFrom(Reader* reader);
 
   virtual ~DoubleLiteral();
 
   DEFINE_CASTING_OPERATIONS(DoubleLiteral);
 
   virtual void AcceptExpressionVisitor(ExpressionVisitor* visitor);
 
-  intptr_t value() { return value_index_; }
+  StringIndex value() { return value_index_; }
 
  private:
   DoubleLiteral() {}
 
-  intptr_t value_index_;
+  StringIndex value_index_;
 
   DISALLOW_COPY_AND_ASSIGN(DoubleLiteral);
 };
 
 
 class BoolLiteral : public BasicLiteral {
  public:
   static BoolLiteral* ReadFrom(Reader* reader, bool value);
 
   virtual ~BoolLiteral();
@@ skipping 34 matching lines @@
  public:
   static SymbolLiteral* ReadFrom(Reader* reader);
 
   virtual ~SymbolLiteral();
 
   DEFINE_CASTING_OPERATIONS(SymbolLiteral);
 
   virtual void AcceptExpressionVisitor(ExpressionVisitor* visitor);
   virtual void VisitChildren(Visitor* visitor);
 
-  intptr_t value() { return value_index_; }
+  StringIndex value() { return value_index_; }
 
  private:
   SymbolLiteral() {}
 
-  intptr_t value_index_;
+  StringIndex value_index_;
 
   DISALLOW_COPY_AND_ASSIGN(SymbolLiteral);
 };
 
 
 class TypeLiteral : public Expression {
  public:
   static TypeLiteral* ReadFrom(Reader* reader);
 
   virtual ~TypeLiteral();
@@ skipping 325 matching lines @@
  public:
   static ClosureCreation* ReadFrom(Reader* reader);
 
   virtual ~ClosureCreation();
 
   DEFINE_CASTING_OPERATIONS(ClosureCreation);
 
   virtual void AcceptExpressionVisitor(ExpressionVisitor* visitor);
   virtual void VisitChildren(Visitor* visitor);
 
-  intptr_t top_level_function() { return top_level_function_reference_; }
+  NameIndex top_level_function() { return top_level_function_reference_; }
   Expression* context_vector() { return context_vector_; }
   FunctionType* function_type() { return function_type_; }
 
  private:
   ClosureCreation() {}
 
-  intptr_t top_level_function_reference_;  // Procedure canonical name.
+  NameIndex top_level_function_reference_;  // Procedure canonical name.
   Child<Expression> context_vector_;
   Child<FunctionType> function_type_;
 
   DISALLOW_COPY_AND_ASSIGN(ClosureCreation);
 };
 
 
 class Statement : public TreeNode {
  public:
   static Statement* ReadFrom(Reader* reader);
@@ skipping 534 matching lines @@
   virtual ~VariableDeclaration();
 
   DEFINE_CASTING_OPERATIONS(VariableDeclaration);
 
   virtual void AcceptStatementVisitor(StatementVisitor* visitor);
   virtual void VisitChildren(Visitor* visitor);
 
   bool IsConst() { return (flags_ & kFlagConst) == kFlagConst; }
   bool IsFinal() { return (flags_ & kFlagFinal) == kFlagFinal; }
 
-  intptr_t name() { return name_index_; }
+  StringIndex name() { return name_index_; }
   DartType* type() { return type_; }
   Expression* initializer() { return initializer_; }
   TokenPosition equals_position() { return equals_position_; }
   TokenPosition end_position() { return end_position_; }
   void set_end_position(TokenPosition position) { end_position_ = position; }
 
  private:
   VariableDeclaration()
       : equals_position_(TokenPosition::kNoSourcePos),
         end_position_(TokenPosition::kNoSource) {}
 
   template <typename T>
   friend class List;
 
+  StringIndex name_index_;
   word flags_;
-  intptr_t name_index_;
   Child<DartType> type_;
   Child<Expression> initializer_;
   TokenPosition equals_position_;
   TokenPosition end_position_;
 
   DISALLOW_COPY_AND_ASSIGN(VariableDeclaration);
 };
 
 
 class FunctionDeclaration : public Statement {
@@ skipping 24 matching lines @@
  public:
   static Name* ReadFrom(Reader* reader);
 
   virtual ~Name();
 
   DEFINE_CASTING_OPERATIONS(Name);
 
   virtual void AcceptVisitor(Visitor* visitor);
   virtual void VisitChildren(Visitor* visitor);
 
-  intptr_t string_index() { return string_index_; }
-  intptr_t library() { return library_reference_; }
+  StringIndex string_index() { return string_index_; }
+  NameIndex library() { return library_reference_; }
 
  private:
   Name(intptr_t string_index, intptr_t library_reference)
       : string_index_(string_index),
         library_reference_(library_reference) {}  // NOLINT
 
-  intptr_t string_index_;
-  intptr_t library_reference_;  // Library canonical name.
+  StringIndex string_index_;
+  NameIndex library_reference_;  // Library canonical name.
 
   DISALLOW_COPY_AND_ASSIGN(Name);
 };
 
 
 class DartType : public Node {
  public:
   static DartType* ReadFrom(Reader* reader);
 
   virtual ~DartType();
@@ skipping 63 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(VoidType);
 };
 
 
 class InterfaceType : public DartType {
  public:
   static InterfaceType* ReadFrom(Reader* reader);
   static InterfaceType* ReadFrom(Reader* reader, bool _without_type_arguments_);
 
-  explicit InterfaceType(intptr_t class_reference)
+  explicit InterfaceType(NameIndex class_reference)
       : class_reference_(class_reference) {}
   virtual ~InterfaceType();
 
   DEFINE_CASTING_OPERATIONS(InterfaceType);
 
   virtual void AcceptDartTypeVisitor(DartTypeVisitor* visitor);
   virtual void VisitChildren(Visitor* visitor);
 
-  intptr_t klass() { return class_reference_; }
+  NameIndex klass() { return class_reference_; }
   List<DartType>& type_arguments() { return type_arguments_; }
 
  private:
   InterfaceType() {}
 
-  intptr_t class_reference_;  // Class canonical name.
+  NameIndex class_reference_;  // Class canonical name.
   List<DartType> type_arguments_;
 
   DISALLOW_COPY_AND_ASSIGN(InterfaceType);
 };
 
 
 class TypedefType : public DartType {
  public:
   static TypedefType* ReadFrom(Reader* reader);
 
-  explicit TypedefType(intptr_t class_reference)
+  explicit TypedefType(NameIndex class_reference)
       : typedef_reference_(class_reference) {}
   virtual ~TypedefType();
 
   DEFINE_CASTING_OPERATIONS(TypedefType);
 
   virtual void AcceptDartTypeVisitor(DartTypeVisitor* visitor);
   virtual void VisitChildren(Visitor* visitor);
 
-  intptr_t typedef_reference() { return typedef_reference_; }
+  NameIndex typedef_reference() { return typedef_reference_; }
   List<DartType>& type_arguments() { return type_arguments_; }
 
  private:
   TypedefType() {}
 
-  intptr_t typedef_reference_;  // Typedef canonical name.
+  NameIndex typedef_reference_;  // Typedef canonical name.
   List<DartType> type_arguments_;
 
   DISALLOW_COPY_AND_ASSIGN(TypedefType);
 };
 
 
 class NamedParameter {
  public:
   static NamedParameter* ReadFrom(Reader* reader);
 
-  NamedParameter(intptr_t name_index, DartType* type)
+  NamedParameter(StringIndex name_index, DartType* type)
       : name_index_(name_index), type_(type) {}
 
-  intptr_t name() { return name_index_; }
+  StringIndex name() { return name_index_; }
   DartType* type() { return type_; }
 
  private:
-  NamedParameter() : name_index_(-1) {}
+  NamedParameter() {}
 
-  intptr_t name_index_;
+  StringIndex name_index_;
   Child<DartType> type_;
 
   DISALLOW_COPY_AND_ASSIGN(NamedParameter);
 };
 
 
 class FunctionType : public DartType {
  public:
   static FunctionType* ReadFrom(Reader* reader);
   static FunctionType* ReadFrom(Reader* reader, bool _without_type_arguments_);
@@ skipping 68 matching lines @@
  public:
   TypeParameter* ReadFrom(Reader* reader);
 
   virtual ~TypeParameter();
 
   DEFINE_CASTING_OPERATIONS(TypeParameter);
 
   virtual void AcceptTreeVisitor(TreeVisitor* visitor);
   virtual void VisitChildren(Visitor* visitor);
 
-  intptr_t name() { return name_index_; }
+  StringIndex name() { return name_index_; }
   DartType* bound() { return bound_; }
 
  private:
   TypeParameter() {}
 
   template <typename T>
   friend class List;
   friend class TypeParameterList;
 
-  intptr_t name_index_;
+  StringIndex name_index_;
   Child<DartType> bound_;
 
   DISALLOW_COPY_AND_ASSIGN(TypeParameter);
 };
 
 
 class Program : public TreeNode {
  public:
   static Program* ReadFrom(Reader* reader);
 
   virtual ~Program();
 
   DEFINE_CASTING_OPERATIONS(Program);
 
   virtual void AcceptTreeVisitor(TreeVisitor* visitor);
   virtual void VisitChildren(Visitor* visitor);
 
   SourceTable& source_table() { return source_table_; }
   List<Library>& libraries() { return libraries_; }
-  intptr_t main_method() { return main_method_reference_; }
+  NameIndex main_method() { return main_method_reference_; }
   MallocGrowableArray<MallocGrowableArray<intptr_t>*> valid_token_positions;
   MallocGrowableArray<MallocGrowableArray<intptr_t>*> yield_token_positions;
   intptr_t string_table_offset() { return string_table_offset_; }
   intptr_t name_table_offset() { return name_table_offset_; }
 
  private:
   Program() {}
 
+  NameIndex main_method_reference_;  // Procedure.
   List<Library> libraries_;
-  intptr_t main_method_reference_;  // Procedure.
   SourceTable source_table_;
 
   // The offset from the start of the binary to the start of the string table.
   intptr_t string_table_offset_;
 
   // The offset from the start of the binary to the canonical name table.
   intptr_t name_table_offset_;
 
   DISALLOW_COPY_AND_ASSIGN(Program);
 };
 
 
 class Reference : public AllStatic {
  public:
   // Read canonical name references.
-  static intptr_t ReadMemberFrom(Reader* reader, bool allow_null = false);
-  static intptr_t ReadClassFrom(Reader* reader, bool allow_null = false);
-  static intptr_t ReadTypedefFrom(Reader* reader);
+  static NameIndex ReadMemberFrom(Reader* reader, bool allow_null = false);
+  static NameIndex ReadClassFrom(Reader* reader, bool allow_null = false);
+  static NameIndex ReadTypedefFrom(Reader* reader);
 };
 
 
 class ExpressionVisitor {
  public:
   virtual ~ExpressionVisitor() {}
 
   virtual void VisitDefaultExpression(Expression* node) = 0;
   virtual void VisitDefaultBasicLiteral(BasicLiteral* node) {
     VisitDefaultExpression(node);
@@ skipping 381 matching lines @@
 }  // namespace kernel
 
 kernel::Program* ReadPrecompiledKernelFromBuffer(const uint8_t* buffer,
                                                  intptr_t buffer_length);
 
 
 }  // namespace dart
 
 #endif  // !defined(DART_PRECOMPILED_RUNTIME)
 #endif  // RUNTIME_VM_KERNEL_H_