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.

Sign up for GitHub

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

Jump to bottom

Reapply "Task names" (#79562) #79600

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Reapply "Task names" (#79562) #79600

wants to merge 2 commits into from
+1,184 −1,068

Conversation

ktoso
Copy link
Contributor

@ktoso ktoso commented Feb 25, 2025 •
edited
Loading

This reverts the revert #79562 and brings back #77609 with the task names APIs.

The reason for the revert was source compatibility was slightly off during the move to gyb

rdar://88918762

@ktoso
Copy link
Contributor Author

ktoso commented Feb 25, 2025

@swift-ci please test source compatibility

@ktoso ktoso force-pushed the wip-task-names-compat branch from 3dfedf6 to 8315565 Compare February 25, 2025 02:58
@ktoso
Copy link
Contributor Author

ktoso commented Feb 25, 2025

@swift-ci please test source compatibility

@ktoso
Copy link
Contributor Author

ktoso commented Feb 25, 2025

@swift-ci please smoke test

@ktoso
Copy link
Contributor Author

ktoso commented Feb 25, 2025

@swift-ci please test source compatibility

@ktoso
Copy link
Contributor Author

ktoso commented Feb 25, 2025

@swift-ci please build toolchain

@ktoso ktoso changed the title Reapply "Merge pull request #77609 from ktoso/wip-task-names" (#79562) Reapply "Task names" (#79562) Feb 25, 2025
@ktoso
Copy link
Contributor Author

ktoso commented Feb 25, 2025 •
edited
Loading

Ongoing source compat infra issues:


warning: 'swift-log': skipping cache due to an error: Couldn’t fetch updates from remote repositories:
    Auto configuration failed
    140704406080320:error:02FFF001:system library:func(4095):Operation not permitted:/AppleInternal/Library/BuildRoots/4b66fb3c-7dd0-11ef-b4fb-4a83e32a47e1/Library/Caches/com.apple.xbs/Sources/libressl/libressl-3.3/crypto/bio/bss_file.c:122:fopen('/private/etc/ssl/openssl.cnf', 'rb')
    140704406080320:error:20FFF002:BIO routines:CRYPTO_internal:system lib:/AppleInternal/Library/BuildRoots/4b66fb3c-7dd0-11ef-b4fb-4a83e32a47e1/Library/Caches/com.apple.xbs/Sources/libressl/libressl-3.3/crypto/bio/bss_file.c:127:
    140704406080320:error:0EFFF002:configuration file routines:CRYPTO_internal:system lib:/AppleInternal/Library/BuildRoots/4b66fb3c-7dd0-11ef-b4fb-4a83e32a47e1/Library/Caches/com.apple.xbs/Sources/libressl/libressl-3.3/crypto/conf/conf_def.c:202:
warning: 'swift-service-lifecycle': skipping cache due to an error: Couldn’t fetch updates from remote repositories:

@ktoso
Copy link
Contributor Author

ktoso commented Feb 25, 2025

@swift-ci please test source compatibility

@ktoso
Copy link
Contributor Author

ktoso commented Feb 25, 2025

@swift-ci please test

edymtt
edymtt approved these changes Feb 25, 2025
View reviewed changes
Copy link
Contributor

@edymtt edymtt left a comment

Choose a reason for hiding this comment

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

The build system changes look good to me.

etcwilde
etcwilde reviewed Feb 25, 2025
View reviewed changes
Copy link
Contributor

@etcwilde etcwilde left a comment

Choose a reason for hiding this comment

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

Build system changes look fine to me.
There are a few files where the ending newline was removed or just not inserted.

stdlib/public/Concurrency/SourceCompatibilityShims.swift
@@ -578,4 +578,4 @@ public typealias UnsafeThrowingContinuation<T> = UnsafeContinuation<T, Error>

@available(SwiftStdlib 5.1, *)
@available(*, deprecated, renamed: "UnownedJob")
public typealias PartialAsyncTask = UnownedJob
public typealias PartialAsyncTask = UnownedJob
Copy link
Contributor

Choose a reason for hiding this comment

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

missing newline

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok will follow up on it

test/abi/macOS/arm64/concurrency.swift
// task names
Added: _$sScTss5NeverORszABRs_rlE4nameSSSgvgZ
Added: _$sScTss5NeverORszABRs_rlE4nameSSSgvpZMV
Added: _swift_task_getCurrentTaskName
Copy link
Contributor

Choose a reason for hiding this comment

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

missing newline

test/abi/macOS/x86_64/concurrency.swift
// task names
Added: _$sScTss5NeverORszABRs_rlE4nameSSSgvgZ
Added: _$sScTss5NeverORszABRs_rlE4nameSSSgvpZMV
Added: _swift_task_getCurrentTaskName
Copy link
Contributor

Choose a reason for hiding this comment

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

missing newline

@ktoso
Copy link
Contributor Author

ktoso commented Feb 25, 2025

Thanks for checking! I still see issues with using the gyb generated funcs in the same module but we can revisit this at later point in time.

As soon as source compat suite works again I'll merge these

@ktoso
Copy link
Contributor Author

ktoso commented Feb 25, 2025

@swift-ci please test source compatibility

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@etcwilde etcwilde etcwilde left review comments

@edymtt edymtt edymtt approved these changes

@jckarter jckarter Awaiting requested review from jckarter jckarter is a code owner

@rjmccall rjmccall Awaiting requested review from rjmccall rjmccall is a code owner

@hborla hborla Awaiting requested review from hborla hborla is a code owner

@slavapestov slavapestov Awaiting requested review from slavapestov slavapestov is a code owner

@xedin xedin Awaiting requested review from xedin xedin is a code owner

@DougGregor DougGregor Awaiting requested review from DougGregor DougGregor is a code owner

@compnerd compnerd Awaiting requested review from compnerd compnerd is a code owner

@justice-adams-apple justice-adams-apple Awaiting requested review from justice-adams-apple justice-adams-apple is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ktoso @etcwilde @edymtt