Skip to content

Commit f1ac9af

Browse files
author
Gabor Horvath
committed
[cxx-interop] Remove stale reference to rdar
There is no reason to require a body for move/copy ctors to use them.
1 parent 4488c79 commit f1ac9af

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

lib/IRGen/GenStruct.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -568,10 +568,7 @@ namespace {
568568
return nullptr;
569569
for (auto ctor : cxxRecordDecl->ctors()) {
570570
if (ctor->isCopyConstructor() &&
571-
ctor->getAccess() == clang::AS_public &&
572-
// rdar://106964356
573-
// ctor->doesThisDeclarationHaveABody() &&
574-
!ctor->isDeleted())
571+
ctor->getAccess() == clang::AS_public && !ctor->isDeleted())
575572
return ctor;
576573
}
577574
return nullptr;
@@ -583,8 +580,7 @@ namespace {
583580
return nullptr;
584581
for (auto ctor : cxxRecordDecl->ctors()) {
585582
if (ctor->isMoveConstructor() &&
586-
ctor->getAccess() == clang::AS_public &&
587-
ctor->doesThisDeclarationHaveABody() && !ctor->isDeleted())
583+
ctor->getAccess() == clang::AS_public && !ctor->isDeleted())
588584
return ctor;
589585
}
590586
return nullptr;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,12 @@ int main() {
151151
// CHECK-NEXT: create NonTrivialTemplate
152152
// CHECK-NEXT: call
153153
// CHECK-NEXT: copy NonTrivialTemplate
154-
// CHECK-NEXT: copy NonTrivialTemplate
154+
// CHECK-NEXT: move NonTrivialTemplate
155155
// CHECK-NEXT: ~NonTrivialTemplate
156156
// CHECK-NEXT: DoneCall
157157
// CHECK-NEXT: copy NonTrivialTemplate
158158
// CHECK-NEXT: ~NonTrivialTemplate
159-
// CHECK-NEXT: copy NonTrivialTemplate
159+
// CHECK-NEXT: move NonTrivialTemplate
160160
// CHECK-NEXT: ~NonTrivialTemplate
161161
// CHECK-NEXT: ~NonTrivialTemplate
162162
// CHECK-NEXT: ~NonTrivialTemplate

0 commit comments

Comments
 (0)