Rename CpuArch.x86_64 to CpuArch.x64#189478
Merged
Merged
Conversation
We used x86_64 to be consistent with AndroidArch.x86_64 and DarwinArch.x86_64. But after working on this further, we realized that we almost always use x64 for all other purposes in flutter_tools. Renaming this to CpuArch.x64 to make future work easier.
github-actions
Bot
added
platform-ios
chingjun
marked this pull request as ready for review
July 15, 2026 22:00
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request renames the CpuArch.x86_64 enum value to CpuArch.x64 across flutter_tools and updates its usages in device configurations and tests. The review feedback recommends preserving backward compatibility in CpuArch.fromName by mapping both 'x64' and 'x86_64' to CpuArch.x64, and adding a test case to verify this mapping.
| 'arm64' => CpuArch.arm64, | ||
| 'x86' => CpuArch.x86, | ||
| 'x86_64' => CpuArch.x86_64, | ||
| 'x64' => CpuArch.x64, |
Contributor
There was a problem hiding this comment.
Supporting both 'x64' and 'x86_64' in CpuArch.fromName maintains backward compatibility and prevents potential runtime exceptions when parsing older configurations, command-line arguments, or external inputs that still use 'x86_64'.
'x64' || 'x86_64' => CpuArch.x64,
Contributor
Author
There was a problem hiding this comment.
Turns out we actually need this. Thanks Gemini!
bkonyi
previously approved these changes
Jul 16, 2026
The gemini bot's suggestion to test for x86_64 seems like a good idea to me given the change it suggested to the code as well. Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
cbracken
approved these changes
Jul 21, 2026
cbracken
left a comment
cbracken
left a comment
Member
There was a problem hiding this comment.
lgtm for ios-reviewers modulo the suggestion from the bot.
chingjun
added
the
autosubmit
auto-submit
Bot
removed
the
autosubmit
Contributor
|
auto label is removed for flutter/flutter/189478, Failed to enqueue flutter/flutter/189478 with HTTP 400: Pull request New changes require approval from someone other than cbracken because they were the last pusher.. |
bkonyi
approved these changes
Jul 21, 2026
chingjun
added
the
autosubmit
flutter-dashboard
Bot
removed
the
autosubmit
This was referenced Jul 22, 2026
auto-submit Bot
pushed a commit
to flutter/packages
that referenced
this pull request
Jul 22, 2026
flutter/flutter@1ac2e82...2a2a79d 2026-07-22 [email protected] Clear cached directional focus history on a non-directional focus request (flutter/flutter#187957) 2026-07-22 [email protected] ci: Include root pubspec.yaml in pub cache key (flutter/flutter#189826) 2026-07-22 [email protected] Remove codecov badge from README (flutter/flutter#189728) 2026-07-22 [email protected] Clean android engine/embedding tests (flutter/flutter#189276) 2026-07-22 [email protected] Add barrierBuilder support to showDialog and showGeneralDialog (flutter/flutter#187992) 2026-07-22 [email protected] Fix Mockito dynamic agent loading warnings in Robolectric tests (flutter/flutter#189804) 2026-07-22 [email protected] [iOS] Remove dead RasterThreadMerger plumbing from platform views (flutter/flutter#189753) 2026-07-22 [email protected] Add OverlayPortal.overlayChildLayoutBuilder sample (flutter/flutter#188930) 2026-07-22 [email protected] Automate recurring tasks via workflows - localizations (flutter/flutter#189750) 2026-07-21 [email protected] [iOS] Remove dead parameters and no-op overrides (flutter/flutter#189754) 2026-07-21 [email protected] [iOS] Inject DisplayLinkManager into FlutterViewController (flutter/flutter#189764) 2026-07-21 [email protected] Support custom BoxBorder animation in BoxDecoration (flutter/flutter#186348) 2026-07-21 [email protected] Rename CpuArch.x86_64 to CpuArch.x64 (flutter/flutter#189478) 2026-07-21 [email protected] Roll Skia from 569534e9fa59 to 5e183e5aeac5 (3 revisions) (flutter/flutter#189795) 2026-07-21 [email protected] Roll Dart SDK from 3b2f5ad7718d to 1e65011ee004 (4 revisions) (flutter/flutter#189791) 2026-07-21 [email protected] Run delete-bot-branches.yaml on `pull_request_target` instead of `pull_request` so that we can access secrets. (flutter/flutter#189793) 2026-07-21 [email protected] Batch release directory correction (flutter/flutter#189738) 2026-07-21 [email protected] [flutter_test][Test cross imports] Move TestWidgetsApp to flutter_test (flutter/flutter#189435) 2026-07-21 [email protected] Fix null-deref/double-dispose in StretchingOverscrollIndicator (#189589) (flutter/flutter#189667) 2026-07-21 [email protected] Roll Packages from 611899b to 8260a1e (10 revisions) (flutter/flutter#189782) 2026-07-21 [email protected] [iOS] Inject DisplayLinkManager into FlutterMetalLayer (flutter/flutter#189752) 2026-07-21 [email protected] Derive the SkImage size used by ImageEncodingImpeller::ConvertDlImageToSkImage from the size of the underlying texture, not the size of the DlImage (flutter/flutter#189739) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
We used x86_64 to be consistent with AndroidArch.x86_64 and DarwinArch.x86_64. But after working on this further, we realized that we almost always use x64 for all other purposes in flutter_tools.
Renaming this to CpuArch.x64 to make future work easier.