Skip to content

Support std::unique_ptr. #65577

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 4 commits into from
Closed

Support std::unique_ptr. #65577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe90677
[cxx-interop] Import move only types even when `-enable-experimental-…
zoecarver May 2, 2023
258bca4
[cxx-interop] Add tests for `std::unique_ptr`.
zoecarver May 2, 2023
6587a8b
[tests][cxx-interop] Fix straggling test.
zoecarver May 2, 2023
335105d
no merge: add some debugging for linux.
zoecarver May 3, 2023
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
20 changes: 11 additions & 9 deletions lib/ClangImporter/ImportDecl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2135,15 +2135,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 @@ -3721,6 +3712,17 @@ namespace {
auto dc = Impl.importDeclContextOf(
decl, importedName.getEffectiveContext());

#ifndef NDEBUG
if (dc == nullptr) {
llvm::dbgs() << "No decl context!\n";
llvm::dbgs() << "Decl: " << importedName.getDeclName().getBaseIdentifier().str() << "\n";
llvm::dbgs() << "Decl: "; decl->dump();
llvm::dbgs() << "Efective ctx: "; importedName.getEffectiveContext().DC->dumpAsDecl();
llvm::dbgs() << "Decl ctx: "; decl->getDeclContext()->dumpAsDecl();
llvm_unreachable("");
}
#endif

SmallVector<GenericTypeParamDecl *, 4> genericParams;
for (auto &param : *decl->getTemplateParameters()) {
auto genericParamDecl =
Expand Down
12 changes: 8 additions & 4 deletions test/Interop/Cxx/class/type-classification-module-interface.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@
// CHECK-NOT: StructWithPrivateDefaultedCopyConstructor
// CHECK-NOT: StructWithInheritedPrivateDefaultedCopyConstructor
// CHECK-NOT: StructWithSubobjectPrivateDefaultedCopyConstructor
// CHECK-NOT: StructNonCopyableTriviallyMovable
// CHECK-NOT: StructNonCopyableNonMovable
// CHECK-NOT: StructWithMoveConstructor
// CHECK-NOT: StructWithInheritedMoveConstructor
// CHECK-NOT: StructWithSubobjectMoveConstructor
// CHECK-NOT: StructWithMoveAssignment
// CHECK-NOT: StructWithInheritedMoveAssignment
// CHECK-NOT: StructWithSubobjectMoveAssignment
Expand All @@ -20,6 +16,14 @@
// CHECK-NOT: StructWithInheritedDeletedDestructor
// CHECK-NOT: StructWithSubobjectDeletedDestructor

// CHECK: struct StructWithMoveConstructor

// CHECK: struct StructWithInheritedMoveConstructor

// CHECK: struct StructWithSubobjectMoveConstructor

// CHECK: struct StructNonCopyableTriviallyMovable

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

Expand Down
5 changes: 5 additions & 0 deletions test/Interop/Cxx/stdlib/Inputs/module.modulemap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,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
View file
Open in desktop
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
42 changes: 42 additions & 0 deletions test/Interop/Cxx/stdlib/std-unique-ptr.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
// 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.

That's not going to happen. Can you just import CxxStdlib?

Copy link
Contributor

Choose a reason for hiding this comment

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

We have a bunch of existing tests that do this, I'll update them to 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)
// Over consume:
// expectEqual(u[1], 2)
// expectEqual(u[2], 3)
// Crash:
// u[0] = 10
// expectEqual(u[0], 10)
}

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

runAllTests()