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

Use llvm version of libcxxabi instead of patched mirror #36634

Merged
merged 3 commits into from
Oct 6, 2022
Merged

Use llvm version of libcxxabi instead of patched mirror #36634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3db3281
Use llvm version of libcxxabi instead of patched
jmagman Oct 6, 2022
2a15964
Signature
jmagman Oct 6, 2022
413cf68
Signature again
jmagman Oct 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',


'src/third_party/glfw':
Var('fuchsia_git') + '/third_party/glfw' + '@' + '78e6a0063d27ed44c2c4805606309744f6fb29fc',
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/licenses_third_party
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 29d99debc367a46b6ffa9ea6be3d02d1
Signature: 109519ff070c27e9ae694be51b410bff

UNUSED LICENSES:

Expand Down
4 changes: 1 addition & 3 deletions testing/symbols/verify_exported.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,7 @@ int _checkIos(String outPath, String nmPath, Iterable<String> builds) {
final Iterable<NmEntry> unexpectedEntries = NmEntry.parse(nmResult.stdout as String).where((NmEntry entry) {
return !(((entry.type == '(__DATA,__common)' || entry.type == '(__DATA,__const)') && entry.name.startsWith('_Flutter'))
|| (entry.type == '(__DATA,__objc_data)'
&& (entry.name.startsWith(r'_OBJC_METACLASS_$_Flutter') || entry.name.startsWith(r'_OBJC_CLASS_$_Flutter')))
// TODO(107887): This should not be neccesary after bitcode support is removed from the engine.
|| (entry.type == '(__TEXT,__text)' && entry.name == '___gxx_personality_v0'));
&& (entry.name.startsWith(r'_OBJC_METACLASS_$_Flutter') || entry.name.startsWith(r'_OBJC_CLASS_$_Flutter'))));
});
if (unexpectedEntries.isNotEmpty) {
print('ERROR: $libFlutter exports unexpected symbols:');
Expand Down