averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[cxx-interop] Remove stale reference to rdar

Browse Source 
There is no reason to require a body for move/copy ctors to use them.
This commit is contained in:
Gabor Horvath
2024-12-02 11:20:24 +00:00
parent 4488c7945c
commit f1ac9af3f9
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/IRGen/GenStruct.cpp
View File

@@ -568,10 +568,7 @@ namespace {
return nullptr; return nullptr;
for (auto ctor : cxxRecordDecl->ctors()) { for (auto ctor : cxxRecordDecl->ctors()) {
if (ctor->isCopyConstructor() && if (ctor->isCopyConstructor() &&
ctor->getAccess() == clang::AS_public && ctor->getAccess() == clang::AS_public && !ctor->isDeleted())
// rdar://106964356
// ctor->doesThisDeclarationHaveABody() &&
!ctor->isDeleted())
return ctor; return ctor;
} }
return nullptr; return nullptr;
@@ -583,8 +580,7 @@ namespace {
return nullptr; return nullptr;
for (auto ctor : cxxRecordDecl->ctors()) { for (auto ctor : cxxRecordDecl->ctors()) {
if (ctor->isMoveConstructor() && if (ctor->isMoveConstructor() &&
ctor->getAccess() == clang::AS_public && ctor->getAccess() == clang::AS_public && !ctor->isDeleted())
ctor->doesThisDeclarationHaveABody() && !ctor->isDeleted())
return ctor; return ctor;
} }
return nullptr; return nullptr;

4
test/Interop/CxxToSwiftToCxx/consuming-cxx-struct-parameter-back-to-cxx-execution.cpp
View File

@@ -151,12 +151,12 @@ int main() {
// CHECK-NEXT: create NonTrivialTemplate // CHECK-NEXT: create NonTrivialTemplate
// CHECK-NEXT: call // CHECK-NEXT: call
// CHECK-NEXT: copy NonTrivialTemplate // CHECK-NEXT: copy NonTrivialTemplate
// CHECK-NEXT: copy NonTrivialTemplate // CHECK-NEXT: move NonTrivialTemplate
// CHECK-NEXT: ~NonTrivialTemplate // CHECK-NEXT: ~NonTrivialTemplate
// CHECK-NEXT: DoneCall // CHECK-NEXT: DoneCall
// CHECK-NEXT: copy NonTrivialTemplate // CHECK-NEXT: copy NonTrivialTemplate
// CHECK-NEXT: ~NonTrivialTemplate // CHECK-NEXT: ~NonTrivialTemplate
// CHECK-NEXT: copy NonTrivialTemplate // CHECK-NEXT: move NonTrivialTemplate
// CHECK-NEXT: ~NonTrivialTemplate // CHECK-NEXT: ~NonTrivialTemplate
// CHECK-NEXT: ~NonTrivialTemplate // CHECK-NEXT: ~NonTrivialTemplate
// CHECK-NEXT: ~NonTrivialTemplate // CHECK-NEXT: ~NonTrivialTemplate