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

iOS/macOS: migrate darwin/common to ARC #56155

Merged
merged 2 commits into from
Oct 28, 2024
Merged

Conversation

cbracken
Copy link
Member

@cbracken cbracken commented Oct 27, 2024

Migrates //flutter/shell/platform/darwin/common` targets to ARC. Most of these were already ARC compatible.

This does add use of the FLUTTER_ASSERT_ARC define since that is defined in a public framework header, but this code has no dependency on the framework.

This removes flutter_cflags_objc and flutter_cflags_objcc compile configs from availability_version_check_unittests since that target is pure C++ and contains no Objective-C code.

No test changes since this there is no semantic change to the code.

Issue: flutter/flutter#137801

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the Flutter Style Guide and the C++, Objective-C, Java style guides.
  • I listed at least one issue that this PR fixes in the description above.
  • 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.
  • I updated/added relevant documentation (doc comments with ///).
  • I signed the CLA.
  • All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@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, contact "@test-exemption-reviewer" in the #hackers channel in Discord (don't just cc them here, they won't see it!).

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. The test exemption team is a small volunteer group, so all reviewers should feel empowered to ask for tests, without delegating that responsibility entirely to the test exemption group.

@@ -7,22 +7,22 @@
#include "flutter/fml/macros.h"
#include "flutter/fml/platform/darwin/scoped_nsobject.h"

static_assert(__has_feature(objc_arc), "ARC must be enabled.");
Copy link
Member Author

Choose a reason for hiding this comment

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

Since this isn't part of the framework and doesn't have dependencies on it, we do things manually.

@stuartmorgan-g
Copy link
Contributor

test-exempt: code refactor with no semantic change

Copy link
Contributor

@stuartmorgan-g stuartmorgan-g left a comment

Choose a reason for hiding this comment

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

LGTM; property syntax updates are of course optional.

Migrates //flutter/shell/platform/darwin/common` targets to ARC. Most of
these were already ARC compatible.

No test changes since this there is no semantic change to the code.

Issue: flutter/flutter#137801
@cbracken cbracken added the autosubmit Merge PR when tree becomes green via auto submit App label Oct 28, 2024
@cbracken cbracken merged commit 0b9f56b into flutter:main Oct 28, 2024
29 checks passed
@cbracken cbracken deleted the arc-common branch October 28, 2024 19:35
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Oct 28, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Oct 28, 2024
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Oct 28, 2024
…157751)

flutter/engine@70671ba...ed587dc

2024-10-28 skia-flutter-autoroll@skia.org Roll Dart SDK from 69b50768d733 to c9180e9de9e8 (1 revision) (flutter/engine#56180)
2024-10-28 jonahwilliams@google.com [Impeller] fix initial layout for loadOp load and incorrect usage of host visible textures. (flutter/engine#56148)
2024-10-28 skia-flutter-autoroll@skia.org Roll Skia from 21035cd95b68 to bdd225968dab (1 revision) (flutter/engine#56178)
2024-10-28 chris@bracken.jp iOS/macOS: migrate darwin/common to ARC (flutter/engine#56155)
2024-10-28 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Pin local_engine mac builds to arm64 (#56172)" (flutter/engine#56179)
2024-10-28 chris@bracken.jp Migrate PlatformViewIOS to ARC (flutter/engine#55672)
2024-10-28 skia-flutter-autoroll@skia.org Roll Skia from 35ad4e89212f to 21035cd95b68 (1 revision) (flutter/engine#56176)
2024-10-28 aam@google.com Roll buildroot to pick up revert of debugging gen_snapshot prints (flutter/engine#56175)
2024-10-28 zanderso@users.noreply.github.com Pin local_engine mac builds to arm64 (flutter/engine#56172)
2024-10-28 zanderso@users.noreply.github.com Switch some mac_unopt tests from intel to arm hosts (flutter/engine#55882)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC codefu@google.com,zra@google.com on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: 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
nick9822 pushed a commit to nick9822/flutter that referenced this pull request Dec 18, 2024
Migrates //flutter/shell/platform/darwin/common` targets to ARC. Most of
these were already ARC compatible.

This does add use of the `FLUTTER_ASSERT_ARC` define since that is
defined in a public framework header, but this code has no dependency on
the framework.

This removes `flutter_cflags_objc` and `flutter_cflags_objcc` compile
configs from `availability_version_check_unittests` since that target is
pure C++ and contains no Objective-C code.

No test changes since this there is no semantic change to the code.

Issue: flutter#137801
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
affects: desktop autosubmit Merge PR when tree becomes green via auto submit App platform-ios platform-macos
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants