未验证 提交 034a6302 编写于 作者: A Alexander Aprelev 提交者: GitHub

Roll dart to aece1c1e92. (#12997)

* Roll dart to aece1c1e92.

Changes since last roll:
```
aece1c1e92 Update compile_flutter.sh after vm -> frontend_server rename
9293e26fc9 [gardening] Fix flutter hhh patch.
13fbf569f6 [flutter] split frontend_server from vm package
a389015083 Rewrite MethodInvocation to FunctionExpressionInvocation when the target is not a method.
ae251757a9 [vm,aot,bytecode] Performance fixes
01ebf92dde [VM] Consume extension member/is late flag setting when reading kernel file.
8e05cd278c [vm, bytecode] Emit bytecode without ASTs by default.
4539536b34 [eventhandler] generalize socket initialization
7115687beb NNBD i13n: Add a description for discarding just the condition
2bcaf02582 (origin/base) Update dartdoc to 0.28.7.
a0e8c7712d [dart2js] New RTI: Prevent elision of precomputed1 and remove unneeded read.
c38e19cbbe [vm/compiler] bit utilities
f918214f36 Add a unit test reproducing issue #38352.
ad47b1ca64 Remove summary1, part 2.
0881a4a691 Reland "Deprecate TypeParameterTypeImpl.getTypes()"
d93a6b596b Prepare to publish analyzer version 0.38.5
d5feab0c53 [vm] Create builds for LeakSanitizer, MemorySanitizer and ThreadSanitizer.
8c5236f55e [vm/ffi] Fix host-target word mismatch breaking AOT callbacks in ARM_X64.
5f7b837195 Remove unused FunctionElementImpl_forLUB.
2c75771611 Write and read the static type of IntegerLiteral.
b00453c68a Create synthetic FunctionType in quick fixes.
897e197dd4 Flow analysis: Update AssignedVariablesVisitor to track functions/methods.
55466fd3cc Flow analysis: Remove AssignedVariables.capturedAnywhere.
0a5cf36f14 Make exitFunctionBody safer.
```

* Update license hash
上级 f309a06f
...@@ -42,7 +42,7 @@ group("flutter") { ...@@ -42,7 +42,7 @@ group("flutter") {
if (!is_fuchsia && !is_fuchsia_host) { if (!is_fuchsia && !is_fuchsia_host) {
if (current_toolchain == host_toolchain) { if (current_toolchain == host_toolchain) {
public_deps += [ public_deps += [
"$flutter_root/frontend_server", "$flutter_root/flutter_frontend_server:frontend_server",
"//third_party/dart:create_sdk", "//third_party/dart:create_sdk",
] ]
......
...@@ -34,7 +34,7 @@ vars = { ...@@ -34,7 +34,7 @@ vars = {
# Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS. # Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
# You can use //tools/dart/create_updated_flutter_deps.py to produce # You can use //tools/dart/create_updated_flutter_deps.py to produce
# updated revision list of existing dependencies. # updated revision list of existing dependencies.
'dart_revision': '8ba6f7e2eb8ac44b6de3e87a3062d1c8e34b6cc1', 'dart_revision': 'aece1c1e927341c1c9b6517cc7d668974280de98',
# WARNING: DO NOT EDIT MANUALLY # WARNING: DO NOT EDIT MANUALLY
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
...@@ -230,7 +230,7 @@ deps = { ...@@ -230,7 +230,7 @@ deps = {
Var('dart_git') + '/dart2js_info.git' + '@' + Var('dart_dart2js_info_tag'), Var('dart_git') + '/dart2js_info.git' + '@' + Var('dart_dart2js_info_tag'),
'src/third_party/dart/third_party/pkg/dartdoc': 'src/third_party/dart/third_party/pkg/dartdoc':
Var('dart_git') + '/dartdoc.git@v0.28.6', Var('dart_git') + '/dartdoc.git@v0.28.7',
'src/third_party/dart/third_party/pkg/fixnum': 'src/third_party/dart/third_party/pkg/fixnum':
Var('dart_git') + '/fixnum.git' + '@' + Var('dart_fixnum_tag'), Var('dart_git') + '/fixnum.git' + '@' + Var('dart_fixnum_tag'),
......
...@@ -18,11 +18,11 @@ if [ -n "$RESULTS" ]; then ...@@ -18,11 +18,11 @@ if [ -n "$RESULTS" ]; then
exit 1; exit 1;
fi fi
echo "Analyzing frontend_server..." echo "Analyzing flutter_frontend_server..."
RESULTS=`dartanalyzer \ RESULTS=`dartanalyzer \
--packages=flutter/frontend_server/.packages \ --packages=flutter/flutter_frontend_server/.packages \
--options flutter/analysis_options.yaml \ --options flutter/analysis_options.yaml \
flutter/frontend_server \ flutter/flutter_frontend_server \
2>&1 \ 2>&1 \
| grep -Ev "No issues found!" \ | grep -Ev "No issues found!" \
| grep -Ev "Analyzing.+frontend_server"` | grep -Ev "Analyzing.+frontend_server"`
......
...@@ -84,6 +84,8 @@ FILE: ../../../flutter/flow/texture.cc ...@@ -84,6 +84,8 @@ FILE: ../../../flutter/flow/texture.cc
FILE: ../../../flutter/flow/texture.h FILE: ../../../flutter/flow/texture.h
FILE: ../../../flutter/flow/view_holder.cc FILE: ../../../flutter/flow/view_holder.cc
FILE: ../../../flutter/flow/view_holder.h FILE: ../../../flutter/flow/view_holder.h
FILE: ../../../flutter/flutter_frontend_server/bin/starter.dart
FILE: ../../../flutter/flutter_frontend_server/lib/server.dart
FILE: ../../../flutter/fml/base32.cc FILE: ../../../flutter/fml/base32.cc
FILE: ../../../flutter/fml/base32.h FILE: ../../../flutter/fml/base32.h
FILE: ../../../flutter/fml/base32_unittest.cc FILE: ../../../flutter/fml/base32_unittest.cc
......
Signature: b89d744fc043b99a65199c97e3813e5e Signature: 25e2b30226f59acec59cad73d452e693
UNUSED LICENSES: UNUSED LICENSES:
# Copyright 2013 The Flutter Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
if (!is_fuchsia_host && !is_fuchsia) {
import("//third_party/dart/utils/application_snapshot.gni")
frontend_server_files =
exec_script("//third_party/dart/tools/list_dart_files.py",
[
"absolute",
rebase_path("."),
],
"list lines")
frontend_server_files +=
exec_script("//third_party/dart/tools/list_dart_files.py",
[
"absolute",
rebase_path("../../third_party/dart/pkg"),
],
"list lines")
application_snapshot("frontend_server") {
main_dart = "bin/starter.dart"
deps = [
":package_incremental_compiler",
"$flutter_root/lib/snapshot:kernel_platform_files",
]
dot_packages = rebase_path(".packages")
flutter_patched_sdk = rebase_path("$root_out_dir/flutter_patched_sdk")
training_args = [
"--train",
"--sdk-root=$flutter_patched_sdk",
rebase_path(main_dart),
]
inputs = frontend_server_files
}
# For flutter/flutter#36738 we make the source files available so that
# we can generate a local frontend_server snapshot in the tools cache.
action("package_incremental_compiler") {
script = "$flutter_root/flutter_frontend_server/package_incremental.py"
inputs = frontend_server_files
outputs = [
"$root_gen_dir/dart-pkg/frontend_server/pubspec.yaml",
"$root_gen_dir/dart-pkg/vm/pubspec.yaml",
"$root_gen_dir/dart-pkg/build_integration/pubspec.yaml",
"$root_gen_dir/dart-pkg/front_end/pubspec.yaml",
"$root_gen_dir/dart-pkg/kernel/pubspec.yaml",
"$root_gen_dir/dart-pkg/dev_compiler/pubspec.yaml",
]
args = [
"--input-root=" + rebase_path("//third_party/dart/pkg"),
"--output-root=" + rebase_path("$root_gen_dir/dart-pkg"),
"--frontend-server=" + rebase_path("$flutter_root"),
]
}
}
...@@ -2,7 +2,7 @@ library frontend_server; ...@@ -2,7 +2,7 @@ library frontend_server;
import 'dart:io'; import 'dart:io';
import 'package:frontend_server/server.dart'; import 'package:flutter_frontend_server/server.dart';
void main(List<String> args) async { void main(List<String> args) async {
final int exitCode = await starter(args); final int exitCode = await starter(args);
......
...@@ -11,7 +11,7 @@ import 'package:args/args.dart'; ...@@ -11,7 +11,7 @@ import 'package:args/args.dart';
import 'package:path/path.dart' as path; import 'package:path/path.dart' as path;
import 'package:vm/incremental_compiler.dart'; import 'package:vm/incremental_compiler.dart';
import 'package:vm/frontend_server.dart' as frontend import 'package:frontend_server/frontend_server.dart' as frontend
show show
FrontendCompiler, FrontendCompiler,
CompilerInterface, CompilerInterface,
......
...@@ -15,7 +15,7 @@ PACKAGES = [ ...@@ -15,7 +15,7 @@ PACKAGES = [
"kernel", "kernel",
"front_end", "front_end",
"dev_compiler", "dev_compiler",
"frontend_server", "flutter_frontend_server",
] ]
VM_PUBSPEC = r'''name: vm VM_PUBSPEC = r'''name: vm
...@@ -41,7 +41,7 @@ dependencies: ...@@ -41,7 +41,7 @@ dependencies:
meta: any meta: any
''' '''
FRONTEND_SERVER_PUBSPEC = r'''name: frontend_server FLUTTER_FRONTEND_SERVER_PUBSPEC = r'''name: flutter_frontend_server
version: 0.0.1 version: 0.0.1
environment: environment:
sdk: ">=2.2.2 <3.0.0" sdk: ">=2.2.2 <3.0.0"
...@@ -87,7 +87,7 @@ dependencies: ...@@ -87,7 +87,7 @@ dependencies:
PUBSPECS = { PUBSPECS = {
'vm': VM_PUBSPEC, 'vm': VM_PUBSPEC,
'build_integration': BUILD_INTEGRATION_PUBSPEC, 'build_integration': BUILD_INTEGRATION_PUBSPEC,
'frontend_server': FRONTEND_SERVER_PUBSPEC, 'flutter_frontend_server': FLUTTER_FRONTEND_SERVER_PUBSPEC,
'kernel': KERNEL_PUBSPEC, 'kernel': KERNEL_PUBSPEC,
'front_end': FRONT_END_PUBSPEC, 'front_end': FRONT_END_PUBSPEC,
'dev_compiler': DEV_COMPILER_PUBSPEC, 'dev_compiler': DEV_COMPILER_PUBSPEC,
...@@ -103,7 +103,7 @@ def main(): ...@@ -103,7 +103,7 @@ def main():
for package in PACKAGES: for package in PACKAGES:
base = args.input base = args.input
# Handle different path for frontend_server # Handle different path for frontend_server
if package == 'frontend_server': if package == 'flutter_frontend_server':
base = args.frontend base = args.frontend
package_root = os.path.join(base, package) package_root = os.path.join(base, package)
for root, directories, files in os.walk(package_root): for root, directories, files in os.walk(package_root):
......
...@@ -6,9 +6,9 @@ if (is_fuchsia_host || is_fuchsia) { ...@@ -6,9 +6,9 @@ if (is_fuchsia_host || is_fuchsia) {
import("//build/dart/dart_library.gni") import("//build/dart/dart_library.gni")
import("//build/dart/dart_tool.gni") import("//build/dart/dart_tool.gni")
dart_library("frontend_server") { dart_library("flutter_frontend_server") {
disable_analysis = true disable_analysis = true
package_name = "frontend_server" package_name = "flutter_frontend_server"
sources = [ sources = [
"server.dart", "server.dart",
...@@ -19,6 +19,7 @@ if (is_fuchsia_host || is_fuchsia) { ...@@ -19,6 +19,7 @@ if (is_fuchsia_host || is_fuchsia) {
"//third_party/dart-pkg/pub/path", "//third_party/dart-pkg/pub/path",
"//third_party/dart-pkg/pub/usage", "//third_party/dart-pkg/pub/usage",
"//third_party/dart/pkg/build_integration", "//third_party/dart/pkg/build_integration",
"//third_party/dart/pkg/frontend_server",
"//third_party/dart/pkg/front_end", "//third_party/dart/pkg/front_end",
"//third_party/dart/pkg/kernel", "//third_party/dart/pkg/kernel",
"//third_party/dart/pkg/vm", "//third_party/dart/pkg/vm",
...@@ -27,72 +28,15 @@ if (is_fuchsia_host || is_fuchsia) { ...@@ -27,72 +28,15 @@ if (is_fuchsia_host || is_fuchsia) {
dart_tool("frontend_server_tool") { dart_tool("frontend_server_tool") {
main_dart = "bin/starter.dart" main_dart = "bin/starter.dart"
source_dir = "." source_dir = "../flutter_frontend_server"
disable_analysis = true disable_analysis = true
output_name = "frontend_server" output_name = "frontend_server"
sources = [] sources = []
deps = [ deps = [
":frontend_server", ":flutter_frontend_server",
]
}
} else {
import("//third_party/dart/utils/application_snapshot.gni")
frontend_server_files =
exec_script("//third_party/dart/tools/list_dart_files.py",
[
"absolute",
rebase_path("."),
],
"list lines")
frontend_server_files +=
exec_script("//third_party/dart/tools/list_dart_files.py",
[
"absolute",
rebase_path("../../third_party/dart/pkg"),
],
"list lines")
application_snapshot("frontend_server") {
main_dart = "bin/starter.dart"
deps = [
":package_incremental_compiler",
"$flutter_root/lib/snapshot:kernel_platform_files",
]
dot_packages = rebase_path(".packages")
flutter_patched_sdk = rebase_path("$root_out_dir/flutter_patched_sdk")
training_args = [
"--train",
"--sdk-root=$flutter_patched_sdk",
rebase_path(main_dart),
]
inputs = frontend_server_files
}
# For flutter/flutter#36738 we make the source files available so that
# we can generate a local frontend_server snapshot in the tools cache.
action("package_incremental_compiler") {
script = "$flutter_root/frontend_server/package_incremental.py"
inputs = frontend_server_files
outputs = [
"$root_gen_dir/dart-pkg/frontend_server/pubspec.yaml",
"$root_gen_dir/dart-pkg/vm/pubspec.yaml",
"$root_gen_dir/dart-pkg/build_integration/pubspec.yaml",
"$root_gen_dir/dart-pkg/front_end/pubspec.yaml",
"$root_gen_dir/dart-pkg/kernel/pubspec.yaml",
"$root_gen_dir/dart-pkg/dev_compiler/pubspec.yaml",
]
args = [
"--input-root=" + rebase_path("//third_party/dart/pkg"),
"--output-root=" + rebase_path("$root_gen_dir/dart-pkg"),
"--frontend-server=" + rebase_path("$flutter_root"),
] ]
} }
} }
...@@ -10,7 +10,7 @@ import os ...@@ -10,7 +10,7 @@ import os
import shutil import shutil
ALL_PACKAGES = { ALL_PACKAGES = {
'frontend_server': [], 'flutter_frontend_server': [],
} }
SRC_DIR = os.getcwd() SRC_DIR = os.getcwd()
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册