Support deserialized compilation of the empty program.

pkg/compiler/lib/src/closure.dart

 // Copyright (c) 2012, 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 closureToClassMapper;
 
 import 'common.dart';
 import 'common/names.dart' show Identifiers;
 import 'common/resolution.dart' show Parsing, Resolution;
 import 'common/tasks.dart' show CompilerTask;
@@ skipping 113 matching lines @@
   bool get hasNode => false;
 
   Node get node {
     throw new SpannableAssertionFailure(
         local, 'Should not access node of ClosureFieldElement.');
   }
 
   bool get hasResolvedAst => hasTreeElements;
 
   ResolvedAst get resolvedAst {
-    return new ParsedResolvedAst(this, null, treeElements);
+    return new ParsedResolvedAst(this, null, null, treeElements);
   }
 
   Expression get initializer {
     throw new SpannableAssertionFailure(
         local, 'Should not access initializer of ClosureFieldElement.');
   }
 
   bool get isInstanceMember => true;
   bool get isAssignable => false;
 
@@ skipping 194 matching lines @@
     return closureClass.methodElement.memberContext;
   }
 
   bool get hasNode => expression.hasNode;
 
   FunctionExpression get node => expression.node;
 
   FunctionExpression parseNode(Parsing parsing) => node;
 
   ResolvedAst get resolvedAst {
-    return new ParsedResolvedAst(this, node, treeElements);
+    return new ParsedResolvedAst(this, node, node.body, treeElements);
   }
 
   Element get analyzableElement => closureClass.methodElement.analyzableElement;
 
   accept(ElementVisitor visitor, arg) {
     return visitor.visitMethodElement(this, arg);
   }
 }
 
 // The box-element for a scope, and the captured variables that need to be
@@ skipping 12 matching lines @@
   bool hasBoxedLoopVariables() => !boxedLoopVariables.isEmpty;
 
   bool isCapturedVariable(VariableElement variable) {
     return capturedVariables.containsKey(variable);
   }
 
   void forEachCapturedVariable(
       f(LocalVariableElement variable, BoxFieldElement boxField)) {
     capturedVariables.forEach(f);
   }
+
+  String toString() {

[sra1, 2016/04/19 03:07:30]

I prefer toString() methods to print so that they are not confusing if part of
another toString() output.  This usually means making a textual term with the
subparts in parens:

  ClosureScope(box=..., ...)

[Johnni Winther, 2016/04/19 07:22:23]

Will do in a follow-up.

+    StringBuffer sb = new StringBuffer();
+    if (boxElement != null) {
+      sb.write('box=$boxElement');
+    }
+    if (boxedLoopVariables.isNotEmpty) {
+      if (sb.isNotEmpty) {
+        sb.write(',');
+      }

[sra1, 2016/04/19 03:07:30]

I usually do this like so:

  var separator = '';

  sb.write(separator);
  separator = ', ';
  sb.write(item);

It is the same number of lines, but you don't need to think about the predicate
and decouples separators from the other state.

[Johnni Winther, 2016/04/19 07:22:23]

Will do in a follow-up.

+      sb.write('boxedLoopVariables=${boxedLoopVariables}');
+    }
+    if (capturedVariables.isNotEmpty) {
+      if (sb.isNotEmpty) {
+        sb.write(',');
+      }
+      sb.write('capturedVariables=');
+      capturedVariables.forEach((Local local, BoxFieldElement field) {

[sra1, 2016/04/19 03:07:30]

Might as well just print the map.

[Johnni Winther, 2016/04/19 07:22:23]

Some of the default toString implementations print only a subset of large
collections. Maybe that doesn't apply to Map?

+        sb.write('$local->${field} ');
+      });
+    }
+    return sb.toString();
+  }
 }
 
 class ClosureClassMap {
   // The closure's element before any translation. Will be null for methods.
   final LocalFunctionElement closureElement;
   // The closureClassElement will be null for methods that are not local
   // closures.
   final ClosureClassElement closureClassElement;
   // The callElement will be null for methods that are not local closures.
   final FunctionElement callElement;
@@ skipping 754 matching lines @@
 ///
 /// Move the below classes to a JS model eventually.
 ///
 abstract class JSEntity implements Entity {
   Entity get declaredEntity;
 }
 
 abstract class PrivatelyNamedJSEntity implements JSEntity {
   Entity get rootOfScope;
 }