[cxx-interop] Import nullability of templated function parameters correctly #82161
+71
−27
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
egorzhdan
requested review from
zoecarver,
Xazax-hun,
j-hui,
fahadnayyar,
susmonteiro,
hnrklssn,
beccadax and
ian-twilightcoder
as code owners
|
@swift-ci please smoke test |
j-hui
approved these changes
Jun 10, 2025
| @@ -2731,8 +2749,6 @@ ParameterList *ClangImporter::Implementation::importFunctionParameterList( | |||
| } | |||
|
|
|||
| bool knownNonNull = !nonNullArgs.empty() && nonNullArgs[index]; | |||
| // Specialized templates need to match the args/result exactly. | |||
| knownNonNull |= clangDecl->isFunctionTemplateSpecialization(); | |||
There was a problem hiding this comment.
With this removed, you might have fixed some of the crashes for the commented-out cases in template-instantiation-irgen.swift, e.g.,
swift/test/Interop/Cxx/templates/template-instantiation-irgen.swift
Lines 58 to 59 in e79760b
Could you see if those are fixed by your patch?
There was a problem hiding this comment.
Ah great point, thanks! Let me uncomment some of these.
egorzhdan
force-pushed
the
egorzhdan/template-param-nullability
branch
from
111a028 to
16b1d5b
Compare
|
@swift-ci please smoke test |
egorzhdan
force-pushed
the
egorzhdan/template-param-nullability
branch
3 times, most recently
from
0b7c2a9 to
74e0d79
Compare
egorzhdan
force-pushed
the
egorzhdan/template-param-nullability
branch
from
74e0d79 to
496571b
Compare
|
@swift-ci please smoke test |
…rectly This teaches ClangImporter to respect the `_Nonnull`/`_Nullable` arguments on templated function parameters. Previously Swift would only import a non-annotated function overload. Using an overload that has either `_Nonnull` or `_Nullable` would result in a compiler error. The non-annotated overload would get imported with incorrect nullability: Swift would always assume non-null pointers, which was inconsistent with non-templated function parameters, which are mapped to implicitly unwrapped optionals. With this change all three possible overloads are imported, and all of them get the correct nullability in Swift. rdar://151939344
egorzhdan
force-pushed
the
egorzhdan/template-param-nullability
branch
from
496571b to
607dd4a
Compare
|
@swift-ci please smoke test |
|
@swift-ci please smoke test macOS |
|
@swift-ci please smoke test Linux |
|
@swift-ci please smoke test |
1 similar comment
|
@swift-ci please smoke test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This teaches ClangImporter to respect the
_Nonnull/_Nullablearguments on templated function parameters.Previously Swift would only import a non-annotated function overload. Using an overload that has either
_Nonnullor_Nullablewould result in a compiler error. The non-annotated overload would get imported with incorrect nullability: Swift would always assume non-null pointers, which was inconsistent with non-templated function parameters, which are mapped to implicitly unwrapped optionals.With this change all three possible overloads are imported, and all of them get the correct nullability in Swift.
rdar://151939344