From e9ec3d5656c8ba130fe55647e3d91ae42a76cd7e Mon Sep 17 00:00:00 2001
From: Martin Kustermann <kustermann@google.com>
Date: Wed, 28 Oct 2020 02:26:48 +0100
Subject: [PATCH] Manual Dart SDK roll 6e015bd9cddb to 9c6e76468ca4 (6
 revisions (flutter/engine#22153)

This includes the commits from

  https://dart.googlesource.com/sdk.git/+log/6e015bd9cddb..9c6e76468ca4

as well as the changes from

  https://github.com/flutter/engine/pull/22149/files

which are needed due to dart-lang/sdk@23ee425de7533b
---
 DEPS                                                         | 4 ++--
 .../flutter/tools/const_finder/test/const_finder_test.dart   | 5 +++++
 .../flutter/tools/const_finder/test/fixtures/lib/consts.dart | 3 +++
 .../tools/const_finder/test/fixtures/lib/consts_and_non.dart | 3 +++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/DEPS b/DEPS
index 9cba32efa19..4e77c00034a 100644
--- a/DEPS
+++ b/DEPS
@@ -34,7 +34,7 @@ vars = {
   # Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': '6e015bd9cddb6073b5d59fccb1238227e5e834c7',
+  'dart_revision': '9c6e76468ca4b7886f0477af69b6fd0fb610b2e8',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -46,7 +46,7 @@ vars = {
   'dart_dart_style_tag': '1.3.8',
   'dart_http_retry_tag': '0.1.1',
   'dart_http_throttle_tag': '1.0.2',
-  'dart_intl_tag': '0.16.1',
+  'dart_intl_tag': '0.17.0-nullsafety',
   'dart_linter_tag': '0.1.121',
   'dart_oauth2_tag': '1.6.0',
   'dart_protobuf_rev': '3746c8fd3f2b0147623a8e3db89c3ff4330de760',
diff --git a/engine/src/flutter/tools/const_finder/test/const_finder_test.dart b/engine/src/flutter/tools/const_finder/test/const_finder_test.dart
index 0046660bafe..62449421a3a 100644
--- a/engine/src/flutter/tools/const_finder/test/const_finder_test.dart
+++ b/engine/src/flutter/tools/const_finder/test/const_finder_test.dart
@@ -120,6 +120,11 @@ void _checkNonConsts() {
           'line': 14,
           'column': 26,
         },
+        <String, dynamic>{
+          'file': 'file://$fixtures/lib/consts_and_non.dart',
+          'line': 17,
+          'column': 41,
+        },
         <String, dynamic>{
           'file': 'file://$fixtures/lib/consts_and_non.dart',
           'line': 17,
diff --git a/engine/src/flutter/tools/const_finder/test/fixtures/lib/consts.dart b/engine/src/flutter/tools/const_finder/test/fixtures/lib/consts.dart
index b5a7e10f138..ba2c8de1013 100644
--- a/engine/src/flutter/tools/const_finder/test/fixtures/lib/consts.dart
+++ b/engine/src/flutter/tools/const_finder/test/fixtures/lib/consts.dart
@@ -45,6 +45,9 @@ class IgnoreMe {
   const IgnoreMe([this.target]);
 
   final Target target;
+
+  @override
+  String toString() => target.toString();
 }
 
 class StaticConstInitializer {
diff --git a/engine/src/flutter/tools/const_finder/test/fixtures/lib/consts_and_non.dart b/engine/src/flutter/tools/const_finder/test/fixtures/lib/consts_and_non.dart
index 9f4eeb8d042..86529fa9be7 100644
--- a/engine/src/flutter/tools/const_finder/test/fixtures/lib/consts_and_non.dart
+++ b/engine/src/flutter/tools/const_finder/test/fixtures/lib/consts_and_non.dart
@@ -38,6 +38,9 @@ class IgnoreMe {
   const IgnoreMe([this.target]);
 
   final Target target;
+
+  @override
+  String toString() => target.toString();
 }
 
 void blah(Target target) {