Skip to content

Cherrypick fixes for issue 74866 to release/5.10 #77277

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

Closed
wants to merge 10 commits into from
Closed

Cherrypick fixes for issue 74866 to release/5.10 #77277

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
dad157b
[IRGen][interop] do not add 'nocapture' to not bitwise takable types
hjyamauchi Nov 11, 2024
a544806
[cxx-interop] Do not import inherited methods with rvalue this
hjyamauchi Nov 11, 2024
0906aa1
[cxx-interop] make sure a const `operator []` is imported as a mutabl…
hjyamauchi Nov 11, 2024
6e4f3ba
[cxx-interop] Import using decls that expose methods from private bas…
hjyamauchi Nov 11, 2024
b5229ea
[cxx-interop] Refactor: add member operator instantiations to the loo…
hjyamauchi Nov 11, 2024
f55f713
[cxx-interop] Import using decls that refer to member operators of a …
hjyamauchi Nov 11, 2024
528e66d
[IRGen] Make sure a C++ constructor thunk is called when it's needed …
hjyamauchi Nov 11, 2024
a7dfaf3
[IRGen] Fix a bug where an argument wasn't annotated with sret (#71459)
hjyamauchi Nov 11, 2024
0dc015c
Add the inreg attribute to sreg when present.
hjyamauchi Nov 11, 2024
b61997e
Fix the IR gen for C++ method calls and refactor around CGFunctionInfo
hjyamauchi Nov 11, 2024
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
12 changes: 12 additions & 0 deletions lib/ClangImporter/ClangImporter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5487,6 +5487,13 @@ cloneBaseMemberDecl(ValueDecl *decl, DeclContext *newContext) {
(fn->getClangDecl() &&
isa<clang::FunctionTemplateDecl>(fn->getClangDecl())))
return nullptr;
if (auto cxxMethod =
dyn_cast_or_null<clang::CXXMethodDecl>(fn->getClangDecl())) {
// FIXME: if this function has rvalue this, we won't be able to synthesize
// the accessor correctly (https://github.com/apple/swift/issues/69745).
if (cxxMethod->getRefQualifier() == clang::RefQualifierKind::RQ_RValue)
return nullptr;
}

ASTContext &context = decl->getASTContext();
auto out = FuncDecl::createImplicit(
Expand Down Expand Up @@ -7070,6 +7077,11 @@ static bool isSufficientlyTrivial(const clang::CXXRecordDecl *decl) {
/// Checks if a record provides the required value type lifetime operations
/// (copy and destroy).
static bool hasCopyTypeOperations(const clang::CXXRecordDecl *decl) {
// Hack for a base type of std::optional from the Microsoft standard library.
if (decl->isInStdNamespace() && decl->getIdentifier() &&
decl->getName() == "_Optional_construct_base")
return true;

// If we have no way of copying the type we can't import the class
// at all because we cannot express the correct semantics as a swift
// struct.
Expand Down
Loading