Skip to content

Commit f166571

Browse files
author
Dart CI
committed
Version 2.12.0-150.0.dev
Merge commit 'ab2645c9f4b863d364658e9f05cc27de42b0204d' into 'dev'
2 parents 68d1c75 + ab2645c commit f166571

File tree

284 files changed

+16162
-4646
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

284 files changed

+16162
-4646
lines changed

.dart_tool/package_config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"name": "_fe_analyzer_shared",
1919
"rootUri": "../pkg/_fe_analyzer_shared",
2020
"packageUri": "lib/",
21-
"languageVersion": "2.6"
21+
"languageVersion": "2.12"
2222
},
2323
{
2424
"name": "_fe_analyzer_shared_assigned_variables",
@@ -680,7 +680,7 @@
680680
"name": "test_reflective_loader",
681681
"rootUri": "../third_party/pkg/test_reflective_loader",
682682
"packageUri": "lib/",
683-
"languageVersion": "1.8"
683+
"languageVersion": "2.12"
684684
},
685685
{
686686
"name": "test_runner",

DEPS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ vars = {
156156
"test_descriptor_tag": "1.1.1",
157157
"test_process_tag": "1.0.3",
158158
"term_glyph_rev": "6a0f9b6fb645ba75e7a00a4e20072678327a0347",
159-
"test_reflective_loader_tag": "0.1.9",
159+
"test_reflective_loader_rev": "b76ae201ab9c6f3b90643958965e7cc215a38e9b",
160160
"test_rev": "e37a93bbeae23b215972d1659ac865d71287ff6a",
161161
"typed_data_tag": "f94fc57b8e8c0e4fe4ff6cfd8290b94af52d3719",
162162
"usage_tag": "16fbfd90c58f16e016a295a880bc722d2547d2c9",
@@ -440,7 +440,7 @@ deps = {
440440
Var("dart_git") + "test_process.git" + "@" + Var("test_process_tag"),
441441
Var("dart_root") + "/third_party/pkg/test_reflective_loader":
442442
Var("dart_git") + "test_reflective_loader.git" +
443-
"@" + Var("test_reflective_loader_tag"),
443+
"@" + Var("test_reflective_loader_rev"),
444444
Var("dart_root") + "/third_party/pkg/typed_data":
445445
Var("dart_git") + "typed_data.git" + "@" + Var("typed_data_tag"),
446446
Var("dart_root") + "/third_party/pkg/usage":

build/toolchain/gcc_toolchain.gni

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -204,13 +204,7 @@ template("gcc_toolchain") {
204204
command += " && " + strip_command
205205
} else if (defined(invoker.llvm_objcopy)) {
206206
strip = invoker.llvm_objcopy
207-
if (defined(invoker.llvm_objcopy_extra_args)) {
208-
extra_args = invoker.llvm_objcopy_extra_args
209-
} else {
210-
extra_args = ""
211-
}
212-
strip_command =
213-
"${strip} --strip-all ${extra_args} $outfile $stripped_outfile"
207+
strip_command = "${strip} --strip-all $outfile $stripped_outfile"
214208
command += " && " + strip_command
215209
}
216210
if (defined(invoker.postlink)) {

build/toolchain/linux/BUILD.gn

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,6 @@ gcc_toolchain("clang_arm") {
5252
ld = cxx
5353
llvm_objcopy = "${prefix}/llvm-objcopy"
5454

55-
# When producing ARM builds we drop .ARM.exidx/extab sections. These sections
56-
# don't contain any useful information (we don't use exceptions or
57-
# unwind C++ frames and most of the dart binary is in fact not covered by
58-
# them), however they have been seen to break dynamic linker in older glibc
59-
# versions (pre 2.23) because .ARM.exidx ends up being positioned between
60-
# .rel.dyn and .rel.plt sections while older versions of dynamic linker
61-
# expect these two sections to appear one after another in the ELF file.
62-
# See https://github.com/dart-lang/sdk/issues/41644.
63-
llvm_objcopy_extra_args =
64-
"--remove-section .ARM.exidx --remove-section .ARM.extab"
65-
6655
toolchain_cpu = "arm"
6756
toolchain_os = "linux"
6857
is_clang = true

pkg/_fe_analyzer_shared/lib/src/base/errors.dart

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
import 'package:meta/meta.dart';
6-
75
import 'customized_codes.dart';
86

97
/// An error code associated with an [AnalysisError].
@@ -23,7 +21,7 @@ abstract class ErrorCode {
2321

2422
final String _message;
2523

26-
final String _correction;
24+
final String? _correction;
2725

2826
/**
2927
* Return `true` if diagnostics with this code have documentation for them
@@ -43,25 +41,27 @@ abstract class ErrorCode {
4341
* given [correction] template.
4442
*/
4543
const ErrorCode({
46-
String correction,
44+
String? correction,
4745
this.hasPublishedDocs = false,
4846
this.isUnresolvedIdentifier: false,
49-
@required String message,
50-
@required this.name,
51-
@required this.uniqueName,
47+
required String message,
48+
required this.name,
49+
required this.uniqueName,
5250
}) : _correction = correction,
5351
_message = message,
52+
// ignore: unnecessary_null_comparison
5453
assert(hasPublishedDocs != null),
54+
// ignore: unnecessary_null_comparison
5555
assert(isUnresolvedIdentifier != null);
5656

5757
@Deprecated('Use the default constructor')
5858
const ErrorCode.temporary2({
59-
String correction,
59+
String? correction,
6060
bool hasPublishedDocs = false,
6161
bool isUnresolvedIdentifier = false,
62-
@required String message,
63-
@required String name,
64-
@required String uniqueName,
62+
required String message,
63+
required String name,
64+
required String uniqueName,
6565
}) : this(
6666
correction: correction,
6767
hasPublishedDocs: hasPublishedDocs,
@@ -76,7 +76,7 @@ abstract class ErrorCode {
7676
* or `null` if there is no correction information for this error. The
7777
* correction should indicate how the user can fix the error.
7878
*/
79-
String get correction => customizedCorrections[uniqueName] ?? _correction;
79+
String? get correction => customizedCorrections[uniqueName] ?? _correction;
8080

8181
/**
8282
* The severity of the error.
@@ -102,7 +102,7 @@ abstract class ErrorCode {
102102
* Return a URL that can be used to access documentation for diagnostics with
103103
* this code, or `null` if there is no published documentation.
104104
*/
105-
String get url {
105+
String? get url {
106106
if (hasPublishedDocs) {
107107
return 'https://dart.dev/tools/diagnostic-messages#${name.toLowerCase()}';
108108
}

0 commit comments

Comments
 (0)