Skip to content

[Swiftify] Add return pointer support #78571

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 7 commits into from
Jan 13, 2025
Merged

[Swiftify] Add return pointer support #78571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4acbd7f
[Swiftify] Import __counted_by for function return values
hnrklssn Dec 18, 2024
7f48391
[Swiftify] Fix Span variant selection
hnrklssn Jan 11, 2025
f81ec28
remove unused experimental feature
hnrklssn Jan 11, 2025
dfea674
update abi test
hnrklssn Jan 11, 2025
3a41047
add explicit returns
hnrklssn Jan 11, 2025
137e219
update nonescaping param index
hnrklssn Jan 12, 2025
35e8ee1
update abi tests
hnrklssn Jan 12, 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
23 changes: 19 additions & 4 deletions lib/ClangImporter/ImportDecl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8678,7 +8678,7 @@ class SwiftifyInfoPrinter {
~SwiftifyInfoPrinter() { out << ")"; }

void printCountedBy(const clang::CountAttributedType *CAT,
size_t pointerIndex) {
ssize_t pointerIndex) {
printSeparator();
clang::Expr *countExpr = CAT->getCountExpr();
bool isSizedBy = CAT->isCountInBytes();
Expand All @@ -8687,7 +8687,9 @@ class SwiftifyInfoPrinter {
out << "sizedBy";
else
out << "countedBy";
out << "(pointer: " << pointerIndex + 1 << ", ";
out << "(pointer: ";
printParamOrReturn(pointerIndex);
out << ", ";
if (isSizedBy)
out << "size";
else
Expand All @@ -8700,7 +8702,9 @@ class SwiftifyInfoPrinter {

void printNonEscaping(int idx) {
printSeparator();
out << ".nonescaping(pointer: " << idx << ")";
out << ".nonescaping(pointer: ";
printParamOrReturn(idx);
out << ")";
}

void printTypeMapping(const llvm::StringMap<std::string> &mapping) {
Expand All @@ -8724,6 +8728,13 @@ class SwiftifyInfoPrinter {
firstParam = false;
}
}

void printParamOrReturn(ssize_t pointerIndex) {
if (pointerIndex == -1)
out << ".return";
else
out << ".param(" << pointerIndex + 1 << ")";
}
};
} // namespace

Expand All @@ -8750,7 +8761,7 @@ void ClangImporter::Implementation::importSpanAttributes(FuncDecl *MappedDecl) {
if (decl->getName() != "span")
continue;
if (param->hasAttr<clang::NoEscapeAttr>()) {
printer.printNonEscaping(index + 1);
printer.printNonEscaping(index);
clang::PrintingPolicy policy(param->getASTContext().getLangOpts());
policy.SuppressTagKeyword = true;
auto param = MappedDecl->getParameters()->get(index);
Expand Down Expand Up @@ -8787,6 +8798,10 @@ void ClangImporter::Implementation::importBoundsAttributes(
printer.printCountedBy(CAT, index);
}
}
if (auto CAT =
ClangDecl->getReturnType()->getAs<clang::CountAttributedType>()) {
printer.printCountedBy(CAT, -1);
}
}

importNontrivialAttribute(MappedDecl, MacroString);
Expand Down
2 changes: 1 addition & 1 deletion lib/ClangImporter/ImportType.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2329,7 +2329,7 @@ ImportedType ClangImporter::Implementation::importFunctionReturnType(
: ImportTypeKind::Result),
ImportDiagnosticAdder(*this, clangDecl, clangDecl->getLocation()),
allowNSUIntegerAsInt, Bridgeability::Full, getImportTypeAttrs(clangDecl),
OptionalityOfReturn, isBoundsAnnotated);
OptionalityOfReturn, true, std::nullopt, isBoundsAnnotated);
}

static Type
Expand Down
Loading