Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use llvm version of libcxxabi instead of patched mirror #36634

Merged
merged 3 commits into from
Oct 6, 2022

Conversation

jmagman
Copy link
Member

@jmagman jmagman commented Oct 6, 2022

Bitcode has been removed from the engine flutter/flutter#107884

Revert #35873. Instead of using mirror at https://flutter.googlesource.com/third_party/libcxxabi/ with patch https://flutter.googlesource.com/third_party/libcxxabi/+/483f071ff4780a8884f32d97d2d262fbe9f1ae18, use llvm libcxxabi version.

See flutter/flutter#110140 for more details.

Once this merges https://flutter.googlesource.com/third_party/libcxxabi/ can probably be deleted. keep the fork around so older commits can be built.

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 Hixie said 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.

@jmagman jmagman self-assigned this Oct 6, 2022
@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 (don't just cc him here, he won't see it! He's on Discord!).

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.

@@ -127,7 +127,7 @@ deps = {
Var('llvm_git') + '/llvm-project/libcxx' + '@' + '44079a4cc04cdeffb9cfe8067bfb3c276fb2bab0',

'src/third_party/libcxxabi':
Var('flutter_git') + '/third_party/libcxxabi' + '@' + '483f071ff4780a8884f32d97d2d262fbe9f1ae18',
Var('llvm_git') + '/llvm-project/libcxxabi' + '@' + '2ce528fb5e0f92e57c97ec3ff53b75359d33af12',
Copy link
Contributor

Choose a reason for hiding this comment

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

how does this work? it's not in the allowed_hosts list.

Copy link
Member Author

Choose a reason for hiding this comment

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

Hm, good question. llvm_git was introduced in #34720

@godofredoc any idea why this works when llvm.googlesource.com isn't in allowed_hosts?

engine/DEPS

Line 18 in 1eeb38c

'llvm_git': 'https://llvm.googlesource.com',

engine/DEPS

Lines 103 to 109 in 1eeb38c

allowed_hosts = [
'chromium.googlesource.com',
'flutter.googlesource.com',
'fuchsia.googlesource.com',
'github.com',
'skia.googlesource.com',
]

I believe this logic is in https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/refs/heads/main/gclient.py#931

Copy link
Member Author

Choose a reason for hiding this comment

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

It looks like this is only validated during gclient verify, and it seems we aren't running that in CI. The infra team has been informed about this and I filed flutter/flutter#113052.

In the meantime this PR is no worse than what's already on master since libcxx is also using llvm_git, so I don't think we should block this PR on fixing that.

engine/DEPS

Lines 126 to 127 in 966f249

'src/third_party/libcxx':
Var('llvm_git') + '/llvm-project/libcxx' + '@' + '44079a4cc04cdeffb9cfe8067bfb3c276fb2bab0',

@Hixie
Copy link
Contributor

Hixie commented Oct 6, 2022

test-exempt: rolling dependencies

@chinmaygarde
Copy link
Member

Once this merges https://flutter.googlesource.com/third_party/libcxxabi/ can probably be deleted.

Please don't delete it as it makes building older commits impossible. Perhaps just a commit removing all files and placing a tombstone would be fine.

@jmagman
Copy link
Member Author

jmagman commented Oct 6, 2022

Please don't delete it as it makes building older commits impossible.

Good point.

@jmagman jmagman added the autosubmit Merge PR when tree becomes green via auto submit App label Oct 6, 2022
@auto-submit auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Oct 6, 2022
@auto-submit
Copy link
Contributor

auto-submit bot commented Oct 6, 2022

auto label is removed for flutter/engine, pr: 36634, due to - The status or check suite Linux License has failed. Please fix the issues identified (or deflake) before re-applying this label.

@jmagman jmagman added the autosubmit Merge PR when tree becomes green via auto submit App label Oct 6, 2022
@auto-submit auto-submit bot merged commit e30b37a into flutter:main Oct 6, 2022
@jmagman jmagman deleted the llvm-libcxxabi branch October 6, 2022 23:35
@jmagman
Copy link
Member Author

jmagman commented Oct 6, 2022

cc @jason-simmons

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
autosubmit Merge PR when tree becomes green via auto submit App needs tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants