[kernel] Allow local initializers with redirecting constructors.

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 1079 matching lines @@
     const intptr_t named_count =
         builder_->ReadListLength();  // read named_parameters list length.
     for (intptr_t i = 0; i < named_count; ++i) {
       // read string reference (i.e. named_parameters[i].name).
       builder_->SkipStringReference();
       VisitDartType();  // read named_parameters[i].type.
     }
   }
 
   builder_->SkipListOfStrings();  // read positional parameter names.
-  VisitDartType();  // read return type.
+  VisitDartType();                // read return type.
 }
 
 void StreamingScopeBuilder::VisitTypeParameterType() {
   Function& function = Function::Handle(Z, parsed_function_->function().raw());
   while (function.IsClosureFunction()) {
     function = function.parent_function();
   }
 
   if (function.IsFactory()) {
     // The type argument vector is passed as the very first argument to the
@@ skipping 1702 matching lines @@
   // These come from:
   //   class A {
   //     var x = (expr);
   //   }
   // We don't want to do that when this is a Redirecting Constructors though
   // (i.e. has a single initializer being of type kRedirectingInitializer).
   bool is_redirecting_constructor = false;
   {
     AlternativeReadingScope alt(reader_, initializers_offset);
     intptr_t list_length = ReadListLength();  // read initializers list length.
-    if (list_length == 1) {
-      Tag tag = ReadTag();
-      if (tag == kRedirectingInitializer) is_redirecting_constructor = true;
+    bool no_field_initializers = true;
+    for (intptr_t i = 0; i < list_length; ++i) {
+      if (PeekTag() == kRedirectingInitializer)

[jensj, 2017/08/07 09:12:21]

nit: I think the style guide wants braces because
a) its not on one line
b) it has an else case

(I'm not saying I've necessarily adhered to it all the time though I should).

[sjindel, 2017/08/07 09:17:41]

Done.

+        is_redirecting_constructor = true;
+      else if (PeekTag() == kFieldInitializer)
+        no_field_initializers = false;
+      SkipInitializer();
     }
+    ASSERT(is_redirecting_constructor ? no_field_initializers : true);
   }
 
   if (!is_redirecting_constructor) {
     AlternativeReadingScope alt(reader_, constructor_class_parent_offset);
     ClassHelper class_helper(this);
     class_helper.ReadUntilExcluding(ClassHelper::kFields);
     intptr_t list_length = ReadListLength();  // read fields list length.
 
     for (intptr_t i = 0; i < list_length; ++i) {
       intptr_t field_offset = ReaderOffset();
@@ skipping 48 matching lines @@
           argument_count += 1;
 
           const Function& target = Function::ZoneHandle(
               Z, H.LookupConstructorByKernelConstructor(canonical_target));
           instructions += StaticCall(TokenPosition::kNoSource, target,
                                      argument_count, argument_names);
           instructions += Drop();
           break;
         }
         case kRedirectingInitializer: {
-          ASSERT(list_length == 1);
           NameIndex canonical_target =
               ReadCanonicalNameReference();  // read target_reference.
 
           instructions += LoadLocal(scopes()->this_variable);
           instructions += PushArgument();
 
           // TODO(jensj): ASSERT(init->arguments()->types().length() == 0);
           Array& argument_names = Array::ZoneHandle(Z);
           intptr_t argument_count;
           instructions += BuildArguments(&argument_names,
@@ skipping 899 matching lines @@
     const intptr_t named_count =
         ReadListLength();  // read named_parameters list length.
     for (intptr_t i = 0; i < named_count; ++i) {
       // read string reference (i.e. named_parameters[i].name).
       SkipStringReference();
       SkipDartType();  // read named_parameters[i].type.
     }
   }
 
   SkipListOfStrings();  // read positional parameter names.
-  SkipDartType();  // read return type.
+  SkipDartType();       // read return type.
 }
 
 void StreamingFlowGraphBuilder::SkipListOfExpressions() {
   intptr_t list_length = ReadListLength();  // read list length.
   for (intptr_t i = 0; i < list_length; ++i) {
     SkipExpression();  // read ith expression.
   }
 }
 
 void StreamingFlowGraphBuilder::SkipListOfDartTypes() {
@@ skipping 18 matching lines @@
 }
 
 void StreamingFlowGraphBuilder::SkipTypeParametersList() {
   intptr_t list_length = ReadListLength();  // read list length.
   for (intptr_t i = 0; i < list_length; ++i) {
     SkipStringReference();  // read ith name index.
     SkipDartType();         // read ith bound.
   }
 }
 
+void StreamingFlowGraphBuilder::SkipInitializer() {
+  Tag tag = ReadTag();
+  ReadByte();  // read isSynthetic flag.
+  switch (tag) {
+    case kInvalidInitializer:
+      return;
+    case kFieldInitializer:
+      SkipCanonicalNameReference();  // read field_reference.
+      SkipExpression();              // read value.
+      return;
+    case kSuperInitializer:
+      SkipCanonicalNameReference();  // read target_reference.
+      SkipArguments();               // read arguments.
+      return;
+    case kRedirectingInitializer:
+      SkipCanonicalNameReference();  // read target_reference.
+      SkipArguments();               // read arguments.
+      return;
+    case kLocalInitializer:
+      SkipVariableDeclaration();  // read variable.
+      return;
+    default:
+      UNREACHABLE();
+  }
+}
+
 void StreamingFlowGraphBuilder::SkipExpression() {
   uint8_t payload = 0;
   Tag tag = ReadTag(&payload);
   switch (tag) {
     case kInvalidExpression:
       return;
     case kVariableGet:
       ReadPosition();          // read position.
       ReadUInt();              // read kernel position.
       ReadUInt();              // read relative variable index.
@@ skipping 2060 matching lines @@
   instructions +=
       StoreInstanceField(TokenPosition::kNoSource, Closure::function_offset());
 
   instructions += LoadLocal(closure);
   instructions += LoadLocal(context);
   instructions +=
       StoreInstanceField(TokenPosition::kNoSource, Closure::context_offset());
 
   instructions += Drop();
 
-  SkipDartType();  // skip function type of the closure.
+  SkipDartType();         // skip function type of the closure.
   SkipListOfDartTypes();  // skip list of type arguments.
 
   return instructions;
 }
 
 Fragment StreamingFlowGraphBuilder::BuildInvalidStatement() {
   H.ReportError("Invalid statements not implemented yet!");
   return Fragment();
 }
 
@@ skipping 1355 matching lines @@
     }
   }
 
   return Array::Handle(Array::null());
 }
 
 }  // namespace kernel
 }  // namespace dart
 
 #endif  // !defined(DART_PRECOMPILED_RUNTIME)