Skip to content

Revert "[BoundsSafety] Do not merge param/return types if there is no… #10975

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 11, 2025

Conversation

patrykstefanski
Copy link

… need to (#10934)"

This reverts commit 8835b75.

@patrykstefanski patrykstefanski requested a review from a team as a code owner July 9, 2025 23:34
@patrykstefanski patrykstefanski added the clang:bounds-safety Issue relating to the experimental -fbounds-safety feature in Clang label Jul 9, 2025
@patrykstefanski
Copy link
Author

@swift-ci test

@patrykstefanski
Copy link
Author

@swift-ci test llvm

@@ -3707,6 +3707,21 @@ QualType ASTContext::mergeBoundsSafetyPointerTypes(
if (OrigDstTy.isNull())
OrigDstTy = DstTy;

// An ugly way to keep va_list typedef in DstTy if the merge type doesn't

Choose a reason for hiding this comment

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

@patrykstefanski we don't have to revert this workaround? I guess it's been sticking around for a while?

@patrykstefanski
Copy link
Author

@swift-ci test

@rapidsna rapidsna merged commit 8a1d862 into swift/release/6.2 Jul 11, 2025
5 checks passed
@rapidsna rapidsna deleted the eng/pstefanski/PR-153579566-6.2-revert branch July 11, 2025 16:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
clang:bounds-safety Issue relating to the experimental -fbounds-safety feature in Clang
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants