Version 2.14.0-120.0.dev
Merge commit '46ceec41d2f48803684de83a8bf288d4081d10bd' into 'dev'
diff --git a/pkg/front_end/testcases/nonfunction_type_aliases/folder.options b/pkg/front_end/testcases/nonfunction_type_aliases/folder.options
index 155ea76..e69de29 100644
--- a/pkg/front_end/testcases/nonfunction_type_aliases/folder.options
+++ b/pkg/front_end/testcases/nonfunction_type_aliases/folder.options
@@ -1 +0,0 @@
---enable-experiment=nonfunction-type-aliases
\ No newline at end of file
diff --git a/runtime/tests/vm/dart/flutter_regress_82278_test.dart b/runtime/tests/vm/dart/flutter_regress_82278_test.dart
new file mode 100644
index 0000000..3170ab4
--- /dev/null
+++ b/runtime/tests/vm/dart/flutter_regress_82278_test.dart
@@ -0,0 +1,62 @@
+// Copyright (c) 2021, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'package:expect/expect.dart';
+
+class Foo {
+ static int _next = 0;
+
+ var field0 = ++_next;
+ var field1 = ++_next;
+ var field2 = ++_next;
+ var field3 = ++_next;
+ var field4 = ++_next;
+ var field5 = ++_next;
+ var field6 = ++_next;
+ var field7 = ++_next;
+ var field8 = ++_next;
+ var field9 = ++_next;
+ var field10 = ++_next;
+ var field11 = ++_next;
+ var field12 = ++_next;
+ var field13 = ++_next;
+ var field14 = ++_next;
+ var field15 = ++_next;
+ var field16 = ++_next;
+ var field17 = ++_next;
+ var field18 = ++_next;
+ var field19 = ++_next;
+ var field20 = ++_next;
+ var field21 = ++_next;
+ var field22 = ++_next;
+ var field23 = ++_next;
+ var field24 = ++_next;
+ var field25 = ++_next;
+ var field26 = ++_next;
+ var field27 = ++_next;
+ var field28 = ++_next;
+ var field29 = ++_next;
+ var field30 = ++_next;
+ var field31 = ++_next;
+
+ @pragma('vm:never-inline')
+ String toString() => '$field0 $field1 $field2 $field3 $field4 $field5'
+ '$field6 $field7 $field8 $field9 $field10 $field11'
+ '$field12 $field13 $field14 $field15 $field16 $field17'
+ '$field18 $field19 $field20 $field21 $field22 $field23'
+ '$field24 $field25 $field26 $field27 $field28 $field29'
+ '$field30 $field3';
+}
+
+// The TypeArgumentVector will be at an offset that cannot be loaded from via
+// normal addresing mode on ARM64.
+class GenericFoo<T> extends Foo {}
+
+final l = <dynamic>[GenericFoo<int>(), null, 1, 1.0];
+
+main() {
+ final dynamic genericFoo = l[0];
+ Expect.isTrue(genericFoo.toString().length > 0); // Keep the fields alive.
+ Expect.isTrue(identical(genericFoo as GenericFoo<int>, genericFoo));
+}
diff --git a/runtime/tests/vm/dart_2/flutter_regress_82278_test.dart b/runtime/tests/vm/dart_2/flutter_regress_82278_test.dart
new file mode 100644
index 0000000..3170ab4
--- /dev/null
+++ b/runtime/tests/vm/dart_2/flutter_regress_82278_test.dart
@@ -0,0 +1,62 @@
+// Copyright (c) 2021, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'package:expect/expect.dart';
+
+class Foo {
+ static int _next = 0;
+
+ var field0 = ++_next;
+ var field1 = ++_next;
+ var field2 = ++_next;
+ var field3 = ++_next;
+ var field4 = ++_next;
+ var field5 = ++_next;
+ var field6 = ++_next;
+ var field7 = ++_next;
+ var field8 = ++_next;
+ var field9 = ++_next;
+ var field10 = ++_next;
+ var field11 = ++_next;
+ var field12 = ++_next;
+ var field13 = ++_next;
+ var field14 = ++_next;
+ var field15 = ++_next;
+ var field16 = ++_next;
+ var field17 = ++_next;
+ var field18 = ++_next;
+ var field19 = ++_next;
+ var field20 = ++_next;
+ var field21 = ++_next;
+ var field22 = ++_next;
+ var field23 = ++_next;
+ var field24 = ++_next;
+ var field25 = ++_next;
+ var field26 = ++_next;
+ var field27 = ++_next;
+ var field28 = ++_next;
+ var field29 = ++_next;
+ var field30 = ++_next;
+ var field31 = ++_next;
+
+ @pragma('vm:never-inline')
+ String toString() => '$field0 $field1 $field2 $field3 $field4 $field5'
+ '$field6 $field7 $field8 $field9 $field10 $field11'
+ '$field12 $field13 $field14 $field15 $field16 $field17'
+ '$field18 $field19 $field20 $field21 $field22 $field23'
+ '$field24 $field25 $field26 $field27 $field28 $field29'
+ '$field30 $field3';
+}
+
+// The TypeArgumentVector will be at an offset that cannot be loaded from via
+// normal addresing mode on ARM64.
+class GenericFoo<T> extends Foo {}
+
+final l = <dynamic>[GenericFoo<int>(), null, 1, 1.0];
+
+main() {
+ final dynamic genericFoo = l[0];
+ Expect.isTrue(genericFoo.toString().length > 0); // Keep the fields alive.
+ Expect.isTrue(identical(genericFoo as GenericFoo<int>, genericFoo));
+}
diff --git a/runtime/vm/compiler/assembler/assembler_arm.h b/runtime/vm/compiler/assembler/assembler_arm.h
index 6822e73..9d1b8b0 100644
--- a/runtime/vm/compiler/assembler/assembler_arm.h
+++ b/runtime/vm/compiler/assembler/assembler_arm.h
@@ -941,8 +941,14 @@
void LoadFieldFromOffset(Register reg,
Register base,
int32_t offset,
- OperandSize type = kFourBytes,
- Condition cond = AL) {
+ OperandSize sz = kFourBytes) override {
+ LoadFieldFromOffset(reg, base, offset, sz, AL);
+ }
+ void LoadFieldFromOffset(Register reg,
+ Register base,
+ int32_t offset,
+ OperandSize type,
+ Condition cond) {
LoadFromOffset(reg, base, offset - kHeapObjectTag, type, cond);
}
void LoadCompressedFieldFromOffset(Register reg,
diff --git a/runtime/vm/compiler/assembler/assembler_arm64.h b/runtime/vm/compiler/assembler/assembler_arm64.h
index ef935b4..59ec194 100644
--- a/runtime/vm/compiler/assembler/assembler_arm64.h
+++ b/runtime/vm/compiler/assembler/assembler_arm64.h
@@ -1697,7 +1697,7 @@
void LoadFieldFromOffset(Register dest,
Register base,
int32_t offset,
- OperandSize sz = kEightBytes) {
+ OperandSize sz = kEightBytes) override {
LoadFromOffset(dest, base, offset - kHeapObjectTag, sz);
}
void LoadCompressedFieldFromOffset(Register dest,
diff --git a/runtime/vm/compiler/assembler/assembler_base.h b/runtime/vm/compiler/assembler/assembler_base.h
index 5b0c4b0..bf24f09 100644
--- a/runtime/vm/compiler/assembler/assembler_base.h
+++ b/runtime/vm/compiler/assembler/assembler_base.h
@@ -605,6 +605,10 @@
};
virtual void LoadField(Register dst, const FieldAddress& address) = 0;
+ virtual void LoadFieldFromOffset(Register reg,
+ Register base,
+ int32_t offset,
+ OperandSize = kWordBytes) = 0;
void LoadFromSlot(Register dst, Register base, const Slot& slot);
virtual void StoreIntoObject(
diff --git a/runtime/vm/compiler/assembler/assembler_ia32.h b/runtime/vm/compiler/assembler/assembler_ia32.h
index 2c75037..af7df41 100644
--- a/runtime/vm/compiler/assembler/assembler_ia32.h
+++ b/runtime/vm/compiler/assembler/assembler_ia32.h
@@ -607,7 +607,7 @@
void LoadFieldFromOffset(Register reg,
Register base,
int32_t offset,
- OperandSize sz = kFourBytes) {
+ OperandSize sz = kFourBytes) override {
LoadFromOffset(reg, FieldAddress(base, offset), sz);
}
void LoadCompressedFieldFromOffset(Register reg,
diff --git a/runtime/vm/compiler/assembler/assembler_x64.h b/runtime/vm/compiler/assembler/assembler_x64.h
index 81ed419..09c3c4b 100644
--- a/runtime/vm/compiler/assembler/assembler_x64.h
+++ b/runtime/vm/compiler/assembler/assembler_x64.h
@@ -971,7 +971,7 @@
void LoadFieldFromOffset(Register dst,
Register base,
int32_t offset,
- OperandSize sz = kEightBytes) {
+ OperandSize sz = kEightBytes) override {
LoadFromOffset(dst, FieldAddress(base, offset), sz);
}
void LoadCompressedFieldFromOffset(Register dst,
diff --git a/runtime/vm/kernel_loader.cc b/runtime/vm/kernel_loader.cc
index 88c4a1c..47f0205 100644
--- a/runtime/vm/kernel_loader.cc
+++ b/runtime/vm/kernel_loader.cc
@@ -575,36 +575,6 @@
kernel_program_info_.set_potential_natives(potential_natives_);
}
-StringPtr KernelLoader::DetectExternalNameCtor() {
- helper_.ReadTag();
- helper_.ReadPosition();
- NameIndex annotation_class = H.EnclosingName(
- helper_.ReadCanonicalNameReference()); // read target reference,
-
- if (!IsClassName(annotation_class, Symbols::DartInternal(),
- Symbols::ExternalName())) {
- helper_.SkipArguments();
- return String::null();
- }
-
- // Read arguments:
- intptr_t total_arguments = helper_.ReadUInt(); // read argument count.
- helper_.SkipListOfDartTypes(); // read list of types.
- intptr_t positional_arguments = helper_.ReadListLength();
- ASSERT(total_arguments == 1 && positional_arguments == 1);
-
- Tag tag = helper_.ReadTag();
- ASSERT(tag == kStringLiteral);
- String& result = H.DartSymbolPlain(
- helper_.ReadStringReference()); // read index into string table.
-
- // List of named.
- intptr_t list_length = helper_.ReadListLength(); // read list length.
- ASSERT(list_length == 0);
-
- return result.ptr();
-}
-
bool KernelLoader::IsClassName(NameIndex name,
const String& library,
const String& klass) {
@@ -620,15 +590,6 @@
return H.StringEquals(library_name_index, library.ToCString());
}
-bool KernelLoader::DetectPragmaCtor() {
- helper_.ReadTag();
- helper_.ReadPosition();
- NameIndex annotation_class = H.EnclosingName(
- helper_.ReadCanonicalNameReference()); // read target reference
- helper_.SkipArguments();
- return IsClassName(annotation_class, Symbols::DartCore(), Symbols::Pragma());
-}
-
void KernelLoader::LoadNativeExtensionLibraries() {
const auto& potential_extension_libraries =
GrowableObjectArray::Handle(Z, H.GetPotentialExtensionLibraries());
@@ -674,9 +635,6 @@
ASSERT(constant.clazz() == external_name_class_.ptr());
uri_path ^= constant.GetField(external_name_field_);
}
- } else if (tag == kConstructorInvocation ||
- tag == kConstConstructorInvocation) {
- uri_path = DetectExternalNameCtor();
} else {
helper_.SkipExpression();
}
@@ -1876,22 +1834,9 @@
*is_potential_native = false;
*has_pragma_annotation = false;
Instance& constant = Instance::Handle(Z);
- String& detected_name = String::Handle(Z);
for (intptr_t i = 0; i < annotation_count; ++i) {
const intptr_t tag = helper_.PeekTag();
- if (tag == kConstructorInvocation || tag == kConstConstructorInvocation) {
- const intptr_t start = helper_.ReaderOffset();
- detected_name = DetectExternalNameCtor();
- if (!detected_name.IsNull()) {
- *native_name = detected_name.ptr();
- continue;
- }
-
- helper_.SetOffset(start);
- if (DetectPragmaCtor()) {
- *has_pragma_annotation = true;
- }
- } else if (tag == kConstantExpression) {
+ if (tag == kConstantExpression) {
const Array& constant_table_array =
Array::Handle(kernel_program_info_.constants());
if (constant_table_array.IsNull()) {
diff --git a/runtime/vm/kernel_loader.h b/runtime/vm/kernel_loader.h
index 1943dc8..91d28c2 100644
--- a/runtime/vm/kernel_loader.h
+++ b/runtime/vm/kernel_loader.h
@@ -224,15 +224,6 @@
const Library& library,
const LibraryIndex& library_index);
- // Check for the presence of a (possibly const) constructor for the
- // 'ExternalName' class. If found, returns the name parameter to the
- // constructor.
- StringPtr DetectExternalNameCtor();
-
- // Check for the presence of a (possibly const) constructor for the 'pragma'
- // class. Returns whether it was found (no details about the type of pragma).
- bool DetectPragmaCtor();
-
bool IsClassName(NameIndex name, const String& library, const String& klass);
void AnnotateNativeProcedures();
diff --git a/runtime/vm/type_testing_stubs.cc b/runtime/vm/type_testing_stubs.cc
index 260517b..56eaa34 100644
--- a/runtime/vm/type_testing_stubs.cc
+++ b/runtime/vm/type_testing_stubs.cc
@@ -415,11 +415,9 @@
// fall through to continue
// b) Then we'll load the values for the type parameters.
- __ LoadField(
- TTSInternalRegs::kInstanceTypeArgumentsReg,
- compiler::FieldAddress(
- TypeTestABI::kInstanceReg,
- compiler::target::Class::TypeArgumentsFieldOffset(type_class)));
+ __ LoadFieldFromOffset(
+ TTSInternalRegs::kInstanceTypeArgumentsReg, TypeTestABI::kInstanceReg,
+ compiler::target::Class::TypeArgumentsFieldOffset(type_class));
// The kernel frontend should fill in any non-assigned type parameters on
// construction with dynamic/Object, so we should never get the null type
diff --git a/tests/language/nonfunction_type_aliases/aliased_cyclic_superclass_error_test.dart b/tests/language/nonfunction_type_aliases/aliased_cyclic_superclass_error_test.dart
index 0000f30..ad68b50 100644
--- a/tests/language/nonfunction_type_aliases/aliased_cyclic_superclass_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/aliased_cyclic_superclass_error_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
typedef T = C;
diff --git a/tests/language/nonfunction_type_aliases/basic_syntax_test.dart b/tests/language/nonfunction_type_aliases/basic_syntax_test.dart
index 4b153c9..eb61a95 100644
--- a/tests/language/nonfunction_type_aliases/basic_syntax_test.dart
+++ b/tests/language/nonfunction_type_aliases/basic_syntax_test.dart
@@ -2,7 +2,7 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases,non-nullable
+// SharedOptions=--enable-experiment=non-nullable
typedef T0 = void;
typedef T1 = Function;
diff --git a/tests/language/nonfunction_type_aliases/cyclic_bound_error_test.dart b/tests/language/nonfunction_type_aliases/cyclic_bound_error_test.dart
index f3825db..1d88c25 100644
--- a/tests/language/nonfunction_type_aliases/cyclic_bound_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/cyclic_bound_error_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// This test verifies that cyclic type alias definitions cause a compile-time
// error, when the cycle occurs via the bound.
diff --git a/tests/language/nonfunction_type_aliases/cyclic_bound_unused_error_test.dart b/tests/language/nonfunction_type_aliases/cyclic_bound_unused_error_test.dart
index b77593f..4f1a188 100644
--- a/tests/language/nonfunction_type_aliases/cyclic_bound_unused_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/cyclic_bound_unused_error_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// This test verifies that cyclic type alias definitions cause a compile-time
// error, when the cycle occurs via the bound, even if the bound variable is not
diff --git a/tests/language/nonfunction_type_aliases/cyclic_expansion_error_test.dart b/tests/language/nonfunction_type_aliases/cyclic_expansion_error_test.dart
index 8b5b3df..1839de7 100644
--- a/tests/language/nonfunction_type_aliases/cyclic_expansion_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/cyclic_expansion_error_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// This test verifies that cyclic type alias definitions cause a compile-time
// error, when the cycle occurs via the expansion of the type.
diff --git a/tests/language/nonfunction_type_aliases/generic_aliased_supertype_test.dart b/tests/language/nonfunction_type_aliases/generic_aliased_supertype_test.dart
index 3eed540..7d4741f 100644
--- a/tests/language/nonfunction_type_aliases/generic_aliased_supertype_test.dart
+++ b/tests/language/nonfunction_type_aliases/generic_aliased_supertype_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class A<X> {}
diff --git a/tests/language/nonfunction_type_aliases/generic_usage_class_error_test.dart b/tests/language/nonfunction_type_aliases/generic_usage_class_error_test.dart
index db5c366..2bfe9dd 100644
--- a/tests/language/nonfunction_type_aliases/generic_usage_class_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/generic_usage_class_error_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'dart:async';
diff --git a/tests/language/nonfunction_type_aliases/generic_usage_class_test.dart b/tests/language/nonfunction_type_aliases/generic_usage_class_test.dart
index 9899834a..af2d2d8 100644
--- a/tests/language/nonfunction_type_aliases/generic_usage_class_test.dart
+++ b/tests/language/nonfunction_type_aliases/generic_usage_class_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'dart:async';
diff --git a/tests/language/nonfunction_type_aliases/generic_usage_dynamic_error_test.dart b/tests/language/nonfunction_type_aliases/generic_usage_dynamic_error_test.dart
index fd700d0..3e46f98 100644
--- a/tests/language/nonfunction_type_aliases/generic_usage_dynamic_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/generic_usage_dynamic_error_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'dart:async';
diff --git a/tests/language/nonfunction_type_aliases/generic_usage_dynamic_test.dart b/tests/language/nonfunction_type_aliases/generic_usage_dynamic_test.dart
index b1ac43a..f157907 100644
--- a/tests/language/nonfunction_type_aliases/generic_usage_dynamic_test.dart
+++ b/tests/language/nonfunction_type_aliases/generic_usage_dynamic_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'dart:async';
diff --git a/tests/language/nonfunction_type_aliases/generic_usage_function_error_test.dart b/tests/language/nonfunction_type_aliases/generic_usage_function_error_test.dart
index 9251d61..2d809b7 100644
--- a/tests/language/nonfunction_type_aliases/generic_usage_function_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/generic_usage_function_error_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'dart:async';
diff --git a/tests/language/nonfunction_type_aliases/generic_usage_function_test.dart b/tests/language/nonfunction_type_aliases/generic_usage_function_test.dart
index 91bc32f..69b2926 100644
--- a/tests/language/nonfunction_type_aliases/generic_usage_function_test.dart
+++ b/tests/language/nonfunction_type_aliases/generic_usage_function_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'dart:async';
diff --git a/tests/language/nonfunction_type_aliases/generic_usage_futureor_error_test.dart b/tests/language/nonfunction_type_aliases/generic_usage_futureor_error_test.dart
index fd5939c..e6c0f4a 100644
--- a/tests/language/nonfunction_type_aliases/generic_usage_futureor_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/generic_usage_futureor_error_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'dart:async';
diff --git a/tests/language/nonfunction_type_aliases/generic_usage_futureor_test.dart b/tests/language/nonfunction_type_aliases/generic_usage_futureor_test.dart
index 72b0eac..b0e7a35 100644
--- a/tests/language/nonfunction_type_aliases/generic_usage_futureor_test.dart
+++ b/tests/language/nonfunction_type_aliases/generic_usage_futureor_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'dart:async';
diff --git a/tests/language/nonfunction_type_aliases/generic_usage_null_error_test.dart b/tests/language/nonfunction_type_aliases/generic_usage_null_error_test.dart
index af1a1b7..1495f78 100644
--- a/tests/language/nonfunction_type_aliases/generic_usage_null_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/generic_usage_null_error_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'dart:async';
diff --git a/tests/language/nonfunction_type_aliases/generic_usage_null_test.dart b/tests/language/nonfunction_type_aliases/generic_usage_null_test.dart
index c98fa1d..01f4644 100644
--- a/tests/language/nonfunction_type_aliases/generic_usage_null_test.dart
+++ b/tests/language/nonfunction_type_aliases/generic_usage_null_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'dart:async';
diff --git a/tests/language/nonfunction_type_aliases/generic_usage_object_error_test.dart b/tests/language/nonfunction_type_aliases/generic_usage_object_error_test.dart
index 9e72a9e..3fa925f 100644
--- a/tests/language/nonfunction_type_aliases/generic_usage_object_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/generic_usage_object_error_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'dart:async';
diff --git a/tests/language/nonfunction_type_aliases/generic_usage_object_test.dart b/tests/language/nonfunction_type_aliases/generic_usage_object_test.dart
index 9b55fdc..053c634 100644
--- a/tests/language/nonfunction_type_aliases/generic_usage_object_test.dart
+++ b/tests/language/nonfunction_type_aliases/generic_usage_object_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'dart:async';
diff --git a/tests/language/nonfunction_type_aliases/generic_usage_type_variable_error_test.dart b/tests/language/nonfunction_type_aliases/generic_usage_type_variable_error_test.dart
index a0ee00c..46f8b2a 100644
--- a/tests/language/nonfunction_type_aliases/generic_usage_type_variable_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/generic_usage_type_variable_error_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'dart:async';
diff --git a/tests/language/nonfunction_type_aliases/generic_usage_type_variable_test.dart b/tests/language/nonfunction_type_aliases/generic_usage_type_variable_test.dart
index a9cd0c2..49702e0 100644
--- a/tests/language/nonfunction_type_aliases/generic_usage_type_variable_test.dart
+++ b/tests/language/nonfunction_type_aliases/generic_usage_type_variable_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'dart:async';
diff --git a/tests/language/nonfunction_type_aliases/generic_usage_void_error_test.dart b/tests/language/nonfunction_type_aliases/generic_usage_void_error_test.dart
index 1bddbc3..a580157 100644
--- a/tests/language/nonfunction_type_aliases/generic_usage_void_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/generic_usage_void_error_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'dart:async';
diff --git a/tests/language/nonfunction_type_aliases/generic_usage_void_test.dart b/tests/language/nonfunction_type_aliases/generic_usage_void_test.dart
index 619c64e..62f79ec 100644
--- a/tests/language/nonfunction_type_aliases/generic_usage_void_test.dart
+++ b/tests/language/nonfunction_type_aliases/generic_usage_void_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'dart:async';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_01_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_01_test.dart
index 0b59c9b..e62c64d 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_01_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_01_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_02_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_02_test.dart
index e5caf2a..cdc8912 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_02_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_02_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_03_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_03_test.dart
index 5bda338..e926626 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_03_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_03_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_04_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_04_test.dart
index 5fbec80..65e3a87 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_04_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_04_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_05_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_05_test.dart
index 3e4dd64..f47987c 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_05_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_05_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_06_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_06_test.dart
index b5b8cce..b9daec0 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_06_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_06_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_07_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_07_test.dart
index abd1f08..d3e86d0 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_07_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_07_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_08_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_08_test.dart
index 954b7e2..61ba91e 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_08_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_08_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_09_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_09_test.dart
index 68ea8b9..a94ddc5 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_09_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_09_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_10_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_10_test.dart
index d9dc455..7b8dcbf 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_10_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_10_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_11_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_11_test.dart
index 42aaab5..fa855f1 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_11_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_11_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_12_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_12_test.dart
index 1d4a419..3330ad0 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_12_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_factory_invocation_12_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_01_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_01_test.dart
index 99f6365c..098b885 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_01_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_01_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_02_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_02_test.dart
index 081f4d8..944f607 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_02_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_02_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_03_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_03_test.dart
index b11314a..de472c8 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_03_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_03_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_04_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_04_test.dart
index 97d6600..dcea863 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_04_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_04_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_05_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_05_test.dart
index 7736a0d..51a7e74 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_05_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_05_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_06_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_06_test.dart
index 543deb9..4db9e2b 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_06_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_06_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_07_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_07_test.dart
index 0d61966..de798cc 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_07_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_07_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_08_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_08_test.dart
index fe92b57..580fb24 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_08_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_08_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_09_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_09_test.dart
index 7a07602..f1c7cfed 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_09_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_09_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_10_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_10_test.dart
index 8ce475d..2a1254f 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_10_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_10_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_11_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_11_test.dart
index b669f00..a2c8d23 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_11_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_11_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_12_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_12_test.dart
index 4322e2d..248c08a 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_12_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_instance_creation_12_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_01_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_01_test.dart
index c4e1da4..5a83a94 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_01_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_01_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_02_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_02_test.dart
index 79ba8a6..48ddd06 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_02_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_02_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_03_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_03_test.dart
index 28efd82..e978165 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_03_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_03_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_04_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_04_test.dart
index e8047da..8b94ddb 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_04_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_04_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_05_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_05_test.dart
index 1171b23..78423b6 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_05_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_05_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_06_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_06_test.dart
index 86d7f84..4629bd0 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_06_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_06_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_07_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_07_test.dart
index a58164c..05b4e03 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_07_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_07_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_08_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_08_test.dart
index a539743..e51761e 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_08_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_08_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_09_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_09_test.dart
index f7dc992..b121ef9 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_09_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_09_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_10_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_10_test.dart
index 0d3aae3..eba59a6 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_10_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_10_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_11_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_11_test.dart
index bae703d..70ede40 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_11_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_11_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_12_test.dart b/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_12_test.dart
index adc2ae5..fefa6ff 100644
--- a/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_12_test.dart
+++ b/tests/language/nonfunction_type_aliases/infer_aliased_redirecting_factory_invocation_12_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/aliased_cyclic_superclass_error_test.dart b/tests/language/nonfunction_type_aliases/mixed/aliased_cyclic_superclass_error_test.dart
index b034e76..73b25b76 100644
--- a/tests/language/nonfunction_type_aliases/mixed/aliased_cyclic_superclass_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/aliased_cyclic_superclass_error_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a type alias `T` denoting a class
// can give rise to the expected errors.
diff --git a/tests/language/nonfunction_type_aliases/mixed/basic_syntax_test.dart b/tests/language/nonfunction_type_aliases/mixed/basic_syntax_test.dart
index 02ba5b4..1b03be1 100644
--- a/tests/language/nonfunction_type_aliases/mixed/basic_syntax_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/basic_syntax_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that the syntax associated with the non-function type aliases
// feature is supported.
diff --git a/tests/language/nonfunction_type_aliases/mixed/generic_aliased_supertype_test.dart b/tests/language/nonfunction_type_aliases/mixed/generic_aliased_supertype_test.dart
index c7b4c6a..1728ba8 100644
--- a/tests/language/nonfunction_type_aliases/mixed/generic_aliased_supertype_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/generic_aliased_supertype_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a type alias `A3` can be used to specify a superclass.
diff --git a/tests/language/nonfunction_type_aliases/mixed/generic_usage_class_error_test.dart b/tests/language/nonfunction_type_aliases/mixed/generic_usage_class_error_test.dart
index 1acda4b..c039e45 100644
--- a/tests/language/nonfunction_type_aliases/mixed/generic_usage_class_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/generic_usage_class_error_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a type alias `T` denoting a class
// can give rise to the expected errors.
diff --git a/tests/language/nonfunction_type_aliases/mixed/generic_usage_class_test.dart b/tests/language/nonfunction_type_aliases/mixed/generic_usage_class_test.dart
index c1c9d2e..26a66a4 100644
--- a/tests/language/nonfunction_type_aliases/mixed/generic_usage_class_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/generic_usage_class_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a generic type alias `T` denoting a class can be used.
diff --git a/tests/language/nonfunction_type_aliases/mixed/generic_usage_dynamic_error_test.dart b/tests/language/nonfunction_type_aliases/mixed/generic_usage_dynamic_error_test.dart
index 72ac93b..9ff95ea 100644
--- a/tests/language/nonfunction_type_aliases/mixed/generic_usage_dynamic_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/generic_usage_dynamic_error_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a generic type alias `T` denoting `dynamic`
// can give rise to the expected errors.
diff --git a/tests/language/nonfunction_type_aliases/mixed/generic_usage_dynamic_test.dart b/tests/language/nonfunction_type_aliases/mixed/generic_usage_dynamic_test.dart
index 8276fdf..af3ade2 100644
--- a/tests/language/nonfunction_type_aliases/mixed/generic_usage_dynamic_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/generic_usage_dynamic_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a generic type alias `T` denoting `dynamic` can be used.
diff --git a/tests/language/nonfunction_type_aliases/mixed/generic_usage_function_error_test.dart b/tests/language/nonfunction_type_aliases/mixed/generic_usage_function_error_test.dart
index 812612a..282e5e6 100644
--- a/tests/language/nonfunction_type_aliases/mixed/generic_usage_function_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/generic_usage_function_error_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a generic type alias `T` denoting `Function`
// can give rise to the expected errors.
diff --git a/tests/language/nonfunction_type_aliases/mixed/generic_usage_function_test.dart b/tests/language/nonfunction_type_aliases/mixed/generic_usage_function_test.dart
index ab3ae8b..4aecb7d 100644
--- a/tests/language/nonfunction_type_aliases/mixed/generic_usage_function_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/generic_usage_function_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a generic type alias `T` denoting `Function`
// can give rise to the expected erros.
diff --git a/tests/language/nonfunction_type_aliases/mixed/generic_usage_futureor_error_test.dart b/tests/language/nonfunction_type_aliases/mixed/generic_usage_futureor_error_test.dart
index 5f1f4cf..0bd398b 100644
--- a/tests/language/nonfunction_type_aliases/mixed/generic_usage_futureor_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/generic_usage_futureor_error_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a generic type alias `T` denoting `FutureOr`
// can give rise to the expected errors.
diff --git a/tests/language/nonfunction_type_aliases/mixed/generic_usage_futureor_test.dart b/tests/language/nonfunction_type_aliases/mixed/generic_usage_futureor_test.dart
index 73629cc7..1262d41 100644
--- a/tests/language/nonfunction_type_aliases/mixed/generic_usage_futureor_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/generic_usage_futureor_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a generic type alias `T` denoting `FutureOr` can be used.
diff --git a/tests/language/nonfunction_type_aliases/mixed/generic_usage_null_error_test.dart b/tests/language/nonfunction_type_aliases/mixed/generic_usage_null_error_test.dart
index 2da4af9..5e5b714 100644
--- a/tests/language/nonfunction_type_aliases/mixed/generic_usage_null_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/generic_usage_null_error_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a generic type alias `T` denoting `Null`
// can give rise to the expected errors.
diff --git a/tests/language/nonfunction_type_aliases/mixed/generic_usage_null_test.dart b/tests/language/nonfunction_type_aliases/mixed/generic_usage_null_test.dart
index 98a845c..88595d6 100644
--- a/tests/language/nonfunction_type_aliases/mixed/generic_usage_null_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/generic_usage_null_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a generic type alias `T` denoting `Null` can be used.
diff --git a/tests/language/nonfunction_type_aliases/mixed/generic_usage_object_error_test.dart b/tests/language/nonfunction_type_aliases/mixed/generic_usage_object_error_test.dart
index a2bad84..8a245d7 100644
--- a/tests/language/nonfunction_type_aliases/mixed/generic_usage_object_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/generic_usage_object_error_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a generic type alias `T` denoting `Object`
// can give rise to the expected errors.
diff --git a/tests/language/nonfunction_type_aliases/mixed/generic_usage_object_test.dart b/tests/language/nonfunction_type_aliases/mixed/generic_usage_object_test.dart
index a3f6ad3..4d0c8e0 100644
--- a/tests/language/nonfunction_type_aliases/mixed/generic_usage_object_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/generic_usage_object_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a generic type alias `T` denoting `Object` can be used.
diff --git a/tests/language/nonfunction_type_aliases/mixed/generic_usage_type_variable_error_test.dart b/tests/language/nonfunction_type_aliases/mixed/generic_usage_type_variable_error_test.dart
index cad1f88..4b4ab6f 100644
--- a/tests/language/nonfunction_type_aliases/mixed/generic_usage_type_variable_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/generic_usage_type_variable_error_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a generic type alias `T<X>` denoting `X`
// can give rise to the expected errors.
diff --git a/tests/language/nonfunction_type_aliases/mixed/generic_usage_type_variable_test.dart b/tests/language/nonfunction_type_aliases/mixed/generic_usage_type_variable_test.dart
index 52b2f4b..c730f61 100644
--- a/tests/language/nonfunction_type_aliases/mixed/generic_usage_type_variable_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/generic_usage_type_variable_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a generic type alias `T<X>` denoting `X` can be used.
diff --git a/tests/language/nonfunction_type_aliases/mixed/generic_usage_void_error_test.dart b/tests/language/nonfunction_type_aliases/mixed/generic_usage_void_error_test.dart
index 6d6deb2..c1e567e 100644
--- a/tests/language/nonfunction_type_aliases/mixed/generic_usage_void_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/generic_usage_void_error_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a generic type alias `T` denoting `void`
// can give rise to the expected errors.
diff --git a/tests/language/nonfunction_type_aliases/mixed/generic_usage_void_test.dart b/tests/language/nonfunction_type_aliases/mixed/generic_usage_void_test.dart
index cfd2e89..7506391 100644
--- a/tests/language/nonfunction_type_aliases/mixed/generic_usage_void_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/generic_usage_void_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a generic type alias `T` denoting `void` can be used.
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_01_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_01_test.dart
index d538374..3d59a89 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_01_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_01_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_factory_invocation_01_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_02_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_02_test.dart
index 7621b28..a983fc8 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_02_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_02_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
import 'infer_aliased_factory_invocation_02_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_03_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_03_test.dart
index cc7bf2c..e278114 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_03_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_03_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_factory_invocation_03_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_04_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_04_test.dart
index 84a3739..962c1fc 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_04_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_04_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_factory_invocation_04_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_05_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_05_test.dart
index cf3fd51..abebce7 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_05_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_05_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_factory_invocation_05_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_06_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_06_test.dart
index b8e7e14..6a82d11 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_06_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_06_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_factory_invocation_06_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_07_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_07_test.dart
index 57fc211..126ca63 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_07_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_07_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_factory_invocation_06_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_08_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_08_test.dart
index d2bad5e..d10cdff 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_08_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_08_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_factory_invocation_08_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_09_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_09_test.dart
index b856e63..46868b8 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_09_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_09_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
import 'infer_aliased_factory_invocation_09_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_10_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_10_test.dart
index b9d7338..0aec316 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_10_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_10_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_factory_invocation_10_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_11_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_11_test.dart
index c5fc7e2..36c141f 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_11_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_11_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_factory_invocation_11_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_12_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_12_test.dart
index ebbd5a3..8211a49 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_12_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_factory_invocation_12_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_factory_invocation_12_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_01_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_01_test.dart
index ac0eccd..34ad650 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_01_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_01_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_instance_creation_01_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_02_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_02_test.dart
index 5f9a69c..5556645 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_02_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_02_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
import 'infer_aliased_instance_creation_02_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_03_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_03_test.dart
index 5ef10bf..3b53897 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_03_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_03_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_instance_creation_03_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_04_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_04_test.dart
index 876e957..93dc6fb 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_04_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_04_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_instance_creation_04_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_05_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_05_test.dart
index 3fc4fee..fce7739 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_05_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_05_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_instance_creation_05_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_06_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_06_test.dart
index e1b5d99..b10e919 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_06_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_06_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_instance_creation_06_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_07_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_07_test.dart
index 1875e07..1675bb6 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_07_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_07_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_instance_creation_07_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_08_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_08_test.dart
index 6379ae1..9a5cf1c 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_08_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_08_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_instance_creation_08_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_09_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_09_test.dart
index 05cfe25..d2bf193 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_09_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_09_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
import 'infer_aliased_instance_creation_09_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_10_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_10_test.dart
index 864972b..a83850a 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_10_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_10_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_instance_creation_10_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_11_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_11_test.dart
index 3879fb5..c843237 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_11_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_11_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_instance_creation_11_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_12_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_12_test.dart
index e591117..6491464 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_12_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_instance_creation_12_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_instance_creation_12_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_01_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_01_test.dart
index cc2d783..45706da 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_01_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_01_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_redirecting_factory_invocation_01_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_02_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_02_test.dart
index 1c15f5c..8ba038d 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_02_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_02_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
import 'infer_aliased_redirecting_factory_invocation_02_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_03_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_03_test.dart
index e192d64..dfdb35c 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_03_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_03_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_redirecting_factory_invocation_03_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_04_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_04_test.dart
index 5885ea3..4dc72bd 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_04_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_04_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_redirecting_factory_invocation_04_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_05_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_05_test.dart
index 4f1e4db..e2ab098 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_05_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_05_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_redirecting_factory_invocation_05_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_06_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_06_test.dart
index 26773ff..181e08b 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_06_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_06_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_redirecting_factory_invocation_06_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_07_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_07_test.dart
index 8c0a6b5..e85bc80 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_07_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_07_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_redirecting_factory_invocation_07_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_08_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_08_test.dart
index e87a93e..37ad2b6 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_08_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_08_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_redirecting_factory_invocation_08_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_09_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_09_test.dart
index 3450958..40fdb13 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_09_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_09_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
import 'infer_aliased_redirecting_factory_invocation_09_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_10_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_10_test.dart
index c306c01..564d2b1 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_10_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_10_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_redirecting_factory_invocation_10_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_11_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_11_test.dart
index 03cdc77..7236d7e 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_11_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_11_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_redirecting_factory_invocation_11_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_12_test.dart b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_12_test.dart
index d45f27d..cddf3a0 100644
--- a/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_12_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/infer_aliased_redirecting_factory_invocation_12_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'infer_aliased_redirecting_factory_invocation_12_lib.dart';
diff --git a/tests/language/nonfunction_type_aliases/mixed/usage_class_error_test.dart b/tests/language/nonfunction_type_aliases/mixed/usage_class_error_test.dart
index 3d88a6c..0976ee6 100644
--- a/tests/language/nonfunction_type_aliases/mixed/usage_class_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/usage_class_error_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a type alias `T` denoting a class with a constructor
// can give rise to the expected errors.
diff --git a/tests/language/nonfunction_type_aliases/mixed/usage_class_test.dart b/tests/language/nonfunction_type_aliases/mixed/usage_class_test.dart
index 987b9a7..b089cfb 100644
--- a/tests/language/nonfunction_type_aliases/mixed/usage_class_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/usage_class_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a type alias `T` denoting a class can be used.
diff --git a/tests/language/nonfunction_type_aliases/mixed/usage_dynamic_error_test.dart b/tests/language/nonfunction_type_aliases/mixed/usage_dynamic_error_test.dart
index 4e92f9c..d2c147c 100644
--- a/tests/language/nonfunction_type_aliases/mixed/usage_dynamic_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/usage_dynamic_error_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a type alias `T` denoting `dynamic`
// can give rise to the expected errors.
diff --git a/tests/language/nonfunction_type_aliases/mixed/usage_dynamic_test.dart b/tests/language/nonfunction_type_aliases/mixed/usage_dynamic_test.dart
index 71a4070..cbd7e62 100644
--- a/tests/language/nonfunction_type_aliases/mixed/usage_dynamic_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/usage_dynamic_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a type alias `T` denoting `dynamic` can be used.
diff --git a/tests/language/nonfunction_type_aliases/mixed/usage_function_error_test.dart b/tests/language/nonfunction_type_aliases/mixed/usage_function_error_test.dart
index 0230ce2..e0ac95a 100644
--- a/tests/language/nonfunction_type_aliases/mixed/usage_function_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/usage_function_error_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a type alias `T` denoting `Function`
// can give rise to the expected errors.
diff --git a/tests/language/nonfunction_type_aliases/mixed/usage_function_test.dart b/tests/language/nonfunction_type_aliases/mixed/usage_function_test.dart
index ce89a6e..3827ee1 100644
--- a/tests/language/nonfunction_type_aliases/mixed/usage_function_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/usage_function_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a type alias `T` denoting `Function` can be used.
diff --git a/tests/language/nonfunction_type_aliases/mixed/usage_futureor_error_test.dart b/tests/language/nonfunction_type_aliases/mixed/usage_futureor_error_test.dart
index 4495d06..6a03f0d 100644
--- a/tests/language/nonfunction_type_aliases/mixed/usage_futureor_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/usage_futureor_error_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a type alias `T` denoting `FutureOr<int>`
// can give rise to the expected errors.
diff --git a/tests/language/nonfunction_type_aliases/mixed/usage_futureor_test.dart b/tests/language/nonfunction_type_aliases/mixed/usage_futureor_test.dart
index 60ce001..8ade84a 100644
--- a/tests/language/nonfunction_type_aliases/mixed/usage_futureor_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/usage_futureor_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a type alias `T` denoting `FutureOr<int>` can be used.
diff --git a/tests/language/nonfunction_type_aliases/mixed/usage_null_error_test.dart b/tests/language/nonfunction_type_aliases/mixed/usage_null_error_test.dart
index 2b54433..6e92877 100644
--- a/tests/language/nonfunction_type_aliases/mixed/usage_null_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/usage_null_error_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a type alias `T` denoting `Null`
// can give rise to the expected errors.
diff --git a/tests/language/nonfunction_type_aliases/mixed/usage_null_test.dart b/tests/language/nonfunction_type_aliases/mixed/usage_null_test.dart
index 8133e33..c6e036c 100644
--- a/tests/language/nonfunction_type_aliases/mixed/usage_null_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/usage_null_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a type alias `T` denoting `Null` can be used.
diff --git a/tests/language/nonfunction_type_aliases/mixed/usage_object_error_test.dart b/tests/language/nonfunction_type_aliases/mixed/usage_object_error_test.dart
index e30bab0..af098be 100644
--- a/tests/language/nonfunction_type_aliases/mixed/usage_object_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/usage_object_error_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a type alias `T` denoting `Object`
// can give rise to the expected errors.
diff --git a/tests/language/nonfunction_type_aliases/mixed/usage_object_test.dart b/tests/language/nonfunction_type_aliases/mixed/usage_object_test.dart
index 5e64094..8d24e35 100644
--- a/tests/language/nonfunction_type_aliases/mixed/usage_object_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/usage_object_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a type alias `T` denoting `Object` can be used.
diff --git a/tests/language/nonfunction_type_aliases/mixed/usage_type_variable_error_test.dart b/tests/language/nonfunction_type_aliases/mixed/usage_type_variable_error_test.dart
index a544e21..8f90868 100644
--- a/tests/language/nonfunction_type_aliases/mixed/usage_type_variable_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/usage_type_variable_error_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a type alias `T<X extends A>` denoting `X`
// can give rise to the expected errors.
diff --git a/tests/language/nonfunction_type_aliases/mixed/usage_type_variable_test.dart b/tests/language/nonfunction_type_aliases/mixed/usage_type_variable_test.dart
index 983f6a6..dc14bc7 100644
--- a/tests/language/nonfunction_type_aliases/mixed/usage_type_variable_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/usage_type_variable_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a type alias `T<X extends A>` denoting `X`
// gives rise to the expected errors.
diff --git a/tests/language/nonfunction_type_aliases/mixed/usage_void_error_test.dart b/tests/language/nonfunction_type_aliases/mixed/usage_void_error_test.dart
index eba85e8..7a0f7b8 100644
--- a/tests/language/nonfunction_type_aliases/mixed/usage_void_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/usage_void_error_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a type alias `T` denoting `void`
// can give rise to the expected errors.
diff --git a/tests/language/nonfunction_type_aliases/mixed/usage_void_test.dart b/tests/language/nonfunction_type_aliases/mixed/usage_void_test.dart
index 22215bd..f176c76 100644
--- a/tests/language/nonfunction_type_aliases/mixed/usage_void_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/usage_void_test.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
// Requirements=nnbd-weak
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a type alias `T` denoting `void` can be used.
diff --git a/tests/language/nonfunction_type_aliases/near_expand_to_type_variable_test.dart b/tests/language/nonfunction_type_aliases/near_expand_to_type_variable_test.dart
index 27c816f..4ef5b9e 100644
--- a/tests/language/nonfunction_type_aliases/near_expand_to_type_variable_test.dart
+++ b/tests/language/nonfunction_type_aliases/near_expand_to_type_variable_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'package:expect/expect.dart';
diff --git a/tests/language/nonfunction_type_aliases/nnbd_syntax_test.dart b/tests/language/nonfunction_type_aliases/nnbd_syntax_test.dart
index 9939bb0..d14de11 100644
--- a/tests/language/nonfunction_type_aliases/nnbd_syntax_test.dart
+++ b/tests/language/nonfunction_type_aliases/nnbd_syntax_test.dart
@@ -2,7 +2,7 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases,non-nullable
+// SharedOptions=--enable-experiment=non-nullable
typedef T0 = Function?;
typedef T1<X> = List<X?>?;
diff --git a/tests/language/nonfunction_type_aliases/private_names/private_name_cast_test.dart b/tests/language/nonfunction_type_aliases/private_names/private_name_cast_test.dart
index 414c5af..259da2d 100644
--- a/tests/language/nonfunction_type_aliases/private_names/private_name_cast_test.dart
+++ b/tests/language/nonfunction_type_aliases/private_names/private_name_cast_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that private names exported via public typedefs can be used for casts
diff --git a/tests/language/nonfunction_type_aliases/private_names/private_name_creation_test.dart b/tests/language/nonfunction_type_aliases/private_names/private_name_creation_test.dart
index b43d9b7..f0655a3 100644
--- a/tests/language/nonfunction_type_aliases/private_names/private_name_creation_test.dart
+++ b/tests/language/nonfunction_type_aliases/private_names/private_name_creation_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that private names exported via public typedefs allow creation.
diff --git a/tests/language/nonfunction_type_aliases/private_names/private_name_duplicate_interface_error_test.dart b/tests/language/nonfunction_type_aliases/private_names/private_name_duplicate_interface_error_test.dart
index 7d482d0..9939ad3 100644
--- a/tests/language/nonfunction_type_aliases/private_names/private_name_duplicate_interface_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/private_names/private_name_duplicate_interface_error_test.dart
@@ -2,8 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
// Test that private names exported via public typedefs may not appear multiple
// times in a super-interface graph.
@@ -42,7 +40,7 @@
/// Test that having a private generic class in the super-interface graph
/// twice with two different generic instantiations is an error.
class A4 extends A3 implements PublicGenericClass<String> {
-// [error line 42, column 1, length 411]
+// [error line 40, column 1, length 411]
// [analyzer] COMPILE_TIME_ERROR.CONFLICTING_GENERIC_INTERFACES
// ^
// [cfe] 'A4' can't implement both '_PrivateGenericClass<int>' and '_PrivateGenericClass<String>'
@@ -55,7 +53,7 @@
/// Test that having a private generic class in the implements clause twice with
/// two different generic instantiations is an error.
class A6 implements PublicGenericClass<int>, PublicGenericClass<String> {
-// [error line 55, column 1, length 546]
+// [error line 53, column 1, length 546]
// [analyzer] COMPILE_TIME_ERROR.CONFLICTING_GENERIC_INTERFACES
// ^
// [cfe] 'A6' can't implement both '_PrivateGenericClass<int>' and '_PrivateGenericClass<String>'
diff --git a/tests/language/nonfunction_type_aliases/private_names/private_name_extension_test.dart b/tests/language/nonfunction_type_aliases/private_names/private_name_extension_test.dart
index 5c48f2a..f7cfb84 100644
--- a/tests/language/nonfunction_type_aliases/private_names/private_name_extension_test.dart
+++ b/tests/language/nonfunction_type_aliases/private_names/private_name_extension_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that private names exported via public typedefs allow extension.
diff --git a/tests/language/nonfunction_type_aliases/private_names/private_name_implementation_test.dart b/tests/language/nonfunction_type_aliases/private_names/private_name_implementation_test.dart
index eafc545..e7a8490 100644
--- a/tests/language/nonfunction_type_aliases/private_names/private_name_implementation_test.dart
+++ b/tests/language/nonfunction_type_aliases/private_names/private_name_implementation_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that private names exported via public typedefs allow implementation
diff --git a/tests/language/nonfunction_type_aliases/private_names/private_name_instance_checks_test.dart b/tests/language/nonfunction_type_aliases/private_names/private_name_instance_checks_test.dart
index 4496a7a..6e8141d 100644
--- a/tests/language/nonfunction_type_aliases/private_names/private_name_instance_checks_test.dart
+++ b/tests/language/nonfunction_type_aliases/private_names/private_name_instance_checks_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that private names exported via public typedefs can be used for instance
// checks
diff --git a/tests/language/nonfunction_type_aliases/private_names/private_name_mixin_error_test.dart b/tests/language/nonfunction_type_aliases/private_names/private_name_mixin_error_test.dart
index 87642bc..5520229 100644
--- a/tests/language/nonfunction_type_aliases/private_names/private_name_mixin_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/private_names/private_name_mixin_error_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that a private mixin exported via a typedef cannot be used as a class.
diff --git a/tests/language/nonfunction_type_aliases/private_names/private_name_mixin_test.dart b/tests/language/nonfunction_type_aliases/private_names/private_name_mixin_test.dart
index 3ca5bc3..387d31b 100644
--- a/tests/language/nonfunction_type_aliases/private_names/private_name_mixin_test.dart
+++ b/tests/language/nonfunction_type_aliases/private_names/private_name_mixin_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that private names exported via public typedefs can be used as mixins.
diff --git a/tests/language/nonfunction_type_aliases/private_names/private_name_static_methods_error_test.dart b/tests/language/nonfunction_type_aliases/private_names/private_name_static_methods_error_test.dart
index 53d90ec..0e77c92 100644
--- a/tests/language/nonfunction_type_aliases/private_names/private_name_static_methods_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/private_names/private_name_static_methods_error_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that private names exported via public typedefs don't give access to
// private static methods.
diff --git a/tests/language/nonfunction_type_aliases/private_names/private_name_static_methods_test.dart b/tests/language/nonfunction_type_aliases/private_names/private_name_static_methods_test.dart
index 639e6c9..3572cc0 100644
--- a/tests/language/nonfunction_type_aliases/private_names/private_name_static_methods_test.dart
+++ b/tests/language/nonfunction_type_aliases/private_names/private_name_static_methods_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that private names exported via public typedefs work correctly for
// accessing static methods.
diff --git a/tests/language/nonfunction_type_aliases/private_names/private_name_try_catch_test.dart b/tests/language/nonfunction_type_aliases/private_names/private_name_try_catch_test.dart
index e4b4947..48da8a3 100644
--- a/tests/language/nonfunction_type_aliases/private_names/private_name_try_catch_test.dart
+++ b/tests/language/nonfunction_type_aliases/private_names/private_name_try_catch_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that private names exported via public typedefs can be used in a try
// catch.
diff --git a/tests/language/nonfunction_type_aliases/private_names/private_name_types_test.dart b/tests/language/nonfunction_type_aliases/private_names/private_name_types_test.dart
index 27fa686..d9e13d8 100644
--- a/tests/language/nonfunction_type_aliases/private_names/private_name_types_test.dart
+++ b/tests/language/nonfunction_type_aliases/private_names/private_name_types_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Test that private names exported via public typedefs work correctly as
// types.
diff --git a/tests/language/nonfunction_type_aliases/usage_class_error_test.dart b/tests/language/nonfunction_type_aliases/usage_class_error_test.dart
index 49e55ae..82f418f 100644
--- a/tests/language/nonfunction_type_aliases/usage_class_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/usage_class_error_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Introduce an aliased type.
diff --git a/tests/language/nonfunction_type_aliases/usage_class_test.dart b/tests/language/nonfunction_type_aliases/usage_class_test.dart
index 249a701..39e2df5 100644
--- a/tests/language/nonfunction_type_aliases/usage_class_test.dart
+++ b/tests/language/nonfunction_type_aliases/usage_class_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Introduce an aliased type.
diff --git a/tests/language/nonfunction_type_aliases/usage_dynamic_error_test.dart b/tests/language/nonfunction_type_aliases/usage_dynamic_error_test.dart
index ce35fbe..5e47650 100644
--- a/tests/language/nonfunction_type_aliases/usage_dynamic_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/usage_dynamic_error_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Introduce an aliased type.
diff --git a/tests/language/nonfunction_type_aliases/usage_dynamic_test.dart b/tests/language/nonfunction_type_aliases/usage_dynamic_test.dart
index dc5c93f..6d86d12 100644
--- a/tests/language/nonfunction_type_aliases/usage_dynamic_test.dart
+++ b/tests/language/nonfunction_type_aliases/usage_dynamic_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Introduce an aliased type.
diff --git a/tests/language/nonfunction_type_aliases/usage_function_error_test.dart b/tests/language/nonfunction_type_aliases/usage_function_error_test.dart
index c79c642..dd73fe7 100644
--- a/tests/language/nonfunction_type_aliases/usage_function_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/usage_function_error_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Introduce an aliased type.
diff --git a/tests/language/nonfunction_type_aliases/usage_function_test.dart b/tests/language/nonfunction_type_aliases/usage_function_test.dart
index 1ade4c0..fc49e13 100644
--- a/tests/language/nonfunction_type_aliases/usage_function_test.dart
+++ b/tests/language/nonfunction_type_aliases/usage_function_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Introduce an aliased type.
diff --git a/tests/language/nonfunction_type_aliases/usage_futureor_error_test.dart b/tests/language/nonfunction_type_aliases/usage_futureor_error_test.dart
index 293b727..7846432 100644
--- a/tests/language/nonfunction_type_aliases/usage_futureor_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/usage_futureor_error_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'dart:async';
diff --git a/tests/language/nonfunction_type_aliases/usage_futureor_test.dart b/tests/language/nonfunction_type_aliases/usage_futureor_test.dart
index f39d704..518c8ca 100644
--- a/tests/language/nonfunction_type_aliases/usage_futureor_test.dart
+++ b/tests/language/nonfunction_type_aliases/usage_futureor_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import 'dart:async';
diff --git a/tests/language/nonfunction_type_aliases/usage_null_error_test.dart b/tests/language/nonfunction_type_aliases/usage_null_error_test.dart
index 834b5f1..697c43b 100644
--- a/tests/language/nonfunction_type_aliases/usage_null_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/usage_null_error_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Introduce an aliased type.
diff --git a/tests/language/nonfunction_type_aliases/usage_null_test.dart b/tests/language/nonfunction_type_aliases/usage_null_test.dart
index b60efb7..6681083 100644
--- a/tests/language/nonfunction_type_aliases/usage_null_test.dart
+++ b/tests/language/nonfunction_type_aliases/usage_null_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Introduce an aliased type.
diff --git a/tests/language/nonfunction_type_aliases/usage_object_error_test.dart b/tests/language/nonfunction_type_aliases/usage_object_error_test.dart
index cd7c78b..8fad251 100644
--- a/tests/language/nonfunction_type_aliases/usage_object_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/usage_object_error_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Introduce an aliased type.
diff --git a/tests/language/nonfunction_type_aliases/usage_object_test.dart b/tests/language/nonfunction_type_aliases/usage_object_test.dart
index 306604d..6c24de8 100644
--- a/tests/language/nonfunction_type_aliases/usage_object_test.dart
+++ b/tests/language/nonfunction_type_aliases/usage_object_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Introduce an aliased type.
diff --git a/tests/language/nonfunction_type_aliases/usage_type_variable_error_test.dart b/tests/language/nonfunction_type_aliases/usage_type_variable_error_test.dart
index 5a6ffb3..4943ea8 100644
--- a/tests/language/nonfunction_type_aliases/usage_type_variable_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/usage_type_variable_error_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Introduce an aliased type.
diff --git a/tests/language/nonfunction_type_aliases/usage_type_variable_test.dart b/tests/language/nonfunction_type_aliases/usage_type_variable_test.dart
index 2c511b6..917cac8 100644
--- a/tests/language/nonfunction_type_aliases/usage_type_variable_test.dart
+++ b/tests/language/nonfunction_type_aliases/usage_type_variable_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Introduce an aliased type.
diff --git a/tests/language/nonfunction_type_aliases/usage_void_error_test.dart b/tests/language/nonfunction_type_aliases/usage_void_error_test.dart
index 8b97111..e6009c6 100644
--- a/tests/language/nonfunction_type_aliases/usage_void_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/usage_void_error_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Introduce an aliased type.
diff --git a/tests/language/nonfunction_type_aliases/usage_void_test.dart b/tests/language/nonfunction_type_aliases/usage_void_test.dart
index 9857812..c545715 100644
--- a/tests/language/nonfunction_type_aliases/usage_void_test.dart
+++ b/tests/language/nonfunction_type_aliases/usage_void_test.dart
@@ -2,7 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Introduce an aliased type.
diff --git a/tools/VERSION b/tools/VERSION
index 8dc6b7b..c64b96a 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 2
MINOR 14
PATCH 0
-PRERELEASE 119
+PRERELEASE 120
PRERELEASE_PATCH 0
\ No newline at end of file
diff --git a/tools/minidump.py b/tools/minidump.py
index e0e7459..46031fa 100644
--- a/tools/minidump.py
+++ b/tools/minidump.py
@@ -14,7 +14,7 @@
def __init__(self, type, name2value):
self.name2value = name2value
- self.value2name = {v: k for k, v in name2value.iteritems()}
+ self.value2name = {v: k for k, v in name2value.items()}
self.type = type
def from_raw(self, v):
