Skip to content

[Cmake] hook up SWIFT_STDLIB_TRACING arg #77785

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 3 commits into from
Dec 10, 2024

Conversation

justice-adams-apple
Copy link
Contributor

Add option for SwiftCore_ENABLE_STDLIB_TRACING

@justice-adams-apple
Copy link
Contributor Author

@swift-ci please smoke test

@@ -115,6 +115,8 @@ add_compile_definitions(
$<$<BOOL:${SwiftCore_ENABLE_UNICODE_DATA}>:-DSWIFT_STDLIB_ENABLE_UNICODE_DATA> # Stubs
$<$<BOOL:${SwiftCore_ENABLE_ENVIRONMENT}>:-DSWIFT_STDLIB_HAS_ENVIRON> # Concurrency, runtime, shims, platform overlay
$<$<BOOL:${SwiftCore_ENABLE_BACKDEPLOYMENT_SUPPORT}>:-DSWIFT_STDLIB_SUPPORT_BACK_DEPLOYMENT> # Concurrency, Compatibility override, magic symbols
$<$<BOOL:${SwiftCore_ENABLE_STDLIB_TRACING}>:-DSWIFT_STDLIB_TRACING>
$<$<BOOL:${SwiftCore_ENABLE_STDLIB_TRACING}>:-DSWIFT_STDLIB_CONCURRENCY_TRACING>
Copy link
Member

Choose a reason for hiding this comment

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

This is really getting crazy. Any plans on splitting this up @etcwilde @justice-adams-apple?

Copy link
Member

Choose a reason for hiding this comment

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

If it only affects the individual libraries, they should probably be attached to that specific library.
I don't mind as a quick fix, but in that case, can we include a comment specifying which libraries it is affecting?
Thanks.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@etcwilde moved the compile definitions into the runtime cmake target

@justice-adams-apple justice-adams-apple force-pushed the jadams/hook-up-tracing-flags branch from f164842 to e0a4282 Compare December 4, 2024 21:31
@justice-adams-apple
Copy link
Contributor Author

@swift-ci please smoke test

$<$<BOOL:${SwiftCore_BACKTRACER_PATH}>:-DSWIFT_RUNTIME_FIXED_BACKTRACER_PATH="${SwiftCore_BACKTRACER_PATH}">)
$<$<BOOL:${SwiftCore_BACKTRACER_PATH}>:-DSWIFT_RUNTIME_FIXED_BACKTRACER_PATH="${SwiftCore_BACKTRACER_PATH}">
$<$<BOOL:${SwiftCore_ENABLE_STDLIB_TRACING}>:-DSWIFT_STDLIB_TRACING>
$<$<BOOL:${SwiftCore_ENABLE_STDLIB_TRACING}>:-DSWIFT_STDLIB_CONCURRENCY_TRACING>)
Copy link
Member

Choose a reason for hiding this comment

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

Does SWIFT_STDLIB_CONCURRENCY_TRACING have an impact on the runtime objects? I don't see it referenced in these sources.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think you're right, I think it got in here since I wanted to use a single CMAKE switch (SwiftCore_ENABLE_STDLIB_TRACING), I'll remove it

@justice-adams-apple
Copy link
Contributor Author

@swift-ci please smoke test

1 similar comment
@justice-adams-apple
Copy link
Contributor Author

@swift-ci please smoke test

@justice-adams-apple
Copy link
Contributor Author

@swift-ci please smoke test

@justice-adams-apple justice-adams-apple merged commit c6556d8 into main Dec 10, 2024
3 checks passed
@justice-adams-apple justice-adams-apple deleted the jadams/hook-up-tracing-flags branch December 10, 2024 22:42
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