Skip to content

Prefer the pthread types from CDispatch #3107

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

Merged
merged 1 commit into from
Nov 9, 2021

Conversation

xymus
Copy link
Contributor

@xymus xymus commented Nov 4, 2021

The types pthread_mutex_t and pthread_cond_t were defined via both SwiftGlibc and CDistpatch but a clang fix should merge these decls and consider CDispatch as the true origin.

Let's first see if we still need the explicit reference to Glibc when referring to those types.

rdar://84677782

The types `pthread_mutex_t` and `pthread_cond_t` were defined via both
`SwiftGlibc` and `CDistpatch` but a clang fix should merge these decls
and consider `CDispatch` as the true origin.

rdar://84677782
@xymus
Copy link
Contributor Author

xymus commented Nov 4, 2021

@swift-ci Please test

@xymus
Copy link
Contributor Author

xymus commented Nov 5, 2021

@swift-ci Please test Linux

@xymus
Copy link
Contributor Author

xymus commented Nov 5, 2021

@MaxDesiatov Do you remember why you added these lines? I'm wondering if you may have run into the same duplicated definition issue we're trying to fix in clang with swiftlang/llvm-project#3497.

@MaxDesiatov
Copy link
Contributor

It could be, but these lines no longer have any effect when building for WASI. libc module on that platform is no longer called Glibc, it's WASILibc, so this merging shouldn't have any effect for WASI.

@xymus
Copy link
Contributor Author

xymus commented Nov 5, 2021

Sounds good then, thank you for the information Max!

The Linux tests are failing in SwiftDocCTests, it looks unrelated.

@xymus
Copy link
Contributor Author

xymus commented Nov 5, 2021

@swift-ci Please test Linux

1 similar comment
@xymus
Copy link
Contributor Author

xymus commented Nov 8, 2021

@swift-ci Please test Linux

@xymus
Copy link
Contributor Author

xymus commented Nov 8, 2021

The Linux tests are broken by the DocC tests that rely in networking and unusual temporary directory. (rdar://85055022)

@xymus
Copy link
Contributor Author

xymus commented Nov 9, 2021

@swift-ci Please test Linux

@xymus
Copy link
Contributor Author

xymus commented Nov 9, 2021

One more tweak will be needed but this one should be safe by itself.

@millenomi millenomi merged commit f43d45d into swiftlang:main Nov 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants