Skip to content

[Concurrency] Remove libatomic dependency on Concurrency module on Linux #38551

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
Jul 22, 2021

Conversation

drexin
Copy link
Contributor

@drexin drexin commented Jul 22, 2021

No description provided.

@drexin
Copy link
Contributor Author

drexin commented Jul 22, 2021

@swift-ci test

@drexin
Copy link
Contributor Author

drexin commented Jul 22, 2021

@swift-ci Please test Ubuntu 20.04 platform

@drexin
Copy link
Contributor Author

drexin commented Jul 22, 2021

@swift-ci Please test Ubuntu 18.04 platform

@drexin
Copy link
Contributor Author

drexin commented Jul 22, 2021

@swift-ci Please test CentOS 7 platform

@drexin
Copy link
Contributor Author

drexin commented Jul 22, 2021

@swift-ci Please test CentOS 8 platform

@swift-ci
Copy link
Contributor

Build failed
Swift Test Ubuntu 20.04 Platform
Git Sha - 9fac208

@drexin
Copy link
Contributor Author

drexin commented Jul 22, 2021

@swift-ci Please test Ubuntu 20.04 platform

@drexin
Copy link
Contributor Author

drexin commented Jul 22, 2021

@swift-ci test Amazon Linux 2

@swift-ci
Copy link
Contributor

Build failed
Swift Test CentOS 8 Platform
Git Sha - 9fac208

@drexin
Copy link
Contributor Author

drexin commented Jul 22, 2021

@swift-ci test CentOS 8

@@ -159,7 +159,7 @@ class TaskFutureWaitAsyncContext : public AsyncContext {
} // end anonymous namespace

/// The current state of a task's status records.
class ActiveTaskStatus {
class alignas(sizeof(void*) * 2) ActiveTaskStatus {
Copy link
Contributor

Choose a reason for hiding this comment

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

Do you want to use sizeof(uintptr_t) to make the intent clearer?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We use void* in other places, so I wanted to keep it consistent.

@@ -33,8 +33,7 @@ endif()
# Frustratingly, in many cases this isn't necessary because the
# sequence is inlined, but we have some code that's just subtle
# enough to turn into runtime calls.
if(SWIFT_HOST_VARIANT STREQUAL "linux" OR
SWIFT_HOST_VARIANT STREQUAL "android")
if(SWIFT_HOST_VARIANT STREQUAL "android")
Copy link
Member

Choose a reason for hiding this comment

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

This has not been tried on Android, I simply asked that it be added in #38508 since usually it will be needed if it is on linux. If you don't need this on linux after your change, just revert that patch instead, ie remove it for Android too.

@finagolfin
Copy link
Member

Whoo, great to see more linux distros added to the CI.

@swift-ci
Copy link
Contributor

Build failed
Swift Test CentOS 8 Platform
Git Sha - 9fac208

@drexin
Copy link
Contributor Author

drexin commented Jul 22, 2021

@buttaface the distros have been there since we started supporting them, you just have to manually trigger the build, since it would be overkill to build all of them on every PR.

@drexin
Copy link
Contributor Author

drexin commented Jul 22, 2021

@swift-ci clean test CentOS 8

@drexin drexin merged commit 914928e into swiftlang:main Jul 22, 2021
@drexin drexin deleted the wip-concurrency-libatomic branch July 22, 2021 17:50
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.

5 participants