Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

[fuchsia] Switch from core-jit to core snapshots. #30744

Merged
merged 1 commit into from
Jan 13, 2022

Conversation

akbiggs
Copy link
Contributor

@akbiggs akbiggs commented Jan 7, 2022

core-jit is deprecated and will be removed.

Core snapshots no longer separate instructions snapshots from data snapshots. We remove the instructions args from the core snapshots and remove logic that loads them.

Tested: Used JIT Dart and Flutter runners to run Workstation.

return false;
isolate_instructions = isolate_snapshot_instructions_.address();
} else {
FX_LOG(ERROR, LOG_TAG, "Failed to load isolate snapshot instructions.");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we are switching snapshot_kind to 'core' instead of 'core-jit' we don't expect to find and load isolate_core_snapshot_instructions.bin, so I am not sure why this should be logged as an ERROR here, it seems just confusing to see an error being logged here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, noted this in the PR description. What I'm trying to figure out is whether there are situations where we use the isolate snapshot instructions or not in this codepath. Could I just remove the code or should it fail silently?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, noted this in the PR description. What I'm trying to figure out is whether there are situations where we use the isolate snapshot instructions or not in this codepath. Could I just remove the code or should it fail silently?

You would use it only in snapshot kind core-jit is used and since that is something we don't want to use I presume this code can be removed.

Copy link
Contributor Author

@akbiggs akbiggs Jan 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. Removed arguments that reference the instructions snapshot and logic that loads them for core snapshots. I tested with a JIT build and it seems to work, but please let me know if I went overboard with deleting things here, I'm not very familiar with the GN rules we're using here.

@akbiggs akbiggs marked this pull request as ready for review January 10, 2022 22:44
@flutter-dashboard
Copy link

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact Hixie on the #hackers channel in Chat.

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

@akbiggs akbiggs added the waiting for tree to go green This PR is approved and tested, but waiting for the tree to be green to land. label Jan 13, 2022
@akbiggs akbiggs merged commit a193f08 into flutter:main Jan 13, 2022
@akbiggs akbiggs deleted the core-snapshots branch January 13, 2022 19:05
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 13, 2022
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 13, 2022
JsouLiang pushed a commit to JsouLiang/engine that referenced this pull request Jan 14, 2022
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 14, 2022
iskakaushik added a commit to iskakaushik/flutter that referenced this pull request Jan 15, 2022
flutter/engine@fab1982...83d99a5

2022-01-14 skia-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from 35I2K_Bou... to V541xkYVr... (flutter/engine#30879)
2022-01-14 skia-flutter-autoroll@skia.org Roll Dart SDK from dcab0d0b2f6c to d0d4dbfc6e69 (1 revision) (flutter/engine#30878)
2022-01-14 skia-flutter-autoroll@skia.org Roll Skia from 1f0e64acd621 to f260a297c68d (1 revision) (flutter/engine#30877)
2022-01-14 638538+chaselatta@users.noreply.github.com [fuchsia] stamp package with target api level (flutter/engine#30857)
2022-01-14 skia-flutter-autoroll@skia.org Roll Skia from dd9e165ef7d0 to 1f0e64acd621 (1 revision) (flutter/engine#30876)
2022-01-14 skia-flutter-autoroll@skia.org Roll Fuchsia Mac SDK from BQ2l2096A... to bGW3xlB1D... (flutter/engine#30875)
2022-01-14 skia-flutter-autoroll@skia.org Roll Skia from 7aec4b164e79 to dd9e165ef7d0 (1 revision) (flutter/engine#30874)
2022-01-14 skia-flutter-autoroll@skia.org Roll Dart SDK from 68ccd13498be to dcab0d0b2f6c (1 revision) (flutter/engine#30872)
2022-01-14 skia-flutter-autoroll@skia.org Roll Dart SDK from aa6fbac07951 to 68ccd13498be (1 revision) (flutter/engine#30870)
2022-01-14 skia-flutter-autoroll@skia.org Roll Skia from 76e62d32d979 to 7aec4b164e79 (1 revision) (flutter/engine#30869)
2022-01-14 skia-flutter-autoroll@skia.org Roll Skia from a6f2ebf30fea to 76e62d32d979 (1 revision) (flutter/engine#30868)
2022-01-14 skia-flutter-autoroll@skia.org Roll Dart SDK from ba044d5e9c03 to aa6fbac07951 (1 revision) (flutter/engine#30867)
2022-01-14 skia-flutter-autoroll@skia.org Roll Skia from 7c80b2f08ead to a6f2ebf30fea (1 revision) (flutter/engine#30863)
2022-01-14 dkwingsmt@users.noreply.github.com [Windows, Keyboard] Lift key event redispatching to KeyboardManagerWin32 (flutter/engine#30702)
2022-01-14 jason-simmons@users.noreply.github.com Ensure that PlatformViewIOS does not call into Shell semantics APIs during destruction (flutter/engine#30835)
2022-01-14 skia-flutter-autoroll@skia.org Roll Skia from 119fb6bb2568 to 7c80b2f08ead (1 revision) (flutter/engine#30862)
2022-01-14 skia-flutter-autoroll@skia.org Roll Dart SDK from b36d861d5487 to ba044d5e9c03 (1 revision) (flutter/engine#30861)
2022-01-14 skia-flutter-autoroll@skia.org Roll Skia from 62b32180c192 to 119fb6bb2568 (1 revision) (flutter/engine#30860)
2022-01-14 skia-flutter-autoroll@skia.org Roll Fuchsia Mac SDK from Uvw9UoGSm... to BQ2l2096A... (flutter/engine#30859)
2022-01-13 gw280@google.com Move SoftwareCanvasProvider into its own source file (flutter/engine#30856)
2022-01-13 skia-flutter-autoroll@skia.org Roll Skia from c505bdca9d60 to 62b32180c192 (1 revision) (flutter/engine#30855)
2022-01-13 gw280@google.com Create a DisplayList benchmarks dylib on iOS (flutter/engine#30833)
2022-01-13 gw280@google.com Don't retain the MTLTexture or MTLDevice in TestMetalContext (flutter/engine#30832)
2022-01-13 skia-flutter-autoroll@skia.org Roll Skia from 455e580b9c78 to c505bdca9d60 (1 revision) (flutter/engine#30852)
2022-01-13 74682667+chandarrengoog@users.noreply.github.com Roll buildroot to 7effd69. (flutter/engine#30851)
2022-01-13 scheglov@google.com Remove unused field initializing formal parameters. (flutter/engine#30822)
2022-01-13 skia-flutter-autoroll@skia.org Roll Dart SDK from f1c98a571d1a to b36d861d5487 (1 revision) (flutter/engine#30850)
2022-01-13 skia-flutter-autoroll@skia.org Roll Skia from 759bc62a06d2 to 455e580b9c78 (2 revisions) (flutter/engine#30849)
2022-01-13 43054281+camsim99@users.noreply.github.com Remove usages of deprecated setSystemUiVisibility() (flutter/engine#29493)
2022-01-13 skia-flutter-autoroll@skia.org Roll Skia from b21c4af0f670 to 759bc62a06d2 (3 revisions) (flutter/engine#30848)
2022-01-13 akbiggs@users.noreply.github.com [fuchsia] Switch from core-jit to core snapshots. (flutter/engine#30744)

Also rolling transitive DEPS:
fuchsia/sdk/core/linux-amd64 from 35I2K_BouXUN to V541xkYVrdUC
fuchsia/sdk/core/mac-amd64 from Uvw9UoGSmIjy to bGW3xlB1DoAm
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 18, 2022
gaaclarke pushed a commit to flutter/flutter that referenced this pull request Jan 18, 2022
* a193f08 [fuchsia] Switch from core-jit to core snapshots. (flutter/engine#30744)

* 7e50462 Roll Skia from b21c4af0f670 to 759bc62a06d2 (3 revisions) (flutter/engine#30848)

* 8db5038 Remove usages of deprecated setSystemUiVisibility() (flutter/engine#29493)

* c05d0df Roll Skia from 759bc62a06d2 to 455e580b9c78 (2 revisions) (flutter/engine#30849)

* 1fab2fb Roll Dart SDK from f1c98a571d1a to b36d861d5487 (1 revision) (flutter/engine#30850)

* f9385e7 Remove unused field initializing formal parameters. (flutter/engine#30822)

* b6e5d99 Roll buildroot to 7effd69. (flutter/engine#30851)

* 742eaf8 Roll Skia from 455e580b9c78 to c505bdca9d60 (1 revision) (flutter/engine#30852)

* d0f2beb Don't retain the MTLTexture or MTLDevice in TestMetalContext (flutter/engine#30832)

* f121c1f Create a DisplayList benchmarks dylib on iOS (flutter/engine#30833)

* 4499797 Roll Skia from c505bdca9d60 to 62b32180c192 (1 revision) (flutter/engine#30855)

* fcf7458 Move SoftwareCanvasProvider into its own source file (flutter/engine#30856)

* 794a833 Roll Fuchsia Mac SDK from Uvw9UoGSm... to BQ2l2096A... (flutter/engine#30859)

* 4b32e1c Roll Skia from 62b32180c192 to 119fb6bb2568 (1 revision) (flutter/engine#30860)

* facfa74 Roll Dart SDK from b36d861d5487 to ba044d5e9c03 (1 revision) (flutter/engine#30861)

* f6613c9 Roll Skia from 119fb6bb2568 to 7c80b2f08ead (1 revision) (flutter/engine#30862)

* fb3ee7f Ensure that PlatformViewIOS does not call into Shell semantics APIs during destruction (flutter/engine#30835)

* 073e6c5 [Windows, Keyboard] Lift key event redispatching to KeyboardManagerWin32 (flutter/engine#30702)

* 88e67a2 Roll Skia from 7c80b2f08ead to a6f2ebf30fea (1 revision) (flutter/engine#30863)

* 1f4e7fa Roll Dart SDK from ba044d5e9c03 to aa6fbac07951 (1 revision) (flutter/engine#30867)

* 3fbd427 Roll Skia from a6f2ebf30fea to 76e62d32d979 (1 revision) (flutter/engine#30868)

* b6db081 Roll Skia from 76e62d32d979 to 7aec4b164e79 (1 revision) (flutter/engine#30869)

* b92fd27 Roll Dart SDK from aa6fbac07951 to 68ccd13498be (1 revision) (flutter/engine#30870)

* 8961366 Roll Dart SDK from 68ccd13498be to dcab0d0b2f6c (1 revision) (flutter/engine#30872)

* 18ea2ce Roll Skia from 7aec4b164e79 to dd9e165ef7d0 (1 revision) (flutter/engine#30874)

* 9d660d9 Roll Fuchsia Mac SDK from BQ2l2096A... to bGW3xlB1D... (flutter/engine#30875)

* ad68b1b Roll Skia from dd9e165ef7d0 to 1f0e64acd621 (1 revision) (flutter/engine#30876)

* b61a6f5 [fuchsia] stamp package with target api level (flutter/engine#30857)

* 5787489 Roll Skia from 1f0e64acd621 to f260a297c68d (1 revision) (flutter/engine#30877)

* 87ba2d8 Roll Dart SDK from dcab0d0b2f6c to d0d4dbfc6e69 (1 revision) (flutter/engine#30878)

* 83d99a5 Roll Fuchsia Linux SDK from 35I2K_Bou... to V541xkYVr... (flutter/engine#30879)

* 50adf4c Revert "Remove usages of deprecated setSystemUiVisibility()" (flutter/engine#30880)
arbreng added a commit to arbreng/flutter_engine that referenced this pull request Jan 25, 2022
arbreng added a commit that referenced this pull request Jan 25, 2022
itsjustkevin added a commit that referenced this pull request Jan 28, 2022
* Revert "Support opacity layers for platform-views using hybrid-composition" (#31002)

* Revert "Support opacity layers for platform-views using hybrid-composition (#30264)"

This reverts commit 730b469.

* Empty

* Revert "[fuchsia] Switch from core-jit to core snapshots. (#30744)" (#31065)

This reverts commit a193f08.

Co-authored-by: Zachary Anderson <zanderso@users.noreply.github.com>
Co-authored-by: David Worsham <dworsham@google.com>
renyou pushed a commit that referenced this pull request Jan 28, 2022
* Revert "Support opacity layers for platform-views using hybrid-composition" (#31002)

* Revert "Support opacity layers for platform-views using hybrid-composition (#30264)"

This reverts commit 730b469.

* Empty

* Revert "[fuchsia] Switch from core-jit to core snapshots. (#30744)" (#31065)

This reverts commit a193f08.

Co-authored-by: Zachary Anderson <zanderso@users.noreply.github.com>
Co-authored-by: David Worsham <dworsham@google.com>
clocksmith pushed a commit to clocksmith/flutter that referenced this pull request Mar 8, 2022
* a193f08 [fuchsia] Switch from core-jit to core snapshots. (flutter/engine#30744)

* 7e50462 Roll Skia from b21c4af0f670 to 759bc62a06d2 (3 revisions) (flutter/engine#30848)

* 8db5038 Remove usages of deprecated setSystemUiVisibility() (flutter/engine#29493)

* c05d0df Roll Skia from 759bc62a06d2 to 455e580b9c78 (2 revisions) (flutter/engine#30849)

* 1fab2fb Roll Dart SDK from f1c98a571d1a to b36d861d5487 (1 revision) (flutter/engine#30850)

* f9385e7 Remove unused field initializing formal parameters. (flutter/engine#30822)

* b6e5d99 Roll buildroot to 7effd69. (flutter/engine#30851)

* 742eaf8 Roll Skia from 455e580b9c78 to c505bdca9d60 (1 revision) (flutter/engine#30852)

* d0f2beb Don't retain the MTLTexture or MTLDevice in TestMetalContext (flutter/engine#30832)

* f121c1f Create a DisplayList benchmarks dylib on iOS (flutter/engine#30833)

* 4499797 Roll Skia from c505bdca9d60 to 62b32180c192 (1 revision) (flutter/engine#30855)

* fcf7458 Move SoftwareCanvasProvider into its own source file (flutter/engine#30856)

* 794a833 Roll Fuchsia Mac SDK from Uvw9UoGSm... to BQ2l2096A... (flutter/engine#30859)

* 4b32e1c Roll Skia from 62b32180c192 to 119fb6bb2568 (1 revision) (flutter/engine#30860)

* facfa74 Roll Dart SDK from b36d861d5487 to ba044d5e9c03 (1 revision) (flutter/engine#30861)

* f6613c9 Roll Skia from 119fb6bb2568 to 7c80b2f08ead (1 revision) (flutter/engine#30862)

* fb3ee7f Ensure that PlatformViewIOS does not call into Shell semantics APIs during destruction (flutter/engine#30835)

* 073e6c5 [Windows, Keyboard] Lift key event redispatching to KeyboardManagerWin32 (flutter/engine#30702)

* 88e67a2 Roll Skia from 7c80b2f08ead to a6f2ebf30fea (1 revision) (flutter/engine#30863)

* 1f4e7fa Roll Dart SDK from ba044d5e9c03 to aa6fbac07951 (1 revision) (flutter/engine#30867)

* 3fbd427 Roll Skia from a6f2ebf30fea to 76e62d32d979 (1 revision) (flutter/engine#30868)

* b6db081 Roll Skia from 76e62d32d979 to 7aec4b164e79 (1 revision) (flutter/engine#30869)

* b92fd27 Roll Dart SDK from aa6fbac07951 to 68ccd13498be (1 revision) (flutter/engine#30870)

* 8961366 Roll Dart SDK from 68ccd13498be to dcab0d0b2f6c (1 revision) (flutter/engine#30872)

* 18ea2ce Roll Skia from 7aec4b164e79 to dd9e165ef7d0 (1 revision) (flutter/engine#30874)

* 9d660d9 Roll Fuchsia Mac SDK from BQ2l2096A... to bGW3xlB1D... (flutter/engine#30875)

* ad68b1b Roll Skia from dd9e165ef7d0 to 1f0e64acd621 (1 revision) (flutter/engine#30876)

* b61a6f5 [fuchsia] stamp package with target api level (flutter/engine#30857)

* 5787489 Roll Skia from 1f0e64acd621 to f260a297c68d (1 revision) (flutter/engine#30877)

* 87ba2d8 Roll Dart SDK from dcab0d0b2f6c to d0d4dbfc6e69 (1 revision) (flutter/engine#30878)

* 83d99a5 Roll Fuchsia Linux SDK from 35I2K_Bou... to V541xkYVr... (flutter/engine#30879)

* 50adf4c Revert "Remove usages of deprecated setSystemUiVisibility()" (flutter/engine#30880)
cligh pushed a commit that referenced this pull request Jan 16, 2024
Before starting an isolate, `dart[_test]_component_controller` detects
sound null safety status for all given kernels and fails if they aren't
the same, and uses the result to set `null_safety` in isolate flags.

Also switch to `core` snapshots from `core-jit` snapshots, based on
#30744, as it looks like
`core-jit` snapshots are not null safety agnostic.

See b/315776399


## 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] and the [C++,
Objective-C, Java style guides].
- [X] I listed at least one issue that this PR fixes in the description
above.
- [X] I added new tests to check the change I am making or feature I am
adding, or the PR is [test-exempt]. See [testing the engine] for
instructions on writing and running engine tests.
- [X] I updated/added relevant documentation (doc comments with `///`).
- [x] I signed the [CLA].
- [X] All existing and new tests are passing.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
needs tests platform-fuchsia waiting for tree to go green This PR is approved and tested, but waiting for the tree to be green to land.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants