[kernel] Stream kernel_reader

runtime/vm/kernel_binary_flowgraph.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.
 
 #include "vm/kernel_binary_flowgraph.h"
 
 #include "vm/compiler.h"
 #include "vm/longjump.h"
 #include "vm/object_store.h"
 
@@ skipping 329 matching lines @@
   ProcedureHelper procedure_helper(builder_);
   procedure_helper.ReadUntilExcluding(ProcedureHelper::kFunction);
   if (builder_->ReadTag() == kSomething) {
     VisitFunctionNode();
   }
 }
 
 void StreamingScopeBuilder::VisitField() {
   FieldHelper field_helper(builder_);
   field_helper.ReadUntilExcluding(FieldHelper::kType);
-  VisitDartType();                         // read type.
-  Tag tag = builder_->ReadTag();           // read initializer (part 1).
+  VisitDartType();                // read type.
+  Tag tag = builder_->ReadTag();  // read initializer (part 1).
   if (tag == kSomething) {
     VisitExpression();  // read initializer (part 2).
   }
 }
 
 void StreamingScopeBuilder::VisitFunctionNode() {
   FunctionNodeHelper function_node_helper(builder_);
   function_node_helper.ReadUntilExcluding(FunctionNodeHelper::kTypeParameters);
 
   intptr_t list_length =
@@ skipping 715 matching lines @@
     // factory constructor function.
     HandleSpecialLoad(&result_->type_arguments_variable,
                       Symbols::TypeArgumentsParameter());
   } else {
     // The type argument vector is stored on the instance object. We therefore
     // need to capture `this`.
     HandleSpecialLoad(&result_->this_variable, Symbols::This());
   }
 
   builder_->ReadUInt();              // read index for parameter.
-  builder_->ReadUInt();              // read binary offset.
+  builder_->ReadUInt();              // read list binary offset.
+  builder_->ReadUInt();              // read index in list.
   builder_->SkipOptionalDartType();  // read bound bound.
 }
 
 void StreamingScopeBuilder::HandleLocalFunction(intptr_t parent_kernel_offset) {
   // "Peek" ahead into the function node
   intptr_t offset = builder_->ReaderOffset();
 
   FunctionNodeHelper function_node_helper(builder_);
   function_node_helper.ReadUntilExcluding(
       FunctionNodeHelper::kPositionalParameters);
@@ skipping 51 matching lines @@
   for (intptr_t i = 0; i < list_length; ++i) {
     AddVariableDeclarationParameter(pos++);  // read ith named parameter.
   }
 }
 
 void StreamingScopeBuilder::AddVariableDeclarationParameter(intptr_t pos) {
   intptr_t kernel_offset = builder_->ReaderOffset();  // no tag.
   VariableDeclarationHelper helper(builder_);
   helper.ReadUntilExcluding(VariableDeclarationHelper::kType);
   String& name = H.DartSymbol(helper.name_index_);
-  AbstractType& type = T.BuildVariableType();                    // read type.
+  AbstractType& type = T.BuildVariableType();  // read type.
   helper.SetJustRead(VariableDeclarationHelper::kType);
   helper.ReadUntilExcluding(VariableDeclarationHelper::kInitializer);
 
   LocalVariable* variable =
       MakeVariable(helper.position_, helper.position_, name, type);
   if (helper.IsFinal()) {
     variable->set_is_final();
   }
   if (variable->name().raw() == Symbols::IteratorParameter().raw()) {
     variable->set_is_forced_stack();
@@ skipping 380 matching lines @@
     signature_type ^=
         ClassFinalizer::FinalizeType(*active_class_->klass, signature_type);
     // Do not refer to signature_function anymore, since it may have been
     // replaced during canonicalization.
     signature_function = Function::null();
   }
 
   result_ = signature_type.raw();
 }
 
-intptr_t StreamingDartTypeTranslator::FindTypeParameterIndex(
-    intptr_t parameters_offset,
-    intptr_t parameters_count,
-    intptr_t look_for) {
-  AlternativeReadingScope alt(builder_->reader_, parameters_offset);
-  for (intptr_t i = 0; i < parameters_count; ++i) {
-    if (look_for == builder_->ReaderOffset()) {
-      return i;
-    }
-    builder_->SkipStringReference();  // read string index (name).
-    builder_->SkipDartType();         // read dart type.
-  }
-  return -1;
-}
-
 void StreamingDartTypeTranslator::BuildTypeParameterType() {
   builder_->ReadUInt();                           // read parameter index.
-  intptr_t binary_offset = builder_->ReadUInt();  // read binary offset.
+  intptr_t binary_offset = builder_->ReadUInt();  // read lists binary offset.
+  intptr_t list_index = builder_->ReadUInt();     // read index in list.
   builder_->SkipOptionalDartType();               // read bound.
 
-  if (binary_offset == 0) {
-    // TODO(jensj): This doesn't appear to actually happen.
-    UNIMPLEMENTED();
-    return;
-  }
+  ASSERT(binary_offset > 0);
 
   for (TypeParameterScope* scope = type_parameter_scope_; scope != NULL;
        scope = scope->outer()) {
-    const intptr_t index = FindTypeParameterIndex(
-        scope->parameters_offset(), scope->parameters_count(), binary_offset);
-    if (index >= 0) {
+    if (scope->parameters_offset() == binary_offset) {
       result_ ^= dart::Type::DynamicType();
       return;
     }
   }
 
   if (active_class_->member_is_procedure) {
     if (active_class_->member_type_parameters > 0) {
       //
       // WARNING: This is a little hackish:
       //
       // We have a static factory constructor. The kernel IR gives the factory
       // constructor function it's own type parameters (which are equal in name
       // and number to the ones of the enclosing class).
       // I.e.,
       //
       //   class A<T> {
       //     factory A.x() { return new B<T>(); }
       //   }
       //
       //  is basically translated to this:
       //
       //   class A<T> {
       //     static A.x<T'>() { return new B<T'>(); }
       //   }
       //
-      const intptr_t index = FindTypeParameterIndex(
-          active_class_->member_type_parameters_offset_start,
-          active_class_->member_type_parameters, binary_offset);
-      if (index >= 0) {
+      if (active_class_->member_type_parameters_offset_start == binary_offset) {
         if (active_class_->member_is_factory_procedure) {
           // The index of the type parameter in [parameters] is
           // the same index into the `klass->type_parameters()` array.
           result_ ^= dart::TypeArguments::Handle(
                          Z, active_class_->klass->type_parameters())
-                         .TypeAt(index);
+                         .TypeAt(list_index);
         } else {
           result_ ^= dart::Type::DynamicType();
         }
         return;
       }
     }
   }
 
-  const intptr_t index = FindTypeParameterIndex(
-      active_class_->class_type_parameters_offset_start,
-      active_class_->class_type_parameters, binary_offset);
-  if (index >= 0) {
+  if (active_class_->class_type_parameters_offset_start == binary_offset) {
     // The index of the type parameter in [parameters] is
     // the same index into the `klass->type_parameters()` array.
     result_ ^=
         dart::TypeArguments::Handle(Z, active_class_->klass->type_parameters())
-            .TypeAt(index);
+            .TypeAt(list_index);
     return;
   }
 
   UNREACHABLE();
 }
 
 const TypeArguments& StreamingDartTypeTranslator::BuildTypeArguments(
     intptr_t length) {
   bool only_dynamic = true;
   intptr_t offset = builder_->ReaderOffset();
@@ skipping 1057 matching lines @@
       // List of named.
       list_length = ReadListLength();  // read list length.
       ASSERT(num_optional_parameters == list_length);
       ASSERT(!parsed_function()->function().HasOptionalPositionalParameters());
       for (intptr_t i = 0; i < list_length; ++i) {
         Instance* default_value;
 
         // Read ith variable declaration
         VariableDeclarationHelper helper(this);
         helper.ReadUntilExcluding(VariableDeclarationHelper::kInitializer);
-        Tag tag = ReadTag();    // read (first part of) initializer.
+        Tag tag = ReadTag();  // read (first part of) initializer.
         if (tag == kSomething) {
           // this will (potentially) read the initializer,
           // but reset the position.
           default_value =
               &constant_evaluator_.EvaluateExpression(ReaderOffset());
           SkipExpression();  // read (actual) initializer.
         } else {
           default_value = &Instance::ZoneHandle(Z, Instance::null());
         }
         default_values->Add(default_value);
       }
     } else {
       // List of positional.
       intptr_t list_length = ReadListLength();  // read list length.
       ASSERT(list_length == function_node_helper.required_parameter_count_ +
                                 num_optional_parameters);
       ASSERT(parsed_function()->function().HasOptionalPositionalParameters());
       for (intptr_t i = 0; i < function_node_helper.required_parameter_count_;
            ++i) {
         SkipVariableDeclaration();  // read ith variable declaration.
       }
       for (intptr_t i = 0; i < num_optional_parameters; ++i) {
         Instance* default_value;
 
         // Read ith variable declaration
         VariableDeclarationHelper helper(this);
         helper.ReadUntilExcluding(VariableDeclarationHelper::kInitializer);
-        Tag tag = ReadTag();    // read (first part of) initializer.
+        Tag tag = ReadTag();  // read (first part of) initializer.
         if (tag == kSomething) {
           // this will (potentially) read the initializer,
           // but reset the position.
           default_value =
               &constant_evaluator_.EvaluateExpression(ReaderOffset());
           SkipExpression();  // read (actual) initializer.
         } else {
           default_value = &Instance::ZoneHandle(Z, Instance::null());
         }
         default_values->Add(default_value);
@@ skipping 159 matching lines @@
           //      }
           //
           // (This is strictly speaking not what one should do in terms of the
           //  specification but that is how it is currently implemented.)
           LocalVariable* variable = LookupVariable(ReaderOffset());
 
           // Variable declaration
           VariableDeclarationHelper helper(this);
           helper.ReadUntilExcluding(VariableDeclarationHelper::kInitializer);
           ASSERT(!helper.IsConst());
-          Tag tag = ReadTag();    // read (first part of) initializer.
+          Tag tag = ReadTag();  // read (first part of) initializer.
           if (tag != kSomething) {
             UNREACHABLE();
           }
 
           instructions += BuildExpression();  // read initializer.
           instructions += StoreLocal(TokenPosition::kNoSource, variable);
           instructions += Drop();
           break;
         }
         default:
@@ skipping 752 matching lines @@
   StringIndex name_index = ReadStringReference();  // read name index.
   if ((H.StringSize(name_index) >= 1) && H.CharacterAt(name_index, 0) == '_') {
     NameIndex library_reference =
         ReadCanonicalNameReference();  // read library index.
     return H.DartGetterName(library_reference, name_index);
   } else {
     return H.DartGetterName(NameIndex(), name_index);
   }
 }
 
+const dart::String& StreamingFlowGraphBuilder::ReadNameAsFieldName() {
+  StringIndex name_index = ReadStringReference();  // read name index.
+  if ((H.StringSize(name_index) >= 1) && H.CharacterAt(name_index, 0) == '_') {
+    NameIndex library_reference =
+        ReadCanonicalNameReference();  // read library index.
+    return H.DartFieldName(library_reference, name_index);
+  } else {
+    return H.DartFieldName(NameIndex(), name_index);
+  }
+}
+
 void StreamingFlowGraphBuilder::SkipStringReference() {
   ReadUInt();
 }
 
 void StreamingFlowGraphBuilder::SkipCanonicalNameReference() {
   ReadUInt();
 }
 
 void StreamingFlowGraphBuilder::SkipDartType() {
   Tag tag = ReadTag();
@@ skipping 11 matching lines @@
       SkipInterfaceType(true);
       return;
     case kFunctionType:
       SkipFunctionType(false);
       return;
     case kSimpleFunctionType:
       SkipFunctionType(true);
       return;
     case kTypeParameterType:
       ReadUInt();              // read index for parameter.
-      ReadUInt();              // read binary offset.
+      ReadUInt();              // read list binary offset.
+      ReadUInt();              // read index in list.
       SkipOptionalDartType();  // read bound bound.
       return;
     default:
       UNREACHABLE();
   }
 }
 
 void StreamingFlowGraphBuilder::SkipOptionalDartType() {
   Tag tag = ReadTag();  // read tag.
   if (tag == kNothing) {
@@ skipping 2705 matching lines @@
   JoinEntryInstr* after_try = BuildJoinEntry();
 
   intptr_t offset = ReaderOffset();
   SkipStatement();  // temporarily read body.
   intptr_t finalizer_offset = ReaderOffset();
   SetOffset(offset);
 
   // Fill in the body of the try.
   try_depth_inc();
   {
-    TryFinallyBlock tfb(flow_graph_builder_, NULL, finalizer_offset);
+    TryFinallyBlock tfb(flow_graph_builder_, finalizer_offset);
     TryCatchBlock tcb(flow_graph_builder_, try_handler_index);
     try_body += BuildStatement();  // read body.
   }
   try_depth_dec();
 
   if (try_body.is_open()) {
     // Please note: The try index will be on level out of this block,
     // thereby ensuring if there's an exception in the finally block we
     // won't run it twice.
     JoinEntryInstr* finally_entry = BuildJoinEntry();
@@ skipping 403 matching lines @@
           ReadListLength();  // read list length.
       ASSERT(named_parameters_count_check == named_parameters_count);
     }
 
     // Read ith variable declaration.
     VariableDeclarationHelper helper(this);
     helper.ReadUntilExcluding(VariableDeclarationHelper::kInitializer);
     param_descriptor.SetAt(entry_start + Parser::kParameterIsFinalOffset,
                            helper.IsFinal() ? Bool::True() : Bool::False());
 
-    Tag tag = ReadTag();    // read (first part of) initializer.
+    Tag tag = ReadTag();  // read (first part of) initializer.
     if (tag == kSomething) {
       // this will (potentially) read the initializer, but reset the position.
       Instance& constant =
           constant_evaluator_.EvaluateExpression(ReaderOffset());
       SkipExpression();  // read (actual) initializer.
       param_descriptor.SetAt(entry_start + Parser::kParameterDefaultValueOffset,
                              constant);
     } else {
       param_descriptor.SetAt(entry_start + Parser::kParameterDefaultValueOffset,
                              Object::null_instance());
@@ skipping 35 matching lines @@
     metadata_values.SetAt(i, value);
   }
 
   return metadata_values.raw();
 }
 
 }  // namespace kernel
 }  // namespace dart
 
 #endif  // !defined(DART_PRECOMPILED_RUNTIME)