Kernel debugging; service tests

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 '../ast.dart';
 import 'tag.dart';
 import 'loader.dart';
 import 'dart:convert';
 import 'package:kernel/transformations/flags.dart';
@@ skipping 169 matching lines @@
     Map<String, Source> uriToSource = readUriToSource();
     importTable.length = readUInt();
     for (int i = 0; i < importTable.length; ++i) {
       importTable[i] = new Library(null);
     }
     for (int i = 0; i < importTable.length; ++i) {
       _currentLibrary = importTable[i];
       readLibrary();
     }
     var mainMethod = readMemberReference(allowNull: true);
-    return new Program(importTable, uriToSource)
-      ..mainMethod = mainMethod;
+    return new Program(importTable, uriToSource)..mainMethod = mainMethod;
   }
 
   Map<String, Source> readUriToSource() {
     readSourceUriTable();
     int length = _sourceUriTable.length;
     Map<String, Source> uriToLineStarts = <String, Source>{};
     for (int i = 0; i < length; ++i) {
       String uri = _sourceUriTable[i];
       String sourceCode = readStringEntry();
       int lineCount = readUInt();
@@ skipping 366 matching lines @@
             readName(), readExpression(), readMemberReference(allowNull: true));
       case Tag.DirectPropertyGet:
         return new DirectPropertyGet(readExpression(), readMemberReference());
       case Tag.DirectPropertySet:
         return new DirectPropertySet(
             readExpression(), readMemberReference(), readExpression());
       case Tag.StaticGet:
         int offset = readOffset();
         return new StaticGet(readMemberReference())..fileOffset = offset;
       case Tag.StaticSet:
-        return new StaticSet(readMemberReference(), readExpression());
+        int offset = readOffset();
+        return new StaticSet(readMemberReference(), readExpression())
+          ..fileOffset = offset;
       case Tag.MethodInvocation:
         int offset = readOffset();
         return new MethodInvocation(
             readExpression(),
             readName(),
             readArguments(),
             readMemberReference(allowNull: true))..fileOffset = offset;
       case Tag.SuperMethodInvocation:
         int offset = readOffset();
         addTransformerFlag(TransformerFlag.superCalls);
@@ skipping 29 matching lines @@
             readExpression(), readDartTypeOption());
       case Tag.StringConcatenation:
         int offset = readOffset();
         return new StringConcatenation(readExpressionList())
           ..fileOffset = offset;
       case Tag.IsExpression:
         int offset = readOffset();
         return new IsExpression(readExpression(), readDartType())
           ..fileOffset = offset;
       case Tag.AsExpression:
-        return new AsExpression(readExpression(), readDartType());
+        int offset = readOffset();
+        return new AsExpression(readExpression(), readDartType())
+          ..fileOffset = offset;
       case Tag.StringLiteral:
         return new StringLiteral(readStringReference());
       case Tag.SpecializedIntLiteral:
         int biasedValue = tagByte & Tag.SpecializedPayloadMask;
         return new IntLiteral(biasedValue - Tag.SpecializedIntLiteralBias);
       case Tag.PositiveIntLiteral:
         return new IntLiteral(readUInt());
       case Tag.NegativeIntLiteral:
         return new IntLiteral(-readUInt());
       case Tag.BigIntLiteral:
@@ skipping 11 matching lines @@
       case Tag.TypeLiteral:
         return new TypeLiteral(readDartType());
       case Tag.ThisExpression:
         return new ThisExpression();
       case Tag.Rethrow:
         return new Rethrow();
       case Tag.Throw:
         int offset = readOffset();
         return new Throw(readExpression())..fileOffset = offset;
       case Tag.ListLiteral:
+        int offset = readOffset();
         var typeArgument = readDartType();
         return new ListLiteral(readExpressionList(),
-            typeArgument: typeArgument, isConst: false);
+            typeArgument: typeArgument, isConst: false)..fileOffset = offset;
       case Tag.ConstListLiteral:
+        int offset = readOffset();
         var typeArgument = readDartType();
         return new ListLiteral(readExpressionList(),
-            typeArgument: typeArgument, isConst: true);
+            typeArgument: typeArgument, isConst: true)..fileOffset = offset;
       case Tag.MapLiteral:
         int offset = readOffset();
         var keyType = readDartType();
         var valueType = readDartType();
         return new MapLiteral(readMapEntryList(),
             keyType: keyType,
             valueType: valueType,
             isConst: false)..fileOffset = offset;
       case Tag.ConstMapLiteral:
         int offset = readOffset();
@@ skipping 57 matching lines @@
         return new EmptyStatement();
       case Tag.AssertStatement:
         return new AssertStatement(readExpression(), readExpressionOption());
       case Tag.LabeledStatement:
         var label = new LabeledStatement(null);
         labelStack.add(label);
         label.body = readStatement()..parent = label;
         labelStack.removeLast();
         return label;
       case Tag.BreakStatement:
+        int offset = readOffset();
         int index = readUInt();
-        return new BreakStatement(labelStack[labelStackBase + index]);
+        return new BreakStatement(labelStack[labelStackBase + index])
+          ..fileOffset = offset;
       case Tag.WhileStatement:
         return new WhileStatement(readExpression(), readStatement());
       case Tag.DoStatement:
         return new DoStatement(readStatement(), readExpression());
       case Tag.ForStatement:
         int variableStackHeight = variableStack.length;
         var variables = readAndPushVariableDeclarationList();
         var condition = readExpressionOption();
         var updates = readExpressionList();
         var body = readStatement();
@@ skipping 197 matching lines @@
   }
 
   VariableDeclaration readAndPushVariableDeclaration() {
     var variable = readVariableDeclaration();
     variableStack.add(variable);
     return variable;
   }
 
   VariableDeclaration readVariableDeclaration() {
     int offset = readOffset();
+    int fileEqualsOffset = readOffset();
     int flags = readByte();
     return new VariableDeclaration(readStringOrNullIfEmpty(),
         type: readDartType(),
         inferredValue: readOptionalInferredValue(),
         initializer: readExpressionOption(),
         isFinal: flags & 0x1 != 0,
-        isConst: flags & 0x2 != 0)..fileOffset = offset;
+        isConst: flags & 0x2 != 0)
+      ..fileOffset = offset
+      ..fileEqualsOffset = fileEqualsOffset;
   }
 
   int readOffset() {
     // Offset is saved as unsigned,
     // but actually ranges from -1 and up (thus the -1)
     return readUInt() - 1;
   }
 }