From 767049139a703dcb41342cd958fa783832aadcaa Mon Sep 17 00:00:00 2001 From: "Lasse R.H. Nielsen" Date: Mon, 12 Dec 2022 11:46:58 +0000 Subject: [PATCH] [3.0 alpha] Remove deprecated dart:core apis - Remove `proxy` and `Provisional` annotations. - Remove `Deprecated.expires` getter. Change-Id: I4521b48bb92e5f8420c778686f4efa9c6426cebb Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/258004 Commit-Queue: Lasse Nielsen Reviewed-by: Brian Quinlan Reviewed-by: Michael Thomsen Reviewed-by: Nate Bosch --- CHANGELOG.md | 14 +- .../lib/src/dart/element/element.dart | 6 +- .../lib/src/test_utilities/mock_sdk.dart | 10 +- .../src/test_utilities/mock_sdk_elements.dart | 23 - .../test/generated/non_hint_code_test.dart | 64 - .../diagnostics/undefined_getter_test.dart | 18 +- .../test/src/task/strong/checker_test.dart | 47 - .../test/data/sky_engine/lib/core.dart | 4 +- .../main.dart.weak.expect | 3 - .../main.dart.weak.outline.expect | 3 - .../main.dart.weak.transformed.expect | 3 - .../export_core.yaml.world.2.expect | 3 - .../export_core.yaml.world.3.expect | 3 - runtime/tests/vm/dart/regress_47010_test.dart | 284 ---- .../tests/vm/dart_2/regress_40462_test.dart | 1308 ----------------- runtime/tools/dartfuzz/dartfuzz.dart | 2 +- .../tools/dartfuzz/dartfuzz_api_table.dart | 13 - sdk/lib/core/annotations.dart | 24 - .../language/deferred/no_such_method_lib.dart | 1 - .../deferred/no_such_method_lib.dart | 1 - tests/lib/html/html_mock_test.dart | 6 - tests/lib_2/html/html_mock_test.dart | 6 - 22 files changed, 19 insertions(+), 1827 deletions(-) delete mode 100644 runtime/tests/vm/dart/regress_47010_test.dart delete mode 100644 runtime/tests/vm/dart_2/regress_40462_test.dart diff --git a/CHANGELOG.md b/CHANGELOG.md index 6377fa86f34..f554e34c917 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,10 +7,21 @@ - **Breaking change** [#49529][]: - Removed the deprecated [`NoSuchMethodError`][] default constructor. Use the [`NoSuchMethodError.withInvocation`][] named constructor instead. + - Removed the deprecated [`proxy`][] and [`Provisional`][] annotations. + The original `proxy` annotation has no effect in Dart 2, + and the `Provisional` type and [`provisional`][] constant + were only used internally during the Dart 2.0 development process. + - Removed the deprecated [`Deprecated.expires`][] getter. + Use [`Deprecated.message`][] instead. [#49529]: https://github.com/dart-lang/sdk/issues/49529 +[`Deprecated.expires`]: https://api.dart.dev/stable/2.18.4/dart-core/Deprecated/expires.html +[`Deprecated.message`]: https://api.dart.dev/stable/2.18.4/dart-core/Deprecated/message.html [`NoSuchMethodError`]: https://api.dart.dev/stable/2.18.4/dart-core/NoSuchMethodError/NoSuchMethodError.html [`NoSuchMethodError.withInvocation`]: https://api.dart.dev/stable/2.18.4/dart-core/NoSuchMethodError/NoSuchMethodError.withInvocation.html +[`Provisional`]: https://api.dart.dev/stable/2.18.4/dart-core/Provisional-class.html +[`provisional`]: https://api.dart.dev/stable/2.18.4/dart-core/provisional-constant.html +[`proxy`]: https://api.dart.dev/stable/2.18.4/dart-core/proxy-constant.html #### `dart:html` @@ -130,7 +141,6 @@ constructor. - Deprecated `NullThrownError` and `CyclicInitializationError`. Neither error is thrown by null safe code. - [#49529]: https://github.com/dart-lang/sdk/issues/49529 [#24644]: https://github.com/dart-lang/sdk/issues/24644 @@ -342,7 +352,7 @@ Updated the Linter to `1.31.0`, which includes changes that - Update `dart pub publish` to require a working resolution. If publishing a breaking release of mutually dependent packages use `dependency_overrides` to obtain a resolution. -- `dart pub add` will now allow adding multiple packages from any source using +- `dart pub add` will now allow adding multiple packages from any source using the same YAML syntax as in `pubspec.yaml`. For example: diff --git a/pkg/analyzer/lib/src/dart/element/element.dart b/pkg/analyzer/lib/src/dart/element/element.dart index 653df32f333..567feab18df 100644 --- a/pkg/analyzer/lib/src/dart/element/element.dart +++ b/pkg/analyzer/lib/src/dart/element/element.dart @@ -1943,10 +1943,6 @@ class ElementAnnotationImpl implements ElementAnnotation { /// protected. static const String _protectedVariableName = 'protected'; - /// The name of the top-level variable used to mark a class as implementing a - /// proxy object. - static const String _proxyVariableName = 'proxy'; - /// The name of the class used to mark a parameter as being required. static const String _requiredClassName = 'Required'; @@ -2081,7 +2077,7 @@ class ElementAnnotationImpl implements ElementAnnotation { bool get isProtected => _isPackageMetaGetter(_protectedVariableName); @override - bool get isProxy => _isDartCoreGetter(_proxyVariableName); + bool get isProxy => false; @override bool get isRequired => diff --git a/pkg/analyzer/lib/src/test_utilities/mock_sdk.dart b/pkg/analyzer/lib/src/test_utilities/mock_sdk.dart index 7d526746298..f30cb3d1799 100644 --- a/pkg/analyzer/lib/src/test_utilities/mock_sdk.dart +++ b/pkg/analyzer/lib/src/test_utilities/mock_sdk.dart @@ -274,8 +274,6 @@ const deprecated = const Deprecated("next release"); const override = const _Override(); -const proxy = const _Proxy(); - external bool identical(Object? a, Object? b); void print(Object? object) {} @@ -318,8 +316,8 @@ class DateTime extends Object { } class Deprecated extends Object { - final String expires; - const Deprecated(this.expires); + final String message; + const Deprecated(this.message); } class pragma { @@ -669,10 +667,6 @@ class _Override { const _Override(); } -class _Proxy { - const _Proxy(); -} - @Since("2.15") extension EnumName on Enum { String get name => _name; diff --git a/pkg/analyzer/lib/src/test_utilities/mock_sdk_elements.dart b/pkg/analyzer/lib/src/test_utilities/mock_sdk_elements.dart index 751f6774b33..12da46370c8 100644 --- a/pkg/analyzer/lib/src/test_utilities/mock_sdk_elements.dart +++ b/pkg/analyzer/lib/src/test_utilities/mock_sdk_elements.dart @@ -52,7 +52,6 @@ class _MockSdkElementsBuilder { ClassElementImpl? _numElement; ClassElementImpl? _objectElement; ClassElementImpl? _overrideElement; - ClassElementImpl? _proxyElement; ClassElementImpl? _recordElement; ClassElementImpl? _setElement; ClassElementImpl? _stackTraceElement; @@ -628,20 +627,6 @@ class _MockSdkElementsBuilder { return overrideElement; } - ClassElementImpl get proxyElement { - var proxyElement = _proxyElement; - if (proxyElement != null) return proxyElement; - - _proxyElement = proxyElement = _class(name: '_Proxy'); - proxyElement.supertype = objectType; - - proxyElement.constructors = [ - _constructor(isConst: true), - ]; - - return proxyElement; - } - ClassElementImpl get recordElement { var recordElement = _recordElement; if (recordElement != null) return recordElement; @@ -930,7 +915,6 @@ class _MockSdkElementsBuilder { numElement, objectElement, overrideElement, - proxyElement, recordElement, setElement, stackTraceElement, @@ -959,20 +943,13 @@ class _MockSdkElementsBuilder { _interfaceType(overrideElement), ); - var proxyVariable = _topLevelVariableConst( - 'proxy', - _interfaceType(proxyElement), - ); - coreUnit.accessors = [ deprecatedVariable.getter!, overrideVariable.getter!, - proxyVariable.getter!, ]; coreUnit.topLevelVariables = [ deprecatedVariable, overrideVariable, - proxyVariable, ]; var coreLibrary = LibraryElementImpl( diff --git a/pkg/analyzer/test/generated/non_hint_code_test.dart b/pkg/analyzer/test/generated/non_hint_code_test.dart index d01918de241..b8d3aabbf94 100644 --- a/pkg/analyzer/test/generated/non_hint_code_test.dart +++ b/pkg/analyzer/test/generated/non_hint_code_test.dart @@ -78,70 +78,6 @@ class Z { '''); } - test_proxy_annotation_prefixed() async { - await assertErrorsInCode(r''' -library L; -@proxy -class A {} -f(var a) { - a = new A(); - a.m(); - var x = a.g; - a.s = 1; - var y = a + a; - a++; - ++a; -} -''', [ - error(HintCode.UNUSED_LOCAL_VARIABLE, 70, 1), - error(HintCode.UNUSED_LOCAL_VARIABLE, 96, 1), - ]); - } - - test_proxy_annotation_prefixed2() async { - await assertErrorsInCode(r''' -library L; -@proxy -class A {} -class B { - f(var a) { - a = new A(); - a.m(); - var x = a.g; - a.s = 1; - var y = a + a; - a++; - ++a; - } -} -''', [ - error(HintCode.UNUSED_LOCAL_VARIABLE, 88, 1), - error(HintCode.UNUSED_LOCAL_VARIABLE, 118, 1), - ]); - } - - test_proxy_annotation_prefixed3() async { - await assertErrorsInCode(r''' -library L; -class B { - f(var a) { - a = new A(); - a.m(); - var x = a.g; - a.s = 1; - var y = a + a; - a++; - ++a; - } -} -@proxy -class A {} -''', [ - error(HintCode.UNUSED_LOCAL_VARIABLE, 70, 1), - error(HintCode.UNUSED_LOCAL_VARIABLE, 100, 1), - ]); - } - test_undefinedMethod_assignmentExpression_inSubtype() async { await assertNoErrorsInCode(r''' class A {} diff --git a/pkg/analyzer/test/src/diagnostics/undefined_getter_test.dart b/pkg/analyzer/test/src/diagnostics/undefined_getter_test.dart index 1fe9cd414b8..ed9b78678e2 100644 --- a/pkg/analyzer/test/src/diagnostics/undefined_getter_test.dart +++ b/pkg/analyzer/test/src/diagnostics/undefined_getter_test.dart @@ -1,4 +1,4 @@ -// Copyright (c) 2019, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2019, the Dart propject 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. @@ -463,22 +463,6 @@ void f(A a) { '''); } - test_proxy_annotation_fakeProxy() async { - await assertErrorsInCode(r''' -library L; -class Fake { - const Fake(); -} -const proxy = const Fake(); -@proxy class PrefixProxy {} -main() { - new PrefixProxy().foo; -} -''', [ - error(CompileTimeErrorCode.UNDEFINED_GETTER, 127, 3), - ]); - } - test_static_conditionalAccess_defined() async { await assertErrorsInCode( ''' diff --git a/pkg/analyzer/test/src/task/strong/checker_test.dart b/pkg/analyzer/test/src/task/strong/checker_test.dart index c1f78407fa3..121541b5651 100644 --- a/pkg/analyzer/test/src/task/strong/checker_test.dart +++ b/pkg/analyzer/test/src/task/strong/checker_test.dart @@ -2825,53 +2825,6 @@ class Child extends helper.Base { ]); } - test_proxy() { - return assertErrorsInCode(r''' -@proxy class C {} -@proxy class D { - var f; - m() => null; - operator -() => null; - operator +(int other) => null; - operator [](int index) => null; - call() => null; -} - -@proxy class F implements Function { noSuchMethod(i) => 42; } - -m() { - D d = new D(); - d.m(); - d.m; - d.f; - -d; - d + 7; - d[7]; - d(); - - C c = new C(); - c.m(); - c.m; - -c; - c + 7; - c[7]; - c(); - - F f = new F(); - f(); -} -''', [ - error(HintCode.DEPRECATED_IMPLEMENTS_FUNCTION, 197, 8), - error(CompileTimeErrorCode.UNDEFINED_METHOD, 332, 1), - error(CompileTimeErrorCode.UNDEFINED_GETTER, 341, 1), - error(CompileTimeErrorCode.UNDEFINED_OPERATOR, 346, 1), - error(CompileTimeErrorCode.UNDEFINED_OPERATOR, 354, 1), - error(CompileTimeErrorCode.UNDEFINED_OPERATOR, 362, 3), - error(CompileTimeErrorCode.INVOCATION_OF_NON_FUNCTION_EXPRESSION, 369, 1), - error(CompileTimeErrorCode.INVOCATION_OF_NON_FUNCTION_EXPRESSION, 394, 1), - ]); - } - test_redirectingConstructor() async { await assertErrorsInCode(''' class A { diff --git a/pkg/analyzer_cli/test/data/sky_engine/lib/core.dart b/pkg/analyzer_cli/test/data/sky_engine/lib/core.dart index de47fc24e1f..b2d972f2f81 100644 --- a/pkg/analyzer_cli/test/data/sky_engine/lib/core.dart +++ b/pkg/analyzer_cli/test/data/sky_engine/lib/core.dart @@ -65,8 +65,8 @@ class DateTime extends Object {} class Null extends Object {} class Deprecated extends Object { - final String expires; - const Deprecated(this.expires); + final String message; + const Deprecated(this.message); } const Object deprecated = const Deprecated("next release"); diff --git a/pkg/front_end/testcases/general/error_export_from_dill/main.dart.weak.expect b/pkg/front_end/testcases/general/error_export_from_dill/main.dart.weak.expect index 13a5eb4ed9f..bc54ebb2b39 100644 --- a/pkg/front_end/testcases/general/error_export_from_dill/main.dart.weak.expect +++ b/pkg/front_end/testcases/general/error_export_from_dill/main.dart.weak.expect @@ -93,7 +93,6 @@ import self as self2; import "dart:core" as core; import "dart:async" as asy; additionalExports = (core::Deprecated, - core::Provisional, core::pragma, core::BigInt, core::bool, @@ -164,8 +163,6 @@ additionalExports = (core::Deprecated, core::Comparator, core::deprecated, core::override, - core::provisional, - core::proxy, asy::Future, asy::Stream, asy::FutureExtensions) diff --git a/pkg/front_end/testcases/general/error_export_from_dill/main.dart.weak.outline.expect b/pkg/front_end/testcases/general/error_export_from_dill/main.dart.weak.outline.expect index f45eaef269f..d84c8a594f8 100644 --- a/pkg/front_end/testcases/general/error_export_from_dill/main.dart.weak.outline.expect +++ b/pkg/front_end/testcases/general/error_export_from_dill/main.dart.weak.outline.expect @@ -28,7 +28,6 @@ import self as self2; import "dart:core" as core; import "dart:async" as asy; additionalExports = (core::Deprecated, - core::Provisional, core::pragma, core::BigInt, core::bool, @@ -99,8 +98,6 @@ additionalExports = (core::Deprecated, core::Comparator, core::deprecated, core::override, - core::provisional, - core::proxy, asy::Future, asy::Stream, asy::FutureExtensions) diff --git a/pkg/front_end/testcases/general/error_export_from_dill/main.dart.weak.transformed.expect b/pkg/front_end/testcases/general/error_export_from_dill/main.dart.weak.transformed.expect index 8ce600294ac..0a45ce32ac6 100644 --- a/pkg/front_end/testcases/general/error_export_from_dill/main.dart.weak.transformed.expect +++ b/pkg/front_end/testcases/general/error_export_from_dill/main.dart.weak.transformed.expect @@ -89,7 +89,6 @@ import self as self2; import "dart:core" as core; import "dart:async" as asy; additionalExports = (core::Deprecated, - core::Provisional, core::pragma, core::BigInt, core::bool, @@ -160,8 +159,6 @@ additionalExports = (core::Deprecated, core::Comparator, core::deprecated, core::override, - core::provisional, - core::proxy, asy::Future, asy::Stream, asy::FutureExtensions) diff --git a/pkg/front_end/testcases/incremental/export_core.yaml.world.2.expect b/pkg/front_end/testcases/incremental/export_core.yaml.world.2.expect index b2c37d7a41a..c69ed4888e2 100644 --- a/pkg/front_end/testcases/incremental/export_core.yaml.world.2.expect +++ b/pkg/front_end/testcases/incremental/export_core.yaml.world.2.expect @@ -5,8 +5,6 @@ additionalExports = (asy::Future, asy::Stream, core::deprecated, core::override, - core::provisional, - core::proxy, core::identical, core::identityHashCode, core::print, @@ -48,7 +46,6 @@ additionalExports = (asy::Future, core::Object, core::OutOfMemoryError, core::Pattern, - core::Provisional, core::RangeError, core::Record, core::RegExp, diff --git a/pkg/front_end/testcases/incremental/export_core.yaml.world.3.expect b/pkg/front_end/testcases/incremental/export_core.yaml.world.3.expect index 9f5ef78eba0..45744836da4 100644 --- a/pkg/front_end/testcases/incremental/export_core.yaml.world.3.expect +++ b/pkg/front_end/testcases/incremental/export_core.yaml.world.3.expect @@ -5,8 +5,6 @@ additionalExports = (asy::Future, asy::Stream, core::deprecated, core::override, - core::provisional, - core::proxy, core::identical, core::identityHashCode, core::print, @@ -48,7 +46,6 @@ additionalExports = (asy::Future, core::Object, core::OutOfMemoryError, core::Pattern, - core::Provisional, core::RangeError, core::Record, core::RegExp, diff --git a/runtime/tests/vm/dart/regress_47010_test.dart b/runtime/tests/vm/dart/regress_47010_test.dart deleted file mode 100644 index 5a1d3b0f3ca..00000000000 --- a/runtime/tests/vm/dart/regress_47010_test.dart +++ /dev/null @@ -1,284 +0,0 @@ -// 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. - -// VMOptions=--use_slow_path --deterministic - -// Reduced from: -// The Dart Project Fuzz Tester (1.91). -// Program generated as: -// dart dartfuzz.dart --seed 1339276199 --no-fp --no-ffi --no-flat -// @dart=2.14 - -import 'dart:collection'; -import 'dart:typed_data'; - -MapEntry, List>? var0 = - MapEntry, List>( - {true: -32, true: 47, false: -11, false: 9, false: -69}, - ['n', 'Rz!4\u2665']); -Uint8List? var9 = Uint8List.fromList(Uint64List.fromList( - Int64List.fromList(Int16List.fromList(Int16List.fromList(Uint8List(38)))))); -Uint8ClampedList var10 = Uint8ClampedList.fromList( - Int32List.fromList(Uint64List.fromList([-27, -74]))); -Uint8ClampedList? var11 = Uint8ClampedList(31); -Int16List var12 = Int16List(5); -Int16List? var13 = Int16List(44); -Uint16List var14 = Uint16List.fromList([-96, 24, -43, -9]); -Uint16List? var15 = Uint16List.fromList(Int8List.fromList(Int32List(34))); -Int32List var16 = Int32List(7); -Int32List? var17 = - Int32List.fromList([-67, if (false) -98 else -36, -4294967295]); -Uint32List var18 = Uint32List(28); -Uint32List? var19 = Uint32List(18); -Int64List var20 = Int64List.fromList(Uint64List.fromList(Uint16List(47))); -Int64List? var21 = Int64List(1); -Uint64List var22 = Uint64List(49); -Uint64List? var23 = Uint64List(43); -Int32x4List var24 = Int32x4List(45); -Int32x4List? var25 = Int32x4List(46); -Int32x4 var26 = Int32x4(46, 24, 23, 15); -Int32x4? var27 = Int32x4(20, 28, 20, 2); -Deprecated var28 = Deprecated('G-Ki'); -Deprecated? var29 = Deprecated('#Ww'); -Provisional var30 = Provisional(); -Provisional? var31 = Provisional(); -bool var32 = bool.fromEnvironment(''); -bool? var33 = bool.hasEnvironment('P9LY'); -Duration var34 = Duration(); -Duration? var35 = Duration(); -Error var36 = Error(); -Error? var37 = Error(); -AssertionError var38 = AssertionError(17); -AssertionError? var39 = AssertionError(8); -TypeError var40 = TypeError(); -TypeError? var41 = TypeError(); -CastError var42 = CastError(); -CastError? var43 = new CastError(); -NullThrownError var44 = NullThrownError(); -NullThrownError? var45 = new NullThrownError(); -ArgumentError var46 = ArgumentError.value(22, 'K90\u{1f600}QtS', 33); -ArgumentError? var47 = ArgumentError.notNull(')'); -RangeError var48 = RangeError.range(2, 23, 36, 'H', 'w&'); -RangeError? var49 = new RangeError(22); -IndexError var50 = - IndexError.withLength(15, 1, indexable: 14, name: 'ZuC', message: '#1z9xJ'); -IndexError? var51 = IndexError.withLength(14, 2, - indexable: 36, name: 'V(', message: '9Jf!0\u2665'); -FallThroughError var52 = FallThroughError(); -FallThroughError? var53 = FallThroughError(); -UnsupportedError var56 = UnsupportedError('5txzg'); -UnsupportedError? var57 = UnsupportedError('W4vVdfv'); -UnimplementedError var58 = UnimplementedError('pK00TI\u2665'); -UnimplementedError? var59 = UnimplementedError('J(teto2'); -StateError var60 = StateError('L\u2665'); -StateError? var61 = StateError('e\u2665mykMK'); -ConcurrentModificationError var62 = new ConcurrentModificationError(22); -ConcurrentModificationError? var63 = ConcurrentModificationError(7); -StackOverflowError var64 = StackOverflowError(); -StackOverflowError? var65 = new StackOverflowError(); -CyclicInitializationError var66 = CyclicInitializationError('\u{1f600}'); -CyclicInitializationError? var67 = CyclicInitializationError('C'); -Exception var68 = Exception(14); -Exception? var69 = Exception(40); -FormatException var70 = FormatException('\u{1f600}lv32', 21, 28); -FormatException? var71 = FormatException('e', 19, 12); -IntegerDivisionByZeroException var72 = IntegerDivisionByZeroException(); -IntegerDivisionByZeroException? var73 = IntegerDivisionByZeroException(); -int var74 = 40; -int? var75 = -44; -Null var76 = null; -Null? var77 = null; -num var78 = 42; -num? var79 = -85; -RegExp var80 = new RegExp('M5O'); -RegExp? var81 = RegExp('Fs2'); -String var82 = 'W6'; -String? var83 = 'h'; -Runes var84 = Runes('+'); -Runes? var85 = Runes(''); -RuneIterator var86 = RuneIterator('\u2665w'); -RuneIterator? var87 = new RuneIterator('iNEK\u{1f600}'); -StringBuffer var88 = StringBuffer(47); -StringBuffer? var89 = StringBuffer(5); -Symbol var90 = new Symbol('q\u{1f600}'); -Symbol? var91 = new Symbol('&j5'); -Expando var92 = Expando(' '); -Expando? var93 = Expando('f5B'); -Expando var94 = Expando(''); -Expando? var95 = Expando('\u{1f600}1AwU\u2665C'); -Expando var96 = Expando('Xzj(d'); -Expando? var97 = Expando('Ulsd'); -List var98 = [false, false, false]; -List? var99 = [false, false, false, true]; -List var100 = Uint8ClampedList(17); -List? var101 = Uint8ClampedList(40); -List var102 = ['Y h', 'f', '\u{1f600}ip dQ', ')p', '2Qo']; -List? var103 = [ - 'BQ(6-', - '\u{1f600}6\u2665yJaC', - '3wa', - 'VJ', - 'k', - '' -]; -Set var104 = {false, true, false}; -Set? var105 = {false, true, false, true, false, false}; -Set var106 = {44, 11}; -Set? var107 = {if (false) -94, 35}; -Set var108 = {''}; -Set? var109 = {'4'}; -Map var110 = { - false: true, - false: true, - false: true, - true: false -}; -Map? var111 = { - false: false, - true: false, - false: false, - true: false -}; -Map var112 = { - true: 35, - true: -4, - true: -14, - false: 30, - false: -25 -}; -Map? var113 = null; -Map var114 = { - false: '7d', - false: '\u{1f600}sv+', - false: 'aY', - false: 'dt' -}; -Map? var115 = { - false: '', - false: '(G7\u{1f600}TBN', - true: '', - true: 'zZ-\u{1f600}\u2665)X', - false: ')-9', - false: '' -}; -Map var116 = { - 3: true, - 10: true, - -59: true, - 15: false, - -36: true -}; -Map? var117 = {16: false, 0: false}; -Map var118 = { - -92: 29, - -12: 40, - -29: -26, - -21: 1, - 13: 28, - 28: -44 -}; -Map? var119 = {-54: -37}; -Map var120 = {-80: '', -62: 'h', 40: 'C\u2665FVU'}; -Map? var121 = { - ...{ - -8: 'S\u{1f600}kjRb', - 23: '4', - -9223372034707292160: '', - 28: 'uz', - -69: '@' - }, - -53: 'nU6f', - -5: '', - -9223372034707292159: '', - 20: 'h7EB+' -}; -Map var122 = {'8+G': false}; -Map? var123 = {'rM9m6k': true, '2': true}; -Map var124 = {'Z+p@\u2665Ww': -55}; -Map? var125 = {'9': -2147483647, 'uQ': 40}; -Map var126 = { - 'Q!': ' V\u{1f600}A2\u{1f600}', - 'z': '\u2665)', - 'cM@7\u{1f600}': 'XUT', - 'oLoh': 'bLPrZ', - 'YmR67nj': 'BdeuR' -}; -Map? var127 = {'nOsSM1': '3 @yIj'}; -MapEntry var128 = MapEntry(true, false); -MapEntry? var129 = MapEntry(true, false); -MapEntry var130 = MapEntry(false, 13); -MapEntry? var131 = MapEntry(true, 31); -MapEntry var132 = - MapEntry(true, '\u26653KE\u{1f600}'); -MapEntry? var133 = MapEntry(false, 'd'); -MapEntry var134 = MapEntry(46, true); -MapEntry? var135 = MapEntry(34, false); -MapEntry var136 = MapEntry(22, 30); -MapEntry? var137 = MapEntry(30, 48); -MapEntry var138 = MapEntry(46, 'by#@-nv'); -MapEntry? var139 = MapEntry(49, 'N@KF'); -MapEntry var140 = - MapEntry('\u{1f600}km\u2665', true); -MapEntry? var141 = new MapEntry('7PZX', false); -MapEntry var142 = new MapEntry('OE', 27); - -Map> var446 = >{ - 'YJ\u{1f600}': {'BcKzE': true, 'Cz1A+n': false, '': true}, - 'u!KEz9I': { - '\u26653Hjr': true, - '-\u{1f600}': true, - '': true, - ')-': false, - 'ygN': true - }, - '+R6': {'ta\u2665dKu)': true, 'rao9j': true}, - 'YGXS!': { - '': false, - '6R': false, - '': true, - 'MV\u{1f600} PP': true - } -}; -Map, Map> var2000 = - , Map>{ - new MapEntry('', 7): { - -55: true, - 4294967295: false, - 48: true, - -1: true, - -96: false - }, - MapEntry('ORLVr', 1): { - -21: false, - 4294967297: false, - -12: false, - -84: false - } -}; - -void foo1_Extension0() { - var446.forEach((loc0, loc1) { - for (int loc2 = 0; loc2 < 34; loc2++) { - print(, String>{ - MapEntry(true, false): 'pqKqb', - MapEntry(true, true): 'Fkx', - MapEntry(true, false): '', - MapEntry(false, true): 'fJvVWOW', - MapEntry(false, true): 'q\u2665NR', - MapEntry(false, true): '\u2665' - }); - var2000.forEach((loc3, loc4) { - print(MapEntry, MapEntry>( - {false: 'L'}, MapEntry(42, false))); - }); - } - }); -} - -main() { - foo1_Extension0(); - - print( - '$var0\n$var9\n$var11\n$var12\n$var13\n$var14\n$var15\n$var16\n$var17\n$var18\n$var19\n$var20\n$var21\n$var22\n$var23\n$var24\n$var25\n$var26\n$var27\n$var28\n$var29\n$var30\n$var31\n$var32\n$var33\n$var34\n$var35\n$var36\n$var37\n$var38\n$var39\n$var40\n$var41\n$var42\n$var43\n$var44\n$var45\n$var46\n$var47\n$var48\n$var49\n$var50\n$var51\n$var52\n$var53\n$var56\n$var57\n$var58\n$var59\n$var60\n$var61\n$var62\n$var63\n$var64\n$var65\n$var66\n$var67\n$var68\n$var69\n$var70\n$var71\n$var72\n$var73\n$var74\n$var75\n$var76\n$var77\n$var78\n$var79\n$var80\n$var81\n$var82\n$var83\n$var84\n$var85\n$var86\n$var87\n$var88\n$var89\n$var90\n$var91\n$var92\n$var93\n$var94\n$var95\n$var96\n$var97\n$var98\n$var99\n$var100\n$var101\n$var102\n$var103\n$var104\n$var105\n$var106\n$var107\n$var108\n$var109\n$var110\n$var111\n$var112\n$var113\n$var114\n$var115\n$var116\n$var117\n$var118\n$var119\n$var120\n$var121\n$var122\n$var123\n$var124\n$var125\n$var126\n$var127\n$var128\n$var129\n$var130\n$var131\n$var132\n'); -} diff --git a/runtime/tests/vm/dart_2/regress_40462_test.dart b/runtime/tests/vm/dart_2/regress_40462_test.dart deleted file mode 100644 index 6b582bb2238..00000000000 --- a/runtime/tests/vm/dart_2/regress_40462_test.dart +++ /dev/null @@ -1,1308 +0,0 @@ -// Copyright (c) 2020, 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. - -// @dart = 2.9 - -// Regression test for https://github.com/dart-lang/sdk/issues/40462 -// VMOptions=--deoptimize_every=140 --optimization_level=3 --use-slow-path --old_gen_heap_size=128 - -import 'dart:async'; -import 'dart:cli'; -import 'dart:collection'; -import 'dart:convert'; -import 'dart:core'; -import 'dart:io'; -import 'dart:isolate'; -import 'dart:math'; -import 'dart:typed_data'; - -Map var0 = { - 33: false, - 6: true, - -9223372028264841217: true, - -77: true, - -6: false, - 2147483649: false -}; -MapEntry var1 = MapEntry('&8\u{1f600}Z', true); -Map var2 = {18: true, 16: false, -30: false, -30: true, 41: false}; -Endian var3 = (Endian.host); -ByteData var4 = ByteData(9); -Int8List var5 = Int8List(4); -Uint8List var6 = Uint8List.fromList( - Uint8ClampedList.fromList(Int64List.fromList(Uint8List(45)))); -Uint8ClampedList var7 = Uint8ClampedList(4); -Int16List var8 = Int16List.fromList([-11]); -Uint16List var9 = Uint16List.fromList(Uint16List.fromList(Uint8List(45))); -Int32List var10 = Int32List.fromList(Uint16List(14)); -Uint32List var11 = Uint32List.fromList(Int64List.fromList([-8, -95])); -Int64List var12 = Int64List.fromList(Uint32List(3)); -Uint64List var13 = Uint64List(2); -Int32x4List var14 = Int32x4List(2); -Int32x4 var15 = Int32x4.bool(false, true, true, true); -Deprecated var16 = Deprecated('G'); -Provisional var17 = Provisional(); -bool var18 = bool.fromEnvironment(' 9'); -Duration var19 = new Duration(); -Error var20 = Error(); -AssertionError var21 = AssertionError(49); -TypeError var22 = TypeError(); -CastError var23 = CastError(); -NullThrownError var24 = new NullThrownError(); -ArgumentError var25 = ArgumentError.value(27, '', 18); -RangeError var26 = - IndexError.withLength(1, 46, indexable: 42, name: '+m', message: 'JjY'); -IndexError var27 = - IndexError.withLength(38, 13, indexable: 29, name: 'R1Z', message: 'VnR7'); -FallThroughError var28 = new FallThroughError(); -UnsupportedError var30 = UnsupportedError('(OXv'); -UnimplementedError var31 = UnimplementedError('Dt)F@\u2665'); -StateError var32 = StateError('y'); -ConcurrentModificationError var33 = ConcurrentModificationError(18); -OutOfMemoryError var34 = OutOfMemoryError(); -StackOverflowError var35 = StackOverflowError(); -CyclicInitializationError var36 = CyclicInitializationError('0'); -Exception var37 = new Exception(6); -FormatException var38 = FormatException('w8q', 36, 17); -IntegerDivisionByZeroException var39 = IntegerDivisionByZeroException(); -int var40 = -97; -Null var41 = null; -num var42 = -64; -RegExp var43 = RegExp('Dr6eaNw'); -String var44 = 'Zgm83P\u2665'; -Runes var45 = Runes('RJ '); -RuneIterator var46 = RuneIterator.at('\u2665q', 17); -StringBuffer var47 = StringBuffer(40); -Symbol var48 = Symbol('sA8'); -Expando var49 = Expando('1\u2665&'); -Expando var50 = Expando('6lfPf+'); -Expando var51 = Expando(')L9b7#'); -List var52 = [false]; -List var53 = [ - 49, - -14, - 31, - -80, - ...[9223372034707292160, 44, 6, 3, -42] -]; -List var54 = [ - 'X#', - 'DP', - 'A\u2665-s4mF', - 'l', - '9', - 'W6\u{1f600}d\u{1f600}' -]; -Set var55 = {false, false}; -Set var56 = {-2147483649}; -Set var57 = { - '', - 'shf!r', - '\u{1f600}XCBW6', - '\u{1f600}', - '1\u{1f600}7FS', - 'w@' -}; -Map var58 = { - false: false, - false: true, - true: false, - true: true, - false: false, - false: false -}; -Map var59 = {true: -82, true: -23, false: 22}; -Map var60 = {false: 'nC\u2665', true: '', true: '8+E2G'}; -Map var61 = {22: false, -35: false, 38: false, 2: false}; -Map var62 = {38: 48, -3: 45, 47: -9223372032559808511, 2: -73}; -Map var63 = { - ...{-47: 'Sizqs\u2665', -91: 'd'} -}; -Map var64 = { - '': false, - '\u{1f600}\u2665UJe!': true, - 'o!n': false, - 'Jw\u{1f600}\u{1f600}L': true, - 'UL\u2665g-E': true, - 'g\u{1f600}Q@': false -}; -Map var65 = { - 'TnC2(o': -86, - '': 17, - '+!\u{1f600}54!6': -62, - '': 42, - 'm': -54, - 'sk&EU\u{1f600}n': 23 -}; -Map var66 = {'aTVZDv': '6x\u{1f600}w'}; -MapEntry var67 = MapEntry(false, true); -MapEntry var68 = MapEntry(true, 23); -MapEntry var69 = new MapEntry(true, ''); -MapEntry var70 = MapEntry(40, false); -MapEntry var71 = MapEntry(8, 46); -MapEntry var72 = MapEntry(49, 'Ke'); -MapEntry var73 = MapEntry('7p', false); -MapEntry var74 = new MapEntry('+&u', 33); -MapEntry var75 = MapEntry('1(etj', '@##4jr'); - -Error foo0(int par1) { - if (par1 >= 41) { - return var22; - } - var66.forEach((loc0, loc1) { - var32 ??= var32; - }); - { - int loc0 = 2; - while (--loc0 > 0) { - break; - } - } - return new RangeError(47); -} - -Endian foo1(Runes par1, FallThroughError par2, Uint16List par3) { - return (Endian.little); -} - -Uint32List foo2(Null par1, String par2, int par3) { - if (par3 >= 30) { - return (false ? Uint32List.fromList(new Uint32List(30)) : var11); - } - ((StringBuffer(18)).clear()); - (RangeError.checkValueInInterval( - (true ? (--var40) : 42), - (-58 ?? (Float32x4.wxwy as int)), - (-((Uint8ClampedList.bytesPerElement as int))), - ((var63[26]).substring(30, -4)), - var44)); - return (Uint32List.fromList((List.filled(34, var40)))); -} - -extension fooE0 on Runes { - Exception foo0_Extension0( - Set par1, Expando par2, List par3, int par4) { - if (par4 >= 44) { - return Exception(35); - } - { - int loc0 = 0; - do { - if (var18) { - return ((!((var58[true] - ? var58[((!(((RegExp('F\u2665R')).isDotAll))) || (!(var18)))] - : true))) - ? ((false ? (var52[(--var40)] ? true : var18) : true) - ? FormatException('y5\u{1f600}1XPZ', 45, 39) - : Exception(29)) - : fooE0(var45).foo0_Extension0( - { - ((true ? var18 : (var64['Xpa'] ? false : var52[var40])) - ? '' - : 'NDjj\u{1f600}w\u{1f600}'), - ('mCOwFm' ?? 'v') - }, - var50, - (var6 ?? - (false ? Uint8List.fromList([(-1 ^ var10[36])]) : var13)), - par4 + 1)); - } - } while (++loc0 < 4); - } - - for (int loc0 = 0; loc0 < 21; loc0++) { - print(MapEntry(true, true)); - { - int loc1 = 4; - while (--loc1 > 0) { - var74 ??= MapEntry(' ', 35); - } - } - } - return fooE0(var45).foo0_Extension0({ - (var18 - ? (var64[var54[var7[6]]] - ? (var61[6442450945] - ? '5zKk&\u{1f600}L' - : ('\u2665PpeyDs' ?? 'DSwK\u{1f600}')) - : '\u2665iOel1') - : 'KF\u{1f600}'), - '6x!', - var60[(!((false ?? (!(true)))))] - }, var50, var9, par4 + 1); - } -} - -extension fooE1 on CyclicInitializationError { - List foo1_Extension0( - FormatException par1, Duration par2, num par3, int par4) { - if (par4 >= 41) { - return var54; - } - throw (((!((false ? false : var49[(++var40)]))) - ? (!(true)) - : (false - ? var52[(var40--)] - : (((RegExp('BQ7TD8@')).isCaseSensitive) && true))) - ? ((true && var18) ? Symbol('mfQ6U') : Symbol('yr@')) - : Symbol('J1')); - } - - String foo1_Extension1(StringBuffer par1, Int16List par2, int par3) { - if (par3 >= 14) { - return var63[var50[ - ((((false ? {var50[-61]} : var56)).add(par3)) ? 8589934591 : 15)]]; - } - try { - return fooE1(var36).foo1_Extension1(par1, par2, par3 + 1); - } on OutOfMemoryError { - exit(254); - } catch (exception, stackTrace) { - switch ((-17 ~/ (true ? (-(var40)) : (-(var42))))) { - case 3680904311: - { - throw (((true || true) - ? ([(((var60[var18]).trim()) * 27)] == - ArgumentError.value(37, 'G+cy&', 37)) - : (!((((var54[(--var40)]).trimRight()) == Provisional())))) - ? fooE1(var36).foo1_Extension0( - FormatException('y', 31, 49), var19, -4294967296, 0) - : var54); - break; - } - case 3680904315: - { - var51 ??= var51; - break; - } - default: - { - var66.forEach((loc0, loc1) { - var52 = ((!((var42 > var40))) - ? var52 - : [ - (((var18 - ? Int32x4.bool(false, false, true, false) - : (true ? new Int32x4(13, 16, 20, 25) : var15))) - .flagW), - var18 - ]); - }); - break; - } - } - } - { - int loc0 = 43; - while (--loc0 > 0) { - (((true - ? (true - ? { - 40: 'nbk', - 38: fooE1(var36).foo1_Extension1(var47, var8, par3 + 1) - } - : var63) - : var63)) - .addAll(var63)); - try { - var58.forEach((loc1, loc2) { - /// Single-line documentation comment. - throw var68; - }); - { - int loc1 = 0; - do { - var12 = Int64List.fromList(Int8List.fromList(Int64List.fromList( - Uint8ClampedList.fromList([var59[true]])))); - } while (++loc1 < 3); - } - } on OutOfMemoryError { - exit(254); - } catch (exception, stackTrace) { - return '3'; - } finally { - var24 ??= NullThrownError(); - } - } - } - return var63[(Int32x4.xxxz as int)]; - } -} - -extension fooE2 on TypeError { - StateError foo2_Extension0(List par1) { - var47 = var47; - if ((!(var49[((false ? var18 : ((Duration() > var19) ? true : false)) - ? -25 - : var40)]))) { - if (var49[43]) { - var63 = ((((!(true)) ? (8589934591 >= (6442450945 % -14)) : var18) ^ - (var18 - ? (((false - ? var14[(true ? -9 : var40)] - : Int32x4.bool(false, true, true, true))) - .flagW) - : false)) - ? (var64['1'] - ? { - (--var40): 'h\u{1f600}E(S@r', - (var40++): var63[var6[36]], - (--var40): var60[true] - } - : { - ((({((~(var40)) ?? var40): 'dU\u2665nE'}).isNotEmpty) - ? -45 - : var40): - var63[(true - ? 36 - : ((var61[var40] ? false : false) - ? var40 - : (~((var40--)))))], - (~((Int32x4.zzwz as int))): (true - ? var44 - : (fooE1(var36).foo1_Extension1(var47, var8, 0) + - var36.foo1_Extension1(var47, Int16List(18), 0))), - (((var6 == Symbol('\u2665uarCSV')) && - (var18 ? var18 : var18)) - ? (var40++) - : 25): - (((((!(((RegExp('t')).isMultiLine))) ? var18 : false) - ? var8[((true ? -65 : (3 % -99)) ~/ 30)] - : var40)) - .toStringAsExponential((Int32x4.wxxz as int))) - }) - : { - (-9223372032559808513 ~/ (-(4294967297))): - var36.foo1_Extension1(StringBuffer(24), var8, 0), - if ((!((var18 ^ false)))) - (var0[(var42 ~/ var40)] ? -39 : -96): 'BuzKc' - else - (Int32x4.yxyy as int): (false ? 'Rxpx2T' : '(xEVAx'), - (Int32x4.xxxw as int): var54[(Float32x4.zyyw as int)], - (~(-7)): ('' * 8) - }); - } else { - var60 = { - (!(var18)): fooE1(var36).foo1_Extension1( - StringBuffer(0), Int16List.fromList(Uint64List(6)), 0), - var18: ('U6o5y' * 31), - ((((RegExp('')).isCaseSensitive) && - (false || - var58[(({var40}).add(var12[(-9223372030412324863 ?? - var65[((var18).toString())])]))])) || - ((new Duration() * (false ? var40 : var40)) <= - (-((var19 ?? var19))))): 'HZIfq', - var64[var44]: var44, - var52[(var5[-0] | ((++var40) >> var40))]: ((var18 - ? false - : (true - ? var2[-91] - : var58[ - ((((var15).shuffleMix(Int32x4(3, 6, 11, 16), var40))) - .flagX)])) - ? var54[12] - : var54[(-((var18 ? var40 : var40)))]), - var2[(~(-87))]: 'LxD' - }; - var20 ??= ((((var18 ? RegExp('S#lVaW(') : var43)).isUnicode) - ? FallThroughError() - : foo0(0)); - } - } - return StateError('99'); - } - - Int64List foo2_Extension1( - Exception par1, Int16List par2, List par3, int par4) { - if (par4 >= 5) { - return ((!(((new RegExp('I!')) - .hasMatch((false ? 'A\u{1f600}\u26656' : ('F4xY' ?? var51[0])))))) - ? Int64List(30) - : var12); - } // Single-line comment. - if ((((bool.fromEnvironment((((-(var40))).toString()))) & false) || - var58[var49[-4294967295]])) { - try { - var2 = var2; - } on OutOfMemoryError { - exit(254); - } catch (exception, stackTrace) { - (({27: '7BxmY'}).clear()); - } - } - var13 = var13; - return (var22).foo2_Extension1( - var38, - par2, - var36.foo1_Extension0( - (var58[true] - ? FormatException('2IWwRf', 3, 34) - : new FormatException('d!B', 4, 28)), - Duration(), - 45, - 0), - par4 + 1); - } - - NullThrownError foo2_Extension2(Exception par1, - IntegerDivisionByZeroException par2, FormatException par3) { - var42 = 30; - var1 = MapEntry('abGhTN', true); - return var24; - } -} - -extension fooE3 on Null { - Int32x4 foo3_Extension0(int par1) { - if (par1 >= 6) { - return (((Int32x4(12, 1, 48, 9)).withX((22 ?? ((8 | par1) >> 41)))) ^ - var15); - } - ((((((var5).sublist(((!((!(false)))) ? -87 : -9223372030412324865), - (--var40))) + - var12) + - (var8 ?? var8))) - .fillRange(-9223372036854775807, -2147483649, (Float32x4.xwyw as int))); - return Int32x4.bool(true, true, false, false); - } -} - -extension fooE4 on Duration { - MapEntry foo4_Extension0(Exception par1, Int32x4 par2) { - (({ - ...{ - (false ? -22 : (var18 ? var13[var40] : (++var40))), - var40, - -9223372030412324864, - (var64[var44] ? 27 : var40), - (Float32x4.wyyx as int) - }, - ...{-94, (var40--)}, - (~(var40)), - for (int loc0 in {(DateTime.april as int)}) (var40++) - }).clear()); - return MapEntry(15, 'Y3U'); - } - - CyclicInitializationError foo4_Extension1(bool par1, Int32x4List par2) { - { - int loc0 = 12; - while (--loc0 > 0) { - { - UnsupportedError loc1 = var31; - { - int loc2 = 48; - while (--loc2 > 0) { - var50 ??= (false ? new Expando('N') : var50); - } - } - } - return (true - ? (false ? CyclicInitializationError('pbsl\u2665B)') : var36) - : CyclicInitializationError('SY8K')); - } - } - return CyclicInitializationError('x'); - } -} - -class X0 { - Int32x4 fld0_0 = Int32x4(4, 17, 25, 21); - FallThroughError fld0_1 = new FallThroughError(); - Int16List fld0_2 = Int16List.fromList(Int32List.fromList(Uint32List(21))); - MapEntry fld0_3 = MapEntry('Z)i6o', 1); - - List foo0_0(Map par1) { - (({(~((-(var40)))): 'S'}).addAll({ - for (int loc0 = 0; loc0 < 9; loc0++) -40: var44, - (Int32x4.ywzy as int): ((var31).message), - if (var58[(!(false))]) - -45: (String.fromEnvironment(((((true && var49[-9223372036854775807]) - ? CyclicInitializationError('8DdLh-y') - : var36)) - .toString()))), - var40: var54[(var40++)] - })); - return ([ - true, - (var64[var63[13]] - ? (((true - ? var15 - : (var58[var58[false]] - ? new Int32x4(18, 23, 13, 30) - : Int32x4(49, 44, 37, 37)))) - .flagW) - : (!(var52[(Float32x4.yzyw as int)]))), - var18, - (!(((var56).add((~(43)))))) - ] ?? - var52); - } - - NullThrownError foo0_1(int par1) { - if (par1 >= 20) { - return var22.foo2_Extension2(var38, IntegerDivisionByZeroException(), - FormatException('JHGQ-3', 48, 18)); - } - try { - var66.forEach((loc0, loc1) { - { - int loc2 = 0; - do { - for (int loc3 = 0; loc3 < 10; loc3++) { - throw StackOverflowError(); - } - var27 ??= var27; - } while (++loc2 < 20); - } - - { - int loc2 = 28; - while (--loc2 > 0) { - // Single-line comment. - return NullThrownError(); - } - } - }); - } on OutOfMemoryError { - exit(254); - } catch (exception, stackTrace) { - /// Single-line documentation comment. - throw var23; - } finally { - // Single-line comment. - try { - /* - * Multi-line - * comment. - */ - ((((((var41.foo3_Extension0(0)).flagW) | - (((true ? true : var49[(Float32x4.yxxy as int)]) - ? var18 - : var58[var64['Zmg\u26656']]) - ? var64[((true ? '' : ('+TZ' + var44)) + var54[-89])] - : true)) - ? RuneIterator.at('8zi', 34) - : (((var52[var40] ? var45 : Runes('M!y'))).iterator))) - .reset((Float32x4.xzxx as int))); - } on OutOfMemoryError { - exit(254); - } catch (exception, stackTrace) { - // Single-line comment. - { - int loc0 = 0; - do { - var31 ??= (var18 ? UnimplementedError('') : var31); - } while (++loc0 < 19); - } - } finally { - var33 ??= var33; - print({ - 'p', - '5', - 'nFd', - ((('\u2665QJhrGu').substring( - (var40 ~/ - ((false ? true : (!(true))) - ? (var40 - 15) - : -4294967296)), - -52)) * - 36), - ('aA\u{1f600}' + - (var60[((true - ? true - : (!(((var14[(-(((var52[27] ? 39 : var40) << -35)))]) - .flagX)))) ^ - var18)] * - 8)), - ((var64[var44]).toString()) - }); - } - } - return var24; - } - - Int8List foo0_2(Symbol par1, MapEntry par2, - Map par3, int par4) { - if (par4 >= 40) { - return Int8List(9); - } - var1 ??= MapEntry('B\u{1f600}\u2665v-fx', true); - if (false) { - if ((var42 >= -64)) { - { - int loc0 = 0; - do { - ((var63).addAll({3: ((((var18).toString()) + var44) + 'PIW@')})); - var41 = null; - } while (++loc0 < 20); - } - } - switch (((Float32x4.yyxy as int) & var40)) { - case 2432097039: - { - if ((!((var18 | - ((!((bool.fromEnvironment('Doptl\u{1f600}R')))) - ? true - : var18))))) { - return var5; - } else { - var63 = { - (-((true - ? var11[fld0_2[(Int32x4.zwzz as int)]] - : var11[(var18 - ? var12[var59[ - ((Int32x4.bool(true, false, true, false)).flagZ)]] - : var40)]))): var44, - ...{(-(-0)): '@yx+(O'}, - ...{ - (var40 >> -39): - (((var18 ? var52[-9223372036854775807] : false) - ? var58[var18] - : (!((false || false)))) - ? '\u{1f600}B4hFc' - : '33xC'), - if ((var19 >= Duration())) - (Float32x4.ywyz as int): var44 - else - var5[var50[(var42 ~/ var42)]]: var51[var40], - ...{ - var62[-12]: '@LYD', - ((false ? var42 : var40) ~/ -42): - (([''] == var47) ? '' : var44) - } - }, - (Float32x4.yyyx as int): 'eD0\u2665A', - if ((!(var18))) - ((var15).x as int): - ((!(var58[(!(var64[')']))])) ? var44 : var44) - else - -88: ((StateError('')).toString()), - var13[var40]: var44 - }; - } - break; - } - case 2432097049: - { - var33 ??= ConcurrentModificationError(18); - break; - } - default: - { - var59 = { - false: (~(((~(var40)) >> var40))), - (false ? var18 : (!(false))): var40, - (false ?? (!((((-49).isInfinite) && var58[var58[var18]])))): - (var40--), - (!((var54 == NullThrownError()))): -12 - }; - break; - } - } - } else { - try { - if (((34 - 11) >= (-(49)))) { - var39 = var39; - var56 = var56; - } - } on OutOfMemoryError { - exit(254); - } catch (exception, stackTrace) { - throw StackOverflowError(); - } - if (var18) { - print({ - (var58[true] ? (++var40) : var12[(5 | (Int32x4.wwxx as int))]): - (++var40), - (Int64List.bytesPerElement as int): - var6[(~(var50[var62[var65[par3['Zb']]]]))], - (var18 ? (true ? 10 : (++var40)) : -79): (var64['h\u{1f600}X\u2665('] - ? (true - ? var5[(((((((((33 > (true ? var40 : var42)) ? var43 : var43)) - .isMultiLine) - ? '' - : '#')) - .endsWith(var51[9223372032559808512])) - ? (!(var18)) - : var49[22]) - ? var40 - : var40)] - : (33 ~/ 38)) - : (++var40)) - }); - } - } - return foo0_2( - Symbol('y-r3rR'), MapEntry(true, false), par3, par4 + 1); - } - - @override - Int32x4List call(int par1) { - if (par1 >= 5) { - return Int32x4List(5); - } - if ((true - ? var61[(Int32x4.zwyx as int)] - : (((Float32x4.ywyy as int)).isInfinite))) { - return var14; - } - } - - void run() { - var17 ??= Provisional(); - } -} - -extension XE0 on X0 { - IntegerDivisionByZeroException foo0_Extension0( - Map par1, RuneIterator par2, Duration par3) { - var64.forEach((loc0, loc1) { - { - int loc2 = 0; - do { - fld0_3 ??= MapEntry('4T\u2665i', 30); - } while (++loc2 < 44); - } - }); - return (var52[(Uint32List.bytesPerElement as int)] - ? var39 - : IntegerDivisionByZeroException()); - } - - List foo0_Extension1(List par1) { - /** - ** Multi-line - ** documentation comment. - */ - if (false) { - switch (((var40++) | -57)) { - case 3773120366: - { - for (int loc0 in foo2( - null, - (false - ? (var36.foo1_Extension1(var47, Int16List(25), 0) ?? - (Uri.encodeFull(fooE1(var36) - .foo1_Extension1(var47, Int16List(8), 0)))) - : '\u2665Lgd(n'), - 0)) { - try { - var6 = Uint8List(12); - } on OutOfMemoryError { - exit(254); - } catch (exception, stackTrace) { - var20 = foo0(0); - var1 = MapEntry('X', true); - } finally { - try { - var41 = (var0[(ZLibOption.strategyHuffmanOnly as int)] - ? (provisional) - : (((((~(-43)) | (2147483649 ^ var40))).isNaN) - ? (var64[(true ? 'TA6\u{1f600}FQT' : 'p\u2665p!-')] - ? null - : null) - : null)); - var49 ??= var49; - } on OutOfMemoryError { - exit(254); - } catch (exception, stackTrace) { - try { - /* - * Multi-line - * comment. - */ - var64 = var64; - } on OutOfMemoryError { - exit(254); - } catch (exception, stackTrace) { - var23 = CastError(); - for (int loc1 = 0; loc1 < 14; loc1++) { - continue; - } - } finally { - var69 = MapEntry(false, 'SemmWM'); - } - var14[(-((~(-54))))] += var14[(--var40)]; - } - for (int loc1 = 0; loc1 < 1; loc1++) { - var5 = Int8List(38); - var13 = var13; - } - } - } - break; - } - case 3773120375: - { - var25 = var27; - break; - } - case 3773120384: - { - try { - // Single-line comment. - ((Uint8ClampedList(24)).removeRange( - (var62[-9223372032559808513] ^ -29), var7[var40])); - var4 ??= ByteData(11); - } on OutOfMemoryError { - exit(254); - } catch (exception, stackTrace) { - var13 = Uint64List.fromList( - Uint8List.fromList(Uint8ClampedList.fromList([(35 | -41)]))); - if ((((!(((false ? var0[var40] : var18) - ? (false | (SecurityContext.alpnSupported)) - : true))) - ? false - : var18) - ? true - : var18)) { - var9 = Uint16List(15); - } - } - break; - } - } - for (int loc0 = 0; loc0 < 22; loc0++) { - var14 = X0()(0); - throw MapEntry(true, 16); - } - } else { - ((StringBuffer(44)).clear()); - var39 ??= IntegerDivisionByZeroException(); - } - return [ - false, - (!(var18)), - false, - var64[ - var36.foo1_Extension1(StringBuffer(2), Int16List.fromList([-27]), 0)], - true, - false - ]; - } -} - -class X1 extends X0 { - Map fld1_0 = {true: '\u2665SE)b'}; - - Map foo1_0(Deprecated par1, int par2) { - if (par2 >= 22) { - return { - (var40++): var7[(--var40)], - (((-(var59[true])) | ((--var40) ?? var11[var9[-76]])) >> var62[14]): - (~((par2--))) - }; - } - throw UnimplementedError('O'); - } - - @override - Int32x4List call(int par1) { - var26 ??= - IndexError.withLength(27, 6, indexable: 18, name: '+Qy9', message: ''); - { - int loc0 = 41; - while (--loc0 > 0) { - /// Single-line documentation comment. - try { - fld1_0 = { - var52[var10[par1]]: - (((var40++)).toStringAsPrecision(var13[(par1--)])), - var2[44]: var36.foo1_Extension1(var47, - (Int16List.fromList(Uint16List.fromList(Int64List(34)))), 0), - ((!(true)) - ? false - : var52[(var18 ? 33 : (true ? var8[var5[par1]] : -27))]): - (var36.foo1_Extension1( - var47, - Int16List.fromList(Uint16List.fromList(Int8List(25))), - 0) + - '7'), - var18: var36.foo1_Extension1( - var47, ((var8).sublist(var59[var49[par1]], (par1--))), 0) - }; - var66 = var66; - } on OutOfMemoryError { - exit(254); - } catch (exception, stackTrace) { - { - int loc1 = 33; - while (--loc1 > 0) { - var52 = (var52 + - ((loc0 < (var49[var11[(-((loc1 ?? -57)))]] ? (-(-1)) : par1)) - ? ((true - ? [true, false] - : [ - true, - var18, - (((((~(37)) << -9223372036854775808) | - ((loc0).modInverse(loc1) as int))) - .isNegative), - ('D\u2665Sp' == - IndexError.withLength(14, 13, - indexable: 12, - name: 'PDTOXf', - message: '&5e')) - ]) ?? - [true, (!(false))]) - : [true])); - } - } - if (var18) { - var20 ??= NullThrownError(); - var14[(Float32x4.zyxw as int)] &= (var41).foo3_Extension0(0); - } else { - var74 = MapEntry('Jwvy&', 9); - } - } - } - } - return Int32x4List(11); - } - - void run() { - super.run(); - var49 ??= var49; - } -} - -extension XE1 on X1 { - IndexError foo1_Extension0( - Runes par1, MapEntry par2, Exception par3, int par4) { - if (par4 >= 19) { - return var27; - } - for (int loc0 = 0; loc0 < 19; loc0++) { - if (((((var58[var18] && (var19 > Duration())) - ? (true ? (~(-43)) : var5[(var40--)]) - : 2147483647)) - .isInfinite)) { - return var27; - } else { - var41 = var41; - var23 = (var18 - ? ((var18 ? (false ?? var18) : (false ? ((-38).isEven) : var18)) - ? CastError() - : CastError()) - : CastError()); - } - } - return IndexError.withLength(15, 20, - indexable: 17, name: 'yw', message: ''); - } - - Expando foo1_Extension1() { - /// Single-line documentation comment. - var59.forEach((loc0, loc1) { - throw var68; - }); - return var51; - } - - Expando foo1_Extension2(CyclicInitializationError par1, Null par2) { - { - int loc0 = 0; - do { - // Single-line comment. - var67 ??= (((!((var18 && var58[false]))) - ? ((((var30).toString())).endsWith(var63[ - ((true ? loc0 : (var9[11] >> (-(-34)))) << - (Float32x4.zwww as int))])) - : var18) - ? MapEntry(false, false) - : MapEntry(true, true)); - } while (++loc0 < 29); - } - - { - int loc0 = 25; - while (--loc0 > 0) { - for (int loc1 = 0; loc1 < 40; loc1++) { - throw new Expando('+huc0\u2665'); - } - try { - continue; - } on OutOfMemoryError { - exit(254); - } catch (exception, stackTrace) { - var66.forEach((loc1, loc2) { - if (true) { - var5 = Int8List.fromList( - Uint8ClampedList.fromList([var50[(-(loc0))]])); - } - }); - if ((NetworkInterface.listSupported)) { - for (int loc1 = 0; loc1 < 37; loc1++) { - var74 ??= var74; - { - Set loc2 = { - 1, - (var9[(--var40)] ^ - (-82 ?? - (true - ? var59[var18] - : (var58[var58[(!(false))]] ? (~(loc0)) : 0)))), - loc0, - ((((var47).isNotEmpty) ?? - (var52[(Float32x4.xyzw as int)] || (var19 < var19))) - ? (var40--) - : ((Float32x4.zxzz as int) ^ 48)), - ((false | ((var18 ? false : var18) ? (!(var18)) : true)) - ? (((!(false)) - ? ((true ? false : var18) - ? (!(var18)) - : (!(var61[var12[44]]))) - : var18) - ? (var40++) - : 10) - : (--var40)) - }; - fld1_0 = ((!(var18)) - ? ((!((!(var18)))) - ? fld1_0 - : { - false: (Uri.decodeFull( - var66[((Deprecated('uvZ6GU')).toString())])) - }) - : { - var18: (true - ? ((!(true)) - ? '' - : fooE1(par1) - .foo1_Extension1(StringBuffer(49), var8, 0)) - : ('' + 'qD6Fry')), - (((var58[true] ? RegExp('Zp') : RegExp(''))).isDotAll): - fooE1(par1) - .foo1_Extension1(StringBuffer(38), var8, 0), - ((StringBuffer(39)).isEmpty): - ((MapEntry(41, 'S2lAKd')).toString()), - var64[(var18 - ? (var60[(false - ? false - : (SecurityContext.alpnSupported))] ?? - '\u{1f600}lsZ') - : 'c4+Ry')]: - (Uri.decodeQueryComponent( - var63[(var49[(var40--)] ? -66 : (var40++))])), - (!(((StringBuffer(41)).isNotEmpty))): - ((null).toString()) - }); - var66 = var66; - } - } - return Expando('eo'); - } - } finally { - print(var27); - } - } - } - return Expando(''); - } -} - -main() { - try { - foo0(0); - } on OutOfMemoryError { - exit(254); - } catch (e, st) { - print('foo0() throws'); - } - try { - foo1( - (var61[(false ? 1 : var40)] - ? (true ? Runes('\u{1f600}\u{1f600}RK') : var45) - : ((!(true)) ? ((var63[var40]).runes) : var45)), - FallThroughError(), - Uint16List(33)); - } on OutOfMemoryError { - exit(254); - } catch (e, st) { - print('foo1() throws'); - } - try { - foo2(((9223372036854775807 < -24) ? (true ? null : var41) : var41), '', 0); - } on OutOfMemoryError { - exit(254); - } catch (e, st) { - print('foo2() throws'); - } - try { - var45.foo0_Extension0( - {'udb(R', '\u2665IEp\u{1f600}e', 'DMEbe#g', ''}, var50, var8, 0); - } on OutOfMemoryError { - exit(254); - } catch (e, st) { - print('var45.foo0_Extension0() throws'); - } - try { - fooE1(var36).foo1_Extension0( - FormatException('n', 3, 48), var19, ((var40 % var42) * -2), 0); - } on OutOfMemoryError { - exit(254); - } catch (e, st) { - print('fooE1(var36).foo1_Extension0() throws'); - } - try { - fooE1(var36).foo1_Extension1( - (false ? StringBuffer(36) : StringBuffer(2)), Int16List(25), 0); - } on OutOfMemoryError { - exit(254); - } catch (e, st) { - print('fooE1(var36).foo1_Extension1() throws'); - } - try { - var22.foo2_Extension0( - (var54 + ['\u2665aAaW', 'Wc', '\u2665u- jf\u{1f600}'])); - } on OutOfMemoryError { - exit(254); - } catch (e, st) { - print('var22.foo2_Extension0() throws'); - } - try { - (var22).foo2_Extension1(IntegerDivisionByZeroException(), var8, ['OiV'], 0); - } on OutOfMemoryError { - exit(254); - } catch (e, st) { - print('(var22).foo2_Extension1() throws'); - } - try { - var22.foo2_Extension2( - (((var66[((('2S2\u{1f600}Y' * 43)) - .substring((Float32x4.zyyy as int), var9[34]))]) - .endsWith(var44)) - ? ((!(var58[var58[var18]])) ? Exception(9) : var38) - : var38), - IntegerDivisionByZeroException(), - FormatException('T', 23, 36)); - } on OutOfMemoryError { - exit(254); - } catch (e, st) { - print('var22.foo2_Extension2() throws'); - } - try { - var41.foo3_Extension0(0); - } on OutOfMemoryError { - exit(254); - } catch (e, st) { - print('var41.foo3_Extension0() throws'); - } - try { - fooE4(var19).foo4_Extension0( - var38, - ((((Int32x4(3, 32, 0, 1) - Int32x4(38, 16, 29, 3))).flagX) - ? var14[(false ? var40 : (var40++))] - : var14[var11[-75]])); - } on OutOfMemoryError { - exit(254); - } catch (e, st) { - print('fooE4(var19).foo4_Extension0() throws'); - } - try { - var19.foo4_Extension1((SecurityContext.alpnSupported), var14); - } on OutOfMemoryError { - exit(254); - } catch (e, st) { - print('var19.foo4_Extension1() throws'); - } - - try { - X0().foo0_0({'i\u2665\u26651': -89, 'YPf': -88, 'k': -62, 'zhny': -65}); - } on OutOfMemoryError { - exit(254); - } catch (e, st) { - print('X0().foo0_0 throws'); - } - try { - X0().foo0_1(0); - } on OutOfMemoryError { - exit(254); - } catch (e, st) { - print('X0().foo0_1 throws'); - } - try { - X0().foo0_2(Symbol('L Cn'), MapEntry(true, true), - {' pP': '', '': '2A\u2665B', '': 'm\u2665b'}, 0); - } on OutOfMemoryError { - exit(254); - } catch (e, st) { - print('X0().foo0_2 throws'); - } - try { - X0()(0); - } on OutOfMemoryError { - exit(254); - } catch (e, st) { - print('X0() throws'); - } - try { - X0().foo0_Extension0({false: 29, true: 27}, var46, (-((-(var19))))); - } on OutOfMemoryError { - exit(254); - } catch (e, st) { - print('X0().foo0_Extension0 throws'); - } - try { - (X0()).foo0_Extension1((false - ? ([-0, -12] ?? Uint8ClampedList(4)) - : (List.filled(43, var40)))); - } on OutOfMemoryError { - exit(254); - } catch (e, st) { - print('(X0()).foo0_Extension1 throws'); - } - try { - X1().foo1_0(Deprecated('CR4-'), 0); - } on OutOfMemoryError { - exit(254); - } catch (e, st) { - print('X1().foo1_0 throws'); - } - try { - X1()((Int32x4.xyzz as int)); - } on OutOfMemoryError { - exit(254); - } catch (e, st) { - print('X1() throws'); - } - try { - (X1()).foo1_Extension0((('-pjz').runes), - (true ? var68 : MapEntry(false, 16)), var39, 0); - } on OutOfMemoryError { - exit(254); - } catch (e, st) { - print('(X1()).foo1_Extension0 throws'); - } - try { - (X1()).foo1_Extension1(); - } on OutOfMemoryError { - exit(254); - } catch (e, st) { - print('(X1()).foo1_Extension1 throws'); - } - try { - (X1()).foo1_Extension2(var36, var41); - } on OutOfMemoryError { - exit(254); - } catch (e, st) { - print('(X1()).foo1_Extension2 throws'); - } - try { - X1().run(); - } on OutOfMemoryError { - exit(254); - } catch (e, st) { - print('X1().run() throws'); - } - try { - print( - '$var0\n$var1\n$var2\n$var3\n$var4\n$var5\n$var6\n$var7\n$var8\n$var9\n$var10\n$var11\n$var12\n$var13\n$var14\n$var15\n$var16\n$var17\n$var18\n$var19\n$var20\n$var21\n$var22\n$var23\n$var24\n$var25\n$var26\n$var27\n$var28\n$var30\n$var31\n$var32\n$var33\n$var34\n$var35\n$var36\n$var37\n$var38\n$var39\n$var40\n$var41\n$var42\n$var43\n$var44\n$var45\n$var46\n$var47\n$var48\n$var49\n$var50\n$var51\n$var52\n$var53\n$var54\n$var55\n$var56\n$var57\n$var58\n$var59\n$var60\n$var61\n$var62\n$var63\n$var64\n$var65\n$var66\n$var67\n$var68\n$var69\n$var70\n$var71\n$var72\n$var73\n$var74\n$var75\n'); - } on OutOfMemoryError { - exit(254); - } catch (e, st) { - print('print() throws'); - } -} diff --git a/runtime/tools/dartfuzz/dartfuzz.dart b/runtime/tools/dartfuzz/dartfuzz.dart index 0e67958643e..f6f6d31f78c 100644 --- a/runtime/tools/dartfuzz/dartfuzz.dart +++ b/runtime/tools/dartfuzz/dartfuzz.dart @@ -14,7 +14,7 @@ import 'dartfuzz_type_table.dart'; // Version of DartFuzz. Increase this each time changes are made // to preserve the property that a given version of DartFuzz yields // the same fuzzed program for a deterministic random seed. -const String version = '1.94'; +const String version = '1.95'; // Restriction on statements and expressions. const int stmtDepth = 1; diff --git a/runtime/tools/dartfuzz/dartfuzz_api_table.dart b/runtime/tools/dartfuzz/dartfuzz_api_table.dart index 6a87d7f63ce..d5f0aae0e90 100644 --- a/runtime/tools/dartfuzz/dartfuzz_api_table.dart +++ b/runtime/tools/dartfuzz/dartfuzz_api_table.dart @@ -66,8 +66,6 @@ class DartLib { DartType.LIST_INT_NULLABLE: listLibsNullable, DartType.MAP_INT_STRING: mapLibs, DartType.MAP_INT_STRING_NULLABLE: mapLibsNullable, - DartType.NULL: nullLibs, - DartType.NULL_NULLABLE: nullLibsNullable, DartType.RUNEITERATOR: runeIteratorLibs, DartType.RUNEITERATOR_NULLABLE: runeIteratorLibsNullable, DartType.RUNES: runesLibs, @@ -1955,14 +1953,6 @@ class DartLib { DartLib('Map.unmodifiable', [DartType.VOID, DartType.MAP_INT_STRING], true), ]; - static const nullLibs = [ - DartLib('provisional', [DartType.VOID, DartType.VOID], false), - DartLib('proxy', [DartType.VOID, DartType.VOID], false), - ]; - static const nullLibsNullable = [ - DartLib('provisional', [DartType.VOID, DartType.VOID], false), - DartLib('proxy', [DartType.VOID, DartType.VOID], false), - ]; static const runeIteratorLibs = [ DartLib('iterator', [DartType.RUNES, DartType.VOID], false), ]; @@ -2004,7 +1994,6 @@ class DartLib { DartLib('base64Encode', [DartType.VOID, DartType.LIST_INT], true), DartLib('base64UrlEncode', [DartType.VOID, DartType.LIST_INT], true), DartLib('currentAsString', [DartType.RUNEITERATOR, DartType.VOID], false), - DartLib('expires', [DartType.DEPRECATED, DartType.VOID], false), DartLib('message', [DartType.DEPRECATED, DartType.VOID], false), DartLib('message', [DartType.FORMATEXCEPTION, DartType.VOID], false), DartLib('message', [DartType.STATEERROR, DartType.VOID], false), @@ -2072,12 +2061,10 @@ class DartLib { DartLib('base64Encode', [DartType.VOID, DartType.LIST_INT], true), DartLib('base64UrlEncode', [DartType.VOID, DartType.LIST_INT], true), DartLib('currentAsString', [DartType.RUNEITERATOR, DartType.VOID], false), - DartLib('expires', [DartType.DEPRECATED, DartType.VOID], false), DartLib('message', [DartType.DEPRECATED, DartType.VOID], false), DartLib('message', [DartType.FORMATEXCEPTION, DartType.VOID], false), DartLib('message', [DartType.INTEGERDIVISIONBYZEROEXCEPTION, DartType.VOID], false), - DartLib('message', [DartType.PROVISIONAL, DartType.VOID], false), DartLib('message', [DartType.STATEERROR, DartType.VOID], false), DartLib('message', [DartType.UNIMPLEMENTEDERROR, DartType.VOID], false), DartLib('message', [DartType.UNSUPPORTEDERROR, DartType.VOID], false), diff --git a/sdk/lib/core/annotations.dart b/sdk/lib/core/annotations.dart index dd71e893eb2..8183375e0f3 100644 --- a/sdk/lib/core/annotations.dart +++ b/sdk/lib/core/annotations.dart @@ -76,9 +76,6 @@ class Deprecated { /// is expected to be removed. const Deprecated(this.message); - @Deprecated('Use `message` instead. Will be removed in Dart 3.0.0') - String get expires => message; - String toString() => "Deprecated feature: $message"; } @@ -117,27 +114,6 @@ class _Override { /// can be used to enable more warnings based on `@override` annotations. const Object override = _Override(); -/// An annotation class that was used during development of Dart 2. -/// -/// Should not be used any more. -@deprecated -class Provisional { - String? get message => null; - const Provisional({String? message}); -} - -/// An annotation that was used during development of Dart 2. -/// -/// The annotation has no effect, and will be removed. -@deprecated -const Null provisional = null; - -/// This annotation was used in Dart prior to version 2. -/// -/// The annotation has no effect, and will be removed. -@deprecated -const Null proxy = null; - /// A hint to tools. /// /// Tools that work with Dart programs may accept hints to guide their behavior diff --git a/tests/language/deferred/no_such_method_lib.dart b/tests/language/deferred/no_such_method_lib.dart index ccb00911cc4..8a05b9dccdb 100644 --- a/tests/language/deferred/no_such_method_lib.dart +++ b/tests/language/deferred/no_such_method_lib.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. -@proxy class C { noSuchMethod(Invocation invocation) => 42; } diff --git a/tests/language_2/deferred/no_such_method_lib.dart b/tests/language_2/deferred/no_such_method_lib.dart index 085f67d5629..58b2b7e4cda 100644 --- a/tests/language_2/deferred/no_such_method_lib.dart +++ b/tests/language_2/deferred/no_such_method_lib.dart @@ -4,7 +4,6 @@ // @dart = 2.9 -@proxy class C { noSuchMethod(Invocation invocation) => 42; } diff --git a/tests/lib/html/html_mock_test.dart b/tests/lib/html/html_mock_test.dart index ed3e85bc21f..26c2cb11ad8 100644 --- a/tests/lib/html/html_mock_test.dart +++ b/tests/lib/html/html_mock_test.dart @@ -15,7 +15,6 @@ class Mock { } } -@proxy class MockBodyElement extends Mock implements BodyElement { Node append(Node e) => e; } @@ -24,29 +23,24 @@ class _EventListeners { Stream get onBlur => new Stream.fromIterable([]); } -@proxy class MockHtmlDocument extends Mock with _EventListeners implements HtmlDocument { BodyElement get body => new MockBodyElement(); } -@proxy class MockWindow extends Mock with _EventListeners implements Window { Stream get onBeforeUnload => new Stream.fromIterable([]); String? name = "MOCK_NAME"; } -@proxy class MockLocation extends Mock implements Location { String href = "MOCK_HREF"; } -@proxy class MockFileList extends Mock implements FileList {} -@proxy class MockFile extends Mock implements File {} main() { diff --git a/tests/lib_2/html/html_mock_test.dart b/tests/lib_2/html/html_mock_test.dart index 4d61454a2a0..dced1e1e16e 100644 --- a/tests/lib_2/html/html_mock_test.dart +++ b/tests/lib_2/html/html_mock_test.dart @@ -17,7 +17,6 @@ class Mock { } } -@proxy class MockBodyElement extends Mock implements BodyElement { Node append(Node e) => e; } @@ -26,29 +25,24 @@ class _EventListeners { Stream get onBlur => new Stream.fromIterable([]); } -@proxy class MockHtmlDocument extends Mock with _EventListeners implements HtmlDocument { BodyElement get body => new MockBodyElement(); } -@proxy class MockWindow extends Mock with _EventListeners implements Window { Stream get onBeforeUnload => new Stream.fromIterable([]); String name = "MOCK_NAME"; } -@proxy class MockLocation extends Mock implements Location { String href = "MOCK_HREF"; } -@proxy class MockFileList extends Mock implements FileList {} -@proxy class MockFile extends Mock implements File {} main() {