Migrate UnlinkedVariable.constExpr to UnlinkedExecutable.bodyExpr.

pkg/analyzer/lib/src/summary/format.fbs

 // Copyright (c) 2015, 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.
 //
 // This file has been automatically generated.  Please do not edit it manually.
 // To regenerate the file, use the script "pkg/analyzer/tool/generate_files".
 
 
 /**
  * Kind of a source in the cache.
@@ skipping 1454 matching lines @@
    * `invokeConstructor`.
    */
   strings:[string] (id: 3);
 }
 
 /**
  * Unlinked summary information about a constructor initializer.
  */
 table UnlinkedConstructorInitializer {
   /**
-   * If [kind] is `thisInvocation` or `superInvocation`, the arguments of the
-   * invocation.  Otherwise empty.
-   */
-  arguments:[UnlinkedConst] (id: 3);
-
-  /**
    * If there are `m` [arguments] and `n` [argumentNames], then each argument
    * from [arguments] with index `i` such that `n + i - m >= 0`, should be used
    * with the name at `n + i - m`.
    */
   argumentNames:[string] (id: 4);
 
   /**
+   * If [kind] is `thisInvocation` or `superInvocation`, the arguments of the
+   * invocation.  Otherwise empty.
+   */
+  arguments:[UnlinkedConst] (id: 3);
+
+  /**
    * If [kind] is `field`, the expression of the field initializer.
    * Otherwise `null`.
    */
   expression:UnlinkedConst (id: 1);
 
   /**
    * The kind of the constructor initializer (field, redirect, super).
    */
   kind:UnlinkedConstructorInitializerKind (id: 2);
 
@@ skipping 92 matching lines @@
  * Unlinked summary information about a function, method, getter, or setter
  * declaration.
  */
 table UnlinkedExecutable {
   /**
    * Annotations for this executable.
    */
   annotations:[UnlinkedConst] (id: 6);
 
   /**
+   * If this executable's function body is declared using `=>`, the expression
+   * to the right of the `=>`.  May be omitted if neither type inference nor
+   * constant evaluation depends on the function body.
+   */
+  bodyExpr:UnlinkedConst (id: 29);
+
+  /**
    * Code range of the executable.
    */
   codeRange:CodeRange (id: 26);
 
   /**
    * If a constant [UnlinkedExecutableKind.constructor], the constructor
    * initializers.  Otherwise empty.
    */
   constantInitializers:[UnlinkedConstructorInitializer] (id: 14);
 
@@ skipping 679 matching lines @@
  */
 table UnlinkedVariable {
   /**
    * Annotations for this variable.
    */
   annotations:[UnlinkedConst] (id: 8);
 
   /**
    * Code range of the variable.
    */
-  codeRange:CodeRange (id: 14);
-
-  /**
-   * If [isConst] is true, and the variable has an initializer, the constant
-   * expression in the initializer.  Note that the presence of this expression
-   * does not mean that it is a valid, check [UnlinkedConst.isInvalid].
-   */
-  constExpr:UnlinkedConst (id: 5);
+  codeRange:CodeRange (id: 5);
 
   /**
    * Documentation comment for the variable, or `null` if there is no
    * documentation comment.
    */
   documentationComment:UnlinkedDocumentationComment (id: 10);
 
   /**
    * If this variable is inferable, nonzero slot id identifying which entry in
    * [LinkedLibrary.types] contains the inferred type for this variable.  If
@@ skipping 59 matching lines @@
 
   /**
    * If a local variable, the beginning of the visible range; zero otherwise.
    */
   visibleOffset:uint (id: 12);
 }
 
 root_type PackageBundle;
 
 file_identifier "PBdl";