Skip to content

Commit 2ab499d

Browse files
authored
Roll Dart to version be6309690fd60284a87f3258a740c7c30efb1092 (flutter#5987)
This rolls includes the following changes: be6309690f (HEAD) Analyze pkg/dart2js_tools on the bots. 6f9073bb9d Wait for Analysis Server errors only while waiting for a response. 5d4e85ba3d Allow `x == null` to be a constant value whenever x is const. 7c77ed04f4 Move deobfuscation tools to the SDK repo 666c8c1a89 Fix @visibleForTemplate tests on Windows. 6fc1dd4480 analyzer_plugin no implicit-casts. 29401573d5 Get documentation comments before metadata as well. 3d0a663518 [vm/frontend-server] Fix frontend_server so that it can be tested. * fix analyzer hint * use --enable-asserts instead of --checked
1 parent d90223f commit 2ab499d

5 files changed

Lines changed: 57 additions & 53 deletions

File tree

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ vars = {
3131
# Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
3232
# You can use //tools/dart/create_updated_flutter_deps.py to produce
3333
# updated revision list of existing dependencies.
34-
'dart_revision': '1be785ae2ddb1754a184cd638ab719e94d86b4e9',
34+
'dart_revision': 'be6309690fd60284a87f3258a740c7c30efb1092',
3535

3636
'dart_args_tag': '1.4.4',
3737
'dart_async_tag': '2.0.8',

ci/licenses.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -e
33
shopt -s nullglob
44

55
echo "Verifying license script is still happy..."
6-
(cd flutter/tools/licenses; pub get; dart --checked lib/main.dart --src ../../.. --out ../../../out/license_script_output --golden ../../ci/licenses_golden)
6+
(cd flutter/tools/licenses; pub get; dart --enable-asserts lib/main.dart --src ../../.. --out ../../../out/license_script_output --golden ../../ci/licenses_golden)
77

88
for f in out/license_script_output/licenses_*; do
99
if ! cmp -s flutter/ci/licenses_golden/$(basename $f) $f

ci/licenses_golden/licenses_third_party

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -16652,50 +16652,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1665216652
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1665316653
====================================================================================================
1665416654

16655-
====================================================================================================
16656-
LIBRARY: tonic
16657-
ORIGIN: ../../../garnet/LICENSE
16658-
TYPE: LicenseType.bsd
16659-
FILE: ../../../third_party/tonic/dart_list.cc
16660-
FILE: ../../../third_party/tonic/dart_list.h
16661-
FILE: ../../../third_party/tonic/file_loader/file_loader_fuchsia.cc
16662-
FILE: ../../../third_party/tonic/file_loader/file_loader_posix.cc
16663-
FILE: ../../../third_party/tonic/file_loader/file_loader_win.cc
16664-
FILE: ../../../third_party/tonic/filesystem/filesystem/path_win.cc
16665-
FILE: ../../../third_party/tonic/filesystem/filesystem/portable_unistd.h
16666-
FILE: ../../../third_party/tonic/platform/platform_utils.h
16667-
FILE: ../../../third_party/tonic/platform/platform_utils_posix.cc
16668-
FILE: ../../../third_party/tonic/platform/platform_utils_win.cc
16669-
----------------------------------------------------------------------------------------------------
16670-
Copyright 2017 The Fuchsia Authors. All rights reserved.
16671-
16672-
Redistribution and use in source and binary forms, with or without
16673-
modification, are permitted provided that the following conditions are
16674-
met:
16675-
16676-
* Redistributions of source code must retain the above copyright
16677-
notice, this list of conditions and the following disclaimer.
16678-
* Redistributions in binary form must reproduce the above
16679-
copyright notice, this list of conditions and the following disclaimer
16680-
in the documentation and/or other materials provided with the
16681-
distribution.
16682-
* Neither the name of Google Inc. nor the names of its
16683-
contributors may be used to endorse or promote products derived from
16684-
this software without specific prior written permission.
16685-
16686-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
16687-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
16688-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
16689-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
16690-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
16691-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
16692-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
16693-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
16694-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
16695-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
16696-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
16697-
====================================================================================================
16698-
1669916655
====================================================================================================
1670016656
LIBRARY: tonic
1670116657
ORIGIN: ../../../third_party/tonic/LICENSE
@@ -16793,6 +16749,50 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1679316749
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1679416750
====================================================================================================
1679516751

16752+
====================================================================================================
16753+
LIBRARY: tonic
16754+
ORIGIN: ../../../third_party/tonic/file_loader/file_loader_fuchsia.cc + ../../../third_party/tonic/LICENSE
16755+
TYPE: LicenseType.bsd
16756+
FILE: ../../../third_party/tonic/dart_list.cc
16757+
FILE: ../../../third_party/tonic/dart_list.h
16758+
FILE: ../../../third_party/tonic/file_loader/file_loader_fuchsia.cc
16759+
FILE: ../../../third_party/tonic/file_loader/file_loader_posix.cc
16760+
FILE: ../../../third_party/tonic/file_loader/file_loader_win.cc
16761+
FILE: ../../../third_party/tonic/filesystem/filesystem/path_win.cc
16762+
FILE: ../../../third_party/tonic/filesystem/filesystem/portable_unistd.h
16763+
FILE: ../../../third_party/tonic/platform/platform_utils.h
16764+
FILE: ../../../third_party/tonic/platform/platform_utils_posix.cc
16765+
FILE: ../../../third_party/tonic/platform/platform_utils_win.cc
16766+
----------------------------------------------------------------------------------------------------
16767+
Copyright 2017 The Fuchsia Authors. All rights reserved.
16768+
16769+
Redistribution and use in source and binary forms, with or without
16770+
modification, are permitted provided that the following conditions are
16771+
met:
16772+
16773+
* Redistributions of source code must retain the above copyright
16774+
notice, this list of conditions and the following disclaimer.
16775+
* Redistributions in binary form must reproduce the above
16776+
copyright notice, this list of conditions and the following disclaimer
16777+
in the documentation and/or other materials provided with the
16778+
distribution.
16779+
* Neither the name of Google Inc. nor the names of its
16780+
contributors may be used to endorse or promote products derived from
16781+
this software without specific prior written permission.
16782+
16783+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
16784+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
16785+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
16786+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
16787+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
16788+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
16789+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
16790+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
16791+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
16792+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
16793+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
16794+
====================================================================================================
16795+
1679616796
====================================================================================================
1679716797
LIBRARY: tonic
1679816798
ORIGIN: ../../../third_party/tonic/typed_data/dart_byte_data.cc + ../../../third_party/tonic/LICENSE

frontend_server/bin/starter.dart

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
library frontend_server;
22

3+
import 'dart:io';
4+
35
import 'package:frontend_server/server.dart';
46

5-
void main(List<String> args){
6-
starter(args);
7+
void main(List<String> args) async {
8+
final int exitCode = await starter(args);
9+
if (exitCode != 0) {
10+
exit(exitCode);
11+
}
712
}

frontend_server/lib/server.dart

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,10 @@ Future<int> starter(
121121
compiler ??= new _FlutterFrontendCompiler(output, trackWidgetCreation: options['track-widget-creation']);
122122

123123
if (options.rest.isNotEmpty) {
124-
exit(await compiler.compile(options.rest[0], options)
125-
? 0
126-
: 254);
124+
return await compiler.compile(options.rest[0], options) ? 0 : 254;
127125
}
128126

129-
frontend.listenAndCompile(compiler, input ?? stdin, options, () { exit(0); } );
130-
return 0;
127+
final Completer<int> completer = new Completer<int>();
128+
frontend.listenAndCompile(compiler, input ?? stdin, options, completer);
129+
return completer.future;
131130
}

0 commit comments

Comments
 (0)