From ddc0866e8f271f319bbb86f9a0bcddae76dffbc0 Mon Sep 17 00:00:00 2001 From: Tess Strickland Date: Tue, 17 Dec 2024 12:40:14 +0100 Subject: [PATCH] Add more entry-point annotations for test-only code. (#160421) This change adds entry-point annotations to methods and classes accessed by native code during Flutter tests. Currently, entry point annotations are not checked by the Dart VM when running in JIT mode, only in AOT mode. In order to also enforce entry point annotations in JIT mode, first tests in Flutter must be appropriately annotated to avoid roll failures. Related issues: * https://github.com/flutter/flutter/issues/118608 * https://github.com/dart-lang/sdk/issues/50649 ## Pre-launch Checklist - [X] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [X] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [X] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [X] I signed the [CLA]. - [X] I listed at least one issue that this PR fixes in the description above. - [X] I updated/added relevant documentation (doc comments with `///`). - [X] I added new tests to check the change I am making, or this PR is [test-exempt]. - [X] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [X] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md --- .../api/lib/widgets/navigator/navigator.restorable_push.0.dart | 1 + .../navigator/navigator.restorable_push_and_remove_until.0.dart | 1 + .../navigator/navigator.restorable_push_replacement.0.dart | 1 + .../lib/widgets/navigator/navigator_state.restorable_push.0.dart | 1 + .../navigator_state.restorable_push_and_remove_until.0.dart | 1 + .../navigator/navigator_state.restorable_push_replacement.0.dart | 1 + .../api/lib/widgets/navigator/restorable_route_future.0.dart | 1 + 7 files changed, 7 insertions(+) diff --git a/examples/api/lib/widgets/navigator/navigator.restorable_push.0.dart b/examples/api/lib/widgets/navigator/navigator.restorable_push.0.dart index 71427ea6cbe..7b8b8b531b5 100644 --- a/examples/api/lib/widgets/navigator/navigator.restorable_push.0.dart +++ b/examples/api/lib/widgets/navigator/navigator.restorable_push.0.dart @@ -30,6 +30,7 @@ class RestorablePushExample extends StatefulWidget { State createState() => _RestorablePushExampleState(); } +@pragma('vm:entry-point') class _RestorablePushExampleState extends State { @pragma('vm:entry-point') static Route _myRouteBuilder(BuildContext context, Object? arguments) { diff --git a/examples/api/lib/widgets/navigator/navigator.restorable_push_and_remove_until.0.dart b/examples/api/lib/widgets/navigator/navigator.restorable_push_and_remove_until.0.dart index cf2f5a1fb3d..2b7927c5fe1 100644 --- a/examples/api/lib/widgets/navigator/navigator.restorable_push_and_remove_until.0.dart +++ b/examples/api/lib/widgets/navigator/navigator.restorable_push_and_remove_until.0.dart @@ -30,6 +30,7 @@ class RestorablePushAndRemoveUntilExample extends StatefulWidget { State createState() => _RestorablePushAndRemoveUntilExampleState(); } +@pragma('vm:entry-point') class _RestorablePushAndRemoveUntilExampleState extends State { @pragma('vm:entry-point') static Route _myRouteBuilder(BuildContext context, Object? arguments) { diff --git a/examples/api/lib/widgets/navigator/navigator.restorable_push_replacement.0.dart b/examples/api/lib/widgets/navigator/navigator.restorable_push_replacement.0.dart index e632e04636c..32b831acb2f 100644 --- a/examples/api/lib/widgets/navigator/navigator.restorable_push_replacement.0.dart +++ b/examples/api/lib/widgets/navigator/navigator.restorable_push_replacement.0.dart @@ -35,6 +35,7 @@ class RestorablePushReplacementExample extends StatefulWidget { State createState() => _RestorablePushReplacementExampleState(); } +@pragma('vm:entry-point') class _RestorablePushReplacementExampleState extends State { @pragma('vm:entry-point') static Route _myRouteBuilder(BuildContext context, Object? arguments) { diff --git a/examples/api/lib/widgets/navigator/navigator_state.restorable_push.0.dart b/examples/api/lib/widgets/navigator/navigator_state.restorable_push.0.dart index 11c038fb56c..0e328a976e8 100644 --- a/examples/api/lib/widgets/navigator/navigator_state.restorable_push.0.dart +++ b/examples/api/lib/widgets/navigator/navigator_state.restorable_push.0.dart @@ -30,6 +30,7 @@ class RestorablePushExample extends StatefulWidget { State createState() => _RestorablePushExampleState(); } +@pragma('vm:entry-point') class _RestorablePushExampleState extends State { @pragma('vm:entry-point') static Route _myRouteBuilder(BuildContext context, Object? arguments) { diff --git a/examples/api/lib/widgets/navigator/navigator_state.restorable_push_and_remove_until.0.dart b/examples/api/lib/widgets/navigator/navigator_state.restorable_push_and_remove_until.0.dart index b20acd93ff7..3774bc95b18 100644 --- a/examples/api/lib/widgets/navigator/navigator_state.restorable_push_and_remove_until.0.dart +++ b/examples/api/lib/widgets/navigator/navigator_state.restorable_push_and_remove_until.0.dart @@ -30,6 +30,7 @@ class RestorablePushAndRemoveUntilExample extends StatefulWidget { State createState() => _RestorablePushAndRemoveUntilExampleState(); } +@pragma('vm:entry-point') class _RestorablePushAndRemoveUntilExampleState extends State { @pragma('vm:entry-point') static Route _myRouteBuilder(BuildContext context, Object? arguments) { diff --git a/examples/api/lib/widgets/navigator/navigator_state.restorable_push_replacement.0.dart b/examples/api/lib/widgets/navigator/navigator_state.restorable_push_replacement.0.dart index 75a191e0306..47337f454e4 100644 --- a/examples/api/lib/widgets/navigator/navigator_state.restorable_push_replacement.0.dart +++ b/examples/api/lib/widgets/navigator/navigator_state.restorable_push_replacement.0.dart @@ -35,6 +35,7 @@ class RestorablePushReplacementExample extends StatefulWidget { State createState() => _RestorablePushReplacementExampleState(); } +@pragma('vm:entry-point') class _RestorablePushReplacementExampleState extends State { @pragma('vm:entry-point') static Route _myRouteBuilder(BuildContext context, Object? arguments) { diff --git a/examples/api/lib/widgets/navigator/restorable_route_future.0.dart b/examples/api/lib/widgets/navigator/restorable_route_future.0.dart index ddf8efc6ac2..9dc7bc9c088 100644 --- a/examples/api/lib/widgets/navigator/restorable_route_future.0.dart +++ b/examples/api/lib/widgets/navigator/restorable_route_future.0.dart @@ -30,6 +30,7 @@ class MyHome extends StatefulWidget { State createState() => _MyHomeState(); } +@pragma('vm:entry-point') class _MyHomeState extends State with RestorationMixin { final RestorableInt _lastCount = RestorableInt(0); late RestorableRouteFuture _counterRoute;