Skip to content

[ClangImporter][Swiftify] Add _SwiftifyImportProtocol for safe overloads for protocols #79510

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

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

[ClangImporter][Swiftify] Add _SwiftifyImportProtocol for safe overloads for protocols #79510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
74c7720
[Swiftify] Run swift-format (NFC)
hnrklssn Mar 31, 2025
7e13751
[Swiftify] Add _SwiftifyImportProtocol for safe overloads for protocols
hnrklssn Feb 14, 2025
83d4cc5
Move registerStdSpanTypeMapping to SwiftifyInfoPrinter (NFC)
hnrklssn Mar 31, 2025
e3009d5
[Swiftify] Make safe wrappers explicitly public
hnrklssn Feb 20, 2025
9e89957
[ClangImporter] Attach _SwiftifyImportProtocol to imported protocols
hnrklssn Feb 20, 2025
cfe7c0c
Rename .method parameter "name" to "signature"
hnrklssn Apr 24, 2025
bb55d6c
Update assert
hnrklssn Apr 24, 2025
1305b27
add _SwiftifyProtocolMethodInfo to abi tests
hnrklssn Apr 24, 2025
6a28b6a
Pass availability to _SwiftifyImport
hnrklssn Apr 24, 2025
93e659b
Don't depend on implicit lifetime of Escapable inout
hnrklssn Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions lib/AST/ConformanceLookup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,10 @@ static ProtocolConformanceRef getPackTypeConformance(
PackConformance::get(type, protocol, patternConformances));
}

static bool shouldExpandExtensionMacro(Evaluator &evaluator, NominalTypeDecl *nominal) {
return !evaluator.hasActiveRequest(ExpandExtensionMacros{nominal});
}

ProtocolConformanceRef
LookupConformanceInModuleRequest::evaluate(
Evaluator &evaluator, LookupConformanceDescriptor desc) const {
Expand Down Expand Up @@ -670,10 +674,11 @@ LookupConformanceInModuleRequest::evaluate(
// extension macro can generate a conformance to the
// given protocol, but conformance macros do not specify
// that information upfront.
(void)evaluateOrDefault(
ctx.evaluator,
ExpandExtensionMacros{nominal},
{ });
if (shouldExpandExtensionMacro(ctx.evaluator, nominal))
(void)evaluateOrDefault(
evaluator,
ExpandExtensionMacros{nominal},
{ });

// Find the root conformance in the nominal type declaration's
// conformance lookup table.
Expand Down
Loading