[kernel] [partial] Streaming of kernel binary without AST nodes

pkg/kernel/lib/binary/ast_from_binary.dart

 // 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.
 library kernel.ast_from_binary;
 
 import 'dart:convert';
 import 'dart:typed_data';
 
 import '../ast.dart';
 import '../transformations/flags.dart';
@@ skipping 647 matching lines @@
         : (tagByte & Tag.SpecializedTagMask);
     switch (tag) {
       case Tag.LoadLibrary:
         return new LoadLibrary(readDeferredImportReference());
       case Tag.CheckLibraryIsLoaded:
         return new CheckLibraryIsLoaded(readDeferredImportReference());
       case Tag.InvalidExpression:
         return new InvalidExpression();
       case Tag.VariableGet:
         int offset = readOffset();
+        readUInt(); // offset of the variable declaration in the binary.
         return new VariableGet(readVariableReference(), readDartTypeOption())
           ..fileOffset = offset;
       case Tag.SpecializedVariableGet:
         int index = tagByte & Tag.SpecializedPayloadMask;
         int offset = readOffset();
+        readUInt(); // offset of the variable declaration in the binary.
         return new VariableGet(variableStack[index])..fileOffset = offset;
       case Tag.VariableSet:
         int offset = readOffset();
+        readUInt(); // offset of the variable declaration in the binary.
         return new VariableSet(readVariableReference(), readExpression())
           ..fileOffset = offset;
       case Tag.SpecializedVariableSet:
         int index = tagByte & Tag.SpecializedPayloadMask;
         int offset = readOffset();
+        readUInt(); // offset of the variable declaration in the binary.
         return new VariableSet(variableStack[index], readExpression())
           ..fileOffset = offset;
       case Tag.PropertyGet:
         int offset = readOffset();
         return new PropertyGet.byReference(
             readExpression(), readName(), readMemberReference(allowNull: true))
           ..fileOffset = offset;
       case Tag.PropertySet:
         int offset = readOffset();
         return new PropertySet.byReference(readExpression(), readName(),
@@ skipping 251 matching lines @@
         return new ForInStatement(variable, iterable, body, isAsync: isAsync)
           ..fileOffset = offset;
       case Tag.SwitchStatement:
         var expression = readExpression();
         int count = readUInt();
         List<SwitchCase> cases =
             new List<SwitchCase>.generate(count, (i) => new SwitchCase.empty());
         switchCaseStack.addAll(cases);
         for (int i = 0; i < cases.length; ++i) {
           var caseNode = cases[i];
-          _fillTreeNodeList(caseNode.expressions, readExpression, caseNode);
-          caseNode.expressionOffsets.length = caseNode.expressions.length;
-          for (int i = 0; i < caseNode.expressionOffsets.length; ++i) {
+          int length = readUInt();
+          caseNode.expressions.length = length;
+          caseNode.expressionOffsets.length = length;
+          for (int i = 0; i < length; ++i) {
             caseNode.expressionOffsets[i] = readOffset();
+            caseNode.expressions[i] = readExpression()..parent = caseNode;
           }
           caseNode.isDefault = readByte() == 1;
           caseNode.body = readStatement()..parent = caseNode;
         }
         switchCaseStack.length -= count;
         return new SwitchStatement(expression, cases);
       case Tag.ContinueSwitchStatement:
         int index = readUInt();
         return new ContinueSwitchStatement(switchCaseStack[index]);
       case Tag.IfStatement:
         return new IfStatement(
             readExpression(), readStatement(), readStatementOrNullIfEmpty());
       case Tag.ReturnStatement:
         int offset = readOffset();
         return new ReturnStatement(readExpressionOption())..fileOffset = offset;
       case Tag.TryCatch:
-        return new TryCatch(readStatement(), readCatchList());
+        Statement body = readStatement();
+        readByte(); // whether any catch needs a stacktrace.
+        return new TryCatch(body, readCatchList());
       case Tag.TryFinally:
         return new TryFinally(readStatement(), readStatement());
       case Tag.YieldStatement:
         int offset = readOffset();
         int flags = readByte();
         return new YieldStatement(readExpression(),
             isYieldStar: flags & YieldStatement.FlagYieldStar != 0,
             isNative: flags & YieldStatement.FlagNative != 0)
           ..fileOffset = offset;
       case Tag.VariableDeclaration:
@@ skipping 80 matching lines @@
       case Tag.InterfaceType:
         return new InterfaceType.byReference(
             readClassReference(), readDartTypeList());
       case Tag.SimpleInterfaceType:
         return new InterfaceType.byReference(
             readClassReference(), const <DartType>[]);
       case Tag.FunctionType:
         int typeParameterStackHeight = typeParameterStack.length;
         var typeParameters = readAndPushTypeParameterList();
         var requiredParameterCount = readUInt();
+        var totalParameterCount = readUInt();
         var positional = readDartTypeList();
         var named = readNamedTypeList();
+        assert(positional.length + named.length == totalParameterCount);
         var returnType = readDartType();
         typeParameterStack.length = typeParameterStackHeight;
         return new FunctionType(positional, returnType,
             typeParameters: typeParameters,
             requiredParameterCount: requiredParameterCount,
             namedParameters: named);
       case Tag.SimpleFunctionType:
         var positional = readDartTypeList();
         var returnType = readDartType();
         return new FunctionType(positional, returnType);
       case Tag.TypeParameterType:
         int index = readUInt();
+        readUInt(); // offset of the TypeParameter declaration in the binary.
         return new TypeParameterType(typeParameterStack[index]);
       default:
         throw fail('Invalid dart type tag: $tag');
     }
   }
 
   List<TypeParameter> readAndPushTypeParameterList(
       [List<TypeParameter> list, TreeNode parent]) {
     int length = readUInt();
     if (length == 0) return list ?? <TypeParameter>[];
@@ skipping 12 matching lines @@
     }
     return list;
   }
 
   void readTypeParameter(TypeParameter node) {
     node.name = readStringOrNullIfEmpty();
     node.bound = readDartType();
   }
 
   Arguments readArguments() {
+    var numArguments = readUInt();
     var typeArguments = readDartTypeList();
     var positional = readExpressionList();
     var named = readNamedExpressionList();
+    assert(numArguments == positional.length + named.length);
     return new Arguments(positional, types: typeArguments, named: named);
   }
 
   List<NamedExpression> readNamedExpressionList() {
     return new List<NamedExpression>.generate(
         readUInt(), (i) => readNamedExpression());
   }
 
   NamedExpression readNamedExpression() {
     return new NamedExpression(readStringReference(), readExpression());
@@ skipping 26 matching lines @@
       ..fileOffset = offset
       ..fileEqualsOffset = fileEqualsOffset;
   }
 
   int readOffset() {
     // Offset is saved as unsigned,
     // but actually ranges from -1 and up (thus the -1)
     return readUInt() - 1;
   }
 }