Skip to content

[cxx-interop] Import move only type support by default. #67187

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.

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 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 1 addition & 10 deletions lib/ClangImporter/ImportDecl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2161,15 +2161,6 @@ namespace {
Impl.ImportedDecls[{decl->getCanonicalDecl(), getVersion()}] = result;

if (recordHasMoveOnlySemantics(decl)) {
if (!Impl.SwiftContext.LangOpts.hasFeature(Feature::MoveOnly)) {
Impl.addImportDiagnostic(
decl, Diagnostic(
diag::move_only_requires_move_only,
Impl.SwiftContext.AllocateCopy(decl->getNameAsString())),
decl->getLocation());
return nullptr;
}

result->getAttrs().add(new (Impl.SwiftContext)
MoveOnlyAttr(/*Implicit=*/true));
}
Expand Down Expand Up @@ -3843,7 +3834,7 @@ namespace {
auto loc = Impl.importSourceLoc(decl->getLocation());
auto dc = Impl.importDeclContextOf(
decl, importedName.getEffectiveContext());

SmallVector<GenericTypeParamDecl *, 4> genericParams;
for (auto &param : *decl->getTemplateParameters()) {
auto genericParamDecl =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,7 @@
// CHECK-NOT: StructWithPrivateDefaultedCopyConstructor
// CHECK-NOT: StructWithInheritedPrivateDefaultedCopyConstructor
// CHECK-NOT: StructWithSubobjectPrivateDefaultedCopyConstructor
// CHECK-NOT: StructNonCopyableTriviallyMovable
// CHECK-NOT: StructWithPointerNonCopyableTriviallyMovable
// CHECK-NOT: StructWithPointerNonCopyableTriviallyMovableField
// CHECK-NOT: StructNonCopyableNonMovable
// CHECK-NOT: StructWithMoveConstructor
// CHECK-NOT: StructWithInheritedMoveConstructor
// CHECK-NOT: StructWithSubobjectMoveConstructor
// CHECK-NOT: StructWithMoveAssignment
// CHECK-NOT: StructWithInheritedMoveAssignment
// CHECK-NOT: StructWithSubobjectMoveAssignment
Expand All @@ -24,6 +18,14 @@
// CHECK-NOT: StructWithInheritedDeletedDestructor
// CHECK-NOT: StructWithSubobjectDeletedDestructor

// CHECK: struct StructWithMoveConstructor

// CHECK: struct StructWithInheritedMoveConstructor

// CHECK: struct StructWithSubobjectMoveConstructor

// CHECK: struct StructNonCopyableTriviallyMovable

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please bring back the checks for StructWithPointerNonCopyableTriviallyMovable
and StructWithPointerNonCopyableTriviallyMovableField?

// CHECK: struct Iterator {
// CHECK: }

Expand Down
5 changes: 5 additions & 0 deletions test/Interop/Cxx/stdlib/Inputs/module.modulemap
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,8 @@ module StdPair {
header "std-pair.h"
requires cplusplus
}

module StdUniquePtr {
header "std-unique-ptr.h"
requires cplusplus
}
29 changes: 29 additions & 0 deletions test/Interop/Cxx/stdlib/Inputs/std-unique-ptr.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#ifndef TEST_INTEROP_CXX_STDLIB_INPUTS_STD_UNIQUE_PTR_H
#define TEST_INTEROP_CXX_STDLIB_INPUTS_STD_UNIQUE_PTR_H

#include <memory>

std::unique_ptr<int> makeInt() {
return std::make_unique<int>(42);
}

std::unique_ptr<int[]> makeArray() {
int *array = new int[3];
array[0] = 1;
array[1] = 2;
array[2] = 3;
return std::unique_ptr<int[]>(array);
}

static bool dtorCalled = false;
struct HasDtor {
~HasDtor() {
dtorCalled = true;
}
};

std::unique_ptr<HasDtor> makeDtor() {
return std::make_unique<HasDtor>();
}

#endif // TEST_INTEROP_CXX_STDLIB_INPUTS_STD_UNIQUE_PTR_H
40 changes: 40 additions & 0 deletions test/Interop/Cxx/stdlib/std-unique-ptr.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop)
//
// REQUIRES: executable_test

import StdlibUnittest
import StdUniquePtr
#if os(Linux)
import CxxStdlib
// FIXME: import CxxStdlib.string once libstdc++ is split into submodules.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're not going to split libstdc++ into submodules, let's just import CxxStdlib

#else
import CxxStdlib.memory
#endif

var StdUniquePtrTestSuite = TestSuite("StdUniquePtr")

StdUniquePtrTestSuite.test("int") {
let u = makeInt()
expectEqual(u.pointee, 42)
}

StdUniquePtrTestSuite.test("array") {
var u = makeArray()
expectEqual(u[0], 1)
expectEqual(u[1], 2)
expectEqual(u[2], 3)
u[0] = 10
expectEqual(u[0], 10)
}

StdUniquePtrTestSuite.test("custom dtor") {
expectEqual(dtorCalled, false)
let c = {
_ = makeDtor()
}
c()
expectEqual(dtorCalled, true)
}

runAllTests()