[kernel] Streaming ScopeBuilder

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 448 matching lines @@
     var canonicalName = readCanonicalNameReference();
     var reference = canonicalName.getReference();
     Field node = reference.node;
     bool shouldWriteData = node == null || _isReadingLibraryImplementation;
     if (node == null) {
       node = new Field(null, reference: reference);
     }
     int fileOffset = readOffset();
     int fileEndOffset = readOffset();
     int flags = readByte();
+    readUInt(); // parent class binary offset.
     var name = readName();
     var fileUri = readUriReference();
     var annotations = readAnnotationList(node);
     debugPath.add(node.name?.name ?? 'field');
     var type = readDartType();
     var initializer = readExpressionOption();
     int transformerFlags = getAndResetTransformerFlags();
     debugPath.removeLast();
     if (shouldWriteData) {
       node.fileOffset = fileOffset;
@@ skipping 16 matching lines @@
     var canonicalName = readCanonicalNameReference();
     var reference = canonicalName.getReference();
     Constructor node = reference.node;
     bool shouldWriteData = node == null || _isReadingLibraryImplementation;
     if (node == null) {
       node = new Constructor(null, reference: reference);
     }
     var fileOffset = readOffset();
     var fileEndOffset = readOffset();
     var flags = readByte();
+    readUInt(); // parent class binary offset.
     var name = readName();
     var annotations = readAnnotationList(node);
     debugPath.add(node.name?.name ?? 'constructor');
     var function = readFunctionNode();
     pushVariableDeclarations(function.positionalParameters);
     pushVariableDeclarations(function.namedParameters);
     _fillTreeNodeList(node.initializers, readInitializer, node);
     variableStack.length = 0;
     var transformerFlags = getAndResetTransformerFlags();
     debugPath.removeLast();
@@ skipping 17 matching lines @@
     Procedure node = reference.node;
     bool shouldWriteData = node == null || _isReadingLibraryImplementation;
     if (node == null) {
       node = new Procedure(null, null, null, reference: reference);
     }
     var fileOffset = readOffset();
     var fileEndOffset = readOffset();
     int kindIndex = readByte();
     var kind = ProcedureKind.values[kindIndex];
     var flags = readByte();
+    readUInt(); // parent class binary offset.
     var name = readName();
     var fileUri = readUriReference();
     var annotations = readAnnotationList(node);
     debugPath.add(node.name?.name ?? 'procedure');
     var function = readFunctionNodeOption();
     var transformerFlags = getAndResetTransformerFlags();
     debugPath.removeLast();
     if (shouldWriteData) {
       node.fileOffset = fileOffset;
       node.fileEndOffset = fileEndOffset;
@@ skipping 28 matching lines @@
       default:
         throw fail('Invalid initializer tag: $tag');
     }
   }
 
   FunctionNode readFunctionNodeOption() {
     return readAndCheckOptionTag() ? readFunctionNode() : null;
   }
 
   FunctionNode readFunctionNode() {
+    int tag = readByte();
+    assert(tag == Tag.FunctionNode);
     int offset = readOffset();
     int endOffset = readOffset();
     AsyncMarker asyncMarker = AsyncMarker.values[readByte()];
     AsyncMarker dartAsyncMarker = AsyncMarker.values[readByte()];
     int typeParameterStackHeight = typeParameterStack.length;
     var typeParameters = readAndPushTypeParameterList();
     var requiredParameterCount = readUInt();
     int variableStackHeight = variableStack.length;
     var positional = readAndPushVariableDeclarationList();
     var named = readAndPushVariableDeclarationList();
@@ skipping 572 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;
   }
 }