Version 2.10.0-45.0.dev

Merge commit 'f3ce2d6c3342e317ae7d1bde5d5bed2d6ff7c31e' into 'dev'

Author: Dart CI

DEPS

@@ -118,7 +118,7 @@ vars = {
   "markupsafe_rev": "8f45f5cfa0009d2a70589bcda0349b8cb2b72783",
   "markdown_rev": "dbeafd47759e7dd0a167602153bb9c49fb5e5fe7",
   "matcher_rev": "9cae8faa7868bf3a88a7ba45eb0bd128e66ac515",
-  "mime_rev": "179b5e6a88f4b63f36dc1b8fcbc1e83e5e0cd3a7",
+  "mime_tag": "0.9.7",
   "mockito_rev": "d39ac507483b9891165e422ec98d9fb480037c8b",
   "mustache_rev": "664737ecad027e6b96d0d1e627257efa0e46fcb1",
   "oauth2_tag": "1.6.0",
@@ -363,7 +363,7 @@ deps = {
   Var("dart_root") + "/third_party/pkg/matcher":
       Var("dart_git") + "matcher.git" + "@" + Var("matcher_rev"),
   Var("dart_root") + "/third_party/pkg/mime":
-      Var("dart_git") + "mime.git" + "@" + Var("mime_rev"),
+      Var("dart_git") + "mime.git" + "@" + Var("mime_tag"),
   Var("dart_root") + "/third_party/pkg/mockito":
       Var("dart_git") + "mockito.git" + "@" + Var("mockito_rev"),
   Var("dart_root") + "/third_party/pkg/mustache":

pkg/analyzer/lib/dart/element/element.dart

@@ -528,6 +528,9 @@ abstract class Element implements AnalysisTarget {
   /// or `@Deprecated('..')`.
   bool get hasDeprecated;
 
+  /// Return `true` if this element has an annotation of the form `@doNotStore`.
+  bool get hasDoNotStore;
+
   /// Return `true` if this element has an annotation of the form `@factory`.
   bool get hasFactory;
 
@@ -702,6 +705,10 @@ abstract class ElementAnnotation implements ConstantEvaluationTarget {
   /// deprecated.
   bool get isDeprecated;
 
+  /// Return `true` if this annotation marks the associated element as not to be
+  /// stored.
+  bool get isDoNotStore;
+
   /// Return `true` if this annotation marks the associated member as a factory.
   bool get isFactory;
 

pkg/analyzer/lib/src/dart/element/element.dart

@@ -2284,6 +2284,10 @@ class ElementAnnotationImpl implements ElementAnnotation {
   /// deprecated.
   static const String _DEPRECATED_VARIABLE_NAME = "deprecated";
 
+  /// The name of the top-level variable used to mark an element as not to be
+  /// stored.
+  static const String _DO_NOT_STORE_VARIABLE_NAME = "doNotStore";
+
   /// The name of the top-level variable used to mark a method as being a
   /// factory.
   static const String _FACTORY_VARIABLE_NAME = "factory";
@@ -2411,6 +2415,12 @@ class ElementAnnotationImpl implements ElementAnnotation {
     return false;
   }
 
+  @override
+  bool get isDoNotStore =>
+      element is PropertyAccessorElement &&
+      element.name == _DO_NOT_STORE_VARIABLE_NAME &&
+      element.library?.name == _META_LIB_NAME;
+
   @override
   bool get isFactory =>
       element is PropertyAccessorElement &&
@@ -2674,6 +2684,18 @@ abstract class ElementImpl implements Element {
     return false;
   }
 
+  @override
+  bool get hasDoNotStore {
+    var metadata = this.metadata;
+    for (var i = 0; i < metadata.length; i++) {
+      var annotation = metadata[i];
+      if (annotation.isDoNotStore) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   @override
   bool get hasFactory {
     var metadata = this.metadata;
@@ -5957,6 +5979,9 @@ class MultiplyDefinedElementImpl implements MultiplyDefinedElement {
   @override
   bool get hasDeprecated => false;
 
+  @override
+  bool get hasDoNotStore => false;
+
   @override
   bool get hasFactory => false;
 

pkg/analyzer/lib/src/dart/element/member.dart

@@ -450,6 +450,9 @@ abstract class Member implements Element {
   @override
   bool get hasDeprecated => _declaration.hasDeprecated;
 
+  @override
+  bool get hasDoNotStore => _declaration.hasDoNotStore;
+
   @override
   bool get hasFactory => _declaration.hasFactory;
 

pkg/analyzer/lib/src/error/codes.dart

@@ -1587,6 +1587,7 @@ class CompileTimeErrorCode extends AnalyzerErrorCode {
       'CONST_EVAL_TYPE_TYPE',
       "In constant expressions, operands of this operator must be of type "
           "'Type'.");
+
   /**
    * Parameters:
    * 0: the name of the type of the initializer expression
@@ -2534,7 +2535,7 @@ class CompileTimeErrorCode extends AnalyzerErrorCode {
   static const CompileTimeErrorCode EXPORT_LEGACY_SYMBOL = CompileTimeErrorCode(
       'EXPORT_LEGACY_SYMBOL',
       "The symbol '{0}' is defined in a legacy library, and can't be "
-          "re-exported from a non-nullable by default library.",
+          "re-exported from a library with null safety enabled.",
       correction: "Try removing the export or migrating the legacy library.",
       hasPublishedDocs: true);
 

pkg/analyzer/tool/diagnostics/diagnostics.md

@@ -1907,7 +1907,7 @@ values are returned by an iterator.
 ### export_legacy_symbol
 
 _The symbol '{0}' is defined in a legacy library, and can't be re-exported from
-a non-nullable by default library._
+a library with null safety enabled._
 
 #### Description
 

pkg/pkg.status

@@ -85,8 +85,8 @@ front_end/test/fasta/strong4_test: Pass, ExtraSlow
 front_end/test/fasta/text_serialization_test: Pass, ExtraSlow
 front_end/test/fasta/types/dart2js_benchmark_test: Pass, Slow
 front_end/test/fasta/types/large_app_benchmark_test: Pass, ExtraSlow
-front_end/test/incremental_compiler_leak_test.dart: Pass, Slow
-front_end/test/incremental_dart2js_test.dart: Pass, Slow
+front_end/test/incremental_compiler_leak_test: Pass, Slow
+front_end/test/incremental_dart2js_test: Pass, Slow
 front_end/test/minimal_incremental_kernel_generator_test: Slow, Pass
 front_end/test/whole_program_test: Slow, Pass
 front_end/testcases/*: Skip # These are not tests but input for tests.