Skip to content

[5.9][interop] emit symbolic interfaces with method signatures with matchi… #64822

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

Merged
merged 1 commit into from
Apr 3, 2023
Merged

[5.9][interop] emit symbolic interfaces with method signatures with matchi… #64822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 20 additions & 1 deletion lib/ClangImporter/ImportDecl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3249,7 +3249,26 @@ namespace {
} else {
if (importFuncWithoutSignature) {
importedType = ImportedType{Impl.SwiftContext.getVoidType(), false};
bodyParams = ParameterList::createEmpty(Impl.SwiftContext);
if (decl->param_empty())
bodyParams = ParameterList::createEmpty(Impl.SwiftContext);
else {
llvm::SmallVector<ParamDecl *, 4> params;
for (const auto &param : decl->parameters()) {

Identifier bodyName =
Impl.importFullName(param, Impl.CurrentVersion)
.getDeclName()
.getBaseIdentifier();
auto paramInfo = Impl.createDeclWithClangNode<ParamDecl>(
param, AccessLevel::Private, SourceLoc(), SourceLoc(),
Identifier(), Impl.importSourceLoc(param->getLocation()),
bodyName, Impl.ImportedHeaderUnit);
paramInfo->setSpecifier(ParamSpecifier::Default);
paramInfo->setInterfaceType(Impl.SwiftContext.TheAnyType);
params.push_back(paramInfo);
}
bodyParams = ParameterList::create(Impl.SwiftContext, params);
}
} else {
// Import the function type. If we have parameters, make sure their
// names get into the resulting function type.
Expand Down
4 changes: 3 additions & 1 deletion test/Interop/Cxx/symbolic-imports/indexing-emit-objcxx-symbolic-module-interface.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
// Verify that symbolic interface is not emitted without interop.
//
// RUN: rm -r %t/store/interfaces
// RUN: %target-swift-frontend %t/test.swift -I %t -c -index-system-modules -index-store-path %t/store -Rindexing-system-module 2>&1 | %FileCheck --check-prefix=REMARK_NONE %s
// RUN: %target-swift-frontend %t/test.swift -I %t -c -index-system-modules -index-store-path %t/store -Rindexing-system-module 2>&1 > %t/out
// RUN: echo "non-empty-file-check" >> %t/out
// RUN: cat %t/out | %FileCheck --check-prefix=REMARK_NONE %s
// RUN: not ls %t/store/interfaces

// REQUIRES: objc_interop
Expand Down
2 changes: 1 addition & 1 deletion test/Interop/Cxx/symbolic-imports/indexing-emit-symbolic-module-interface-used-decls.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public func useConcreteTemplate() {
// CHECK-EMPTY:
// CHECK-NEXT: public struct TemplateRecord {
// CHECK-EMPTY:
// CHECK-NEXT: public func methodFunc()
// CHECK-NEXT: public func methodFunc(_ x: Any)
// CHECK-NEXT:}
// CHECK-NEXT:}
// CHECK-NEXT: public typealias TemplateRecordInt = ns.TemplateRecord
4 changes: 2 additions & 2 deletions test/Interop/Cxx/symbolic-imports/indexing-emit-symbolic-module-interface.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,11 @@ import CxxModule
// CHECK-EMPTY:
// CHECK-NEXT: struct TemplateRecord {
// CHECK-EMPTY:
// CHECK-NEXT: mutating func methodFunc()
// CHECK-NEXT: mutating func methodFunc(_ x: Any)
// CHECK-EMPTY:
// CHECK-NEXT: struct InnerRecord {
// CHECK-EMPTY:
// CHECK-NEXT: mutating func innerMethod()
// CHECK-NEXT: mutating func innerMethod(_ y: Any)
// CHECK-NEXT: }
// CHECK-EMPTY:
// CHECK-NEXT: struct InnerTemplate {
Expand Down
2 changes: 1 addition & 1 deletion test/Interop/Cxx/symbolic-imports/print-libcxx-symbolic-module-interface.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// STRING: typealias string = std.__1.basic_string

// VECTOR: struct vector {
// VECTOR: mutating func push_back()
// VECTOR: mutating func push_back(_ __x: Any)
// VECTOR: }

// MAP: struct map {
Expand Down
4 changes: 2 additions & 2 deletions test/Interop/Cxx/symbolic-imports/print-symbolic-module-interface.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ using MyType = ns::TemplateRecord<int>;
// CHECK-NEXT: var y: Int32
// CHECK-NEXT: }
// CHECK-NEXT: struct TemplateRecord {
// CHECK-NEXT: mutating func methodFunc()
// CHECK-NEXT: mutating func methodFunc(_ x: Any)
// CHECK-NEXT: struct InnerRecord {
// CHECK-NEXT: mutating func innerMethod()
// CHECK-NEXT: mutating func innerMethod(_ y: Any)
// CHECK-NEXT: }
// CHECK-NEXT: struct InnerTemplate {
// CHECK-NEXT: mutating func innerTemplateMethod()
Expand Down