Skip to content

[cxx-interop] Add basic support for using UFOs as members, etc. #42427

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

Merged
merged 1 commit into from
Apr 19, 2022
Merged

[cxx-interop] Add basic support for using UFOs as members, etc. #42427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions lib/IRGen/GenMeta.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2515,6 +2515,15 @@ void irgen::emitLazyTypeContextDescriptor(IRGenModule &IGM,
void irgen::emitLazyTypeMetadata(IRGenModule &IGM, NominalTypeDecl *type) {
eraseExistingTypeContextDescriptor(IGM, type);

// Special case, UFOs are opaque pointers for now.
if (auto cd = dyn_cast<ClassDecl>(type)) {
if (cd->isForeignReferenceType()) {
auto sd = cast<StructDecl>(type->getASTContext().getOpaquePointerDecl());
emitStructMetadata(IGM, sd);
return;
}
}

if (requiresForeignTypeMetadata(type)) {
emitForeignTypeMetadata(IGM, type);
} else if (auto sd = dyn_cast<StructDecl>(type)) {
Expand Down
26 changes: 13 additions & 13 deletions lib/IRGen/GenReflection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,21 +717,21 @@ class FieldTypeMetadataBuilder : public ReflectionMetadataBuilder {
if (!type) {
B.addInt32(0);
} else {
if (type->isForeignReferenceType()) {
type->getASTContext().Diags.diagnose(
type->lookThroughAllOptionalTypes()
->getClassOrBoundGenericClass()
->getLoc(),
diag::foreign_reference_types_unsupported.ID, {});
exit(1);
}

auto genericSig = NTD->getGenericSignature();

// The standard library's Mirror demangles metadata from field
// descriptors, so use MangledTypeRefRole::Metadata to ensure
// runtime metadata is available.
addTypeRef(type, genericSig, MangledTypeRefRole::Metadata);
// Special case, UFOs are opaque pointers for now.
if (type->isForeignReferenceType()) {
auto opaqueType = type->getASTContext().getOpaquePointerType();
// The standard library's Mirror demangles metadata from field
// descriptors, so use MangledTypeRefRole::Metadata to ensure
// runtime metadata is available.
addTypeRef(opaqueType, genericSig, MangledTypeRefRole::Metadata);
} else {
// The standard library's Mirror demangles metadata from field
// descriptors, so use MangledTypeRefRole::Metadata to ensure
// runtime metadata is available.
addTypeRef(type, genericSig, MangledTypeRefRole::Metadata);
}
}

if (IGM.IRGen.Opts.EnableReflectionNames) {
Expand Down
27 changes: 0 additions & 27 deletions test/Interop/Cxx/foreign-reference/error-as-class-member.swift
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions test/Interop/Cxx/foreign-reference/error-as-struct-member.swift
View file
Open in desktop

This file was deleted.

73 changes: 35 additions & 38 deletions test/Interop/Cxx/foreign-reference/pod.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
// RUN: %target-run-simple-swift(-I %S/Inputs/ -Xfrontend -enable-experimental-cxx-interop -Xfrontend -validate-tbd-against-ir=none -Xfrontend -disable-llvm-verify -g)
//
// REQUIRES: executable_test
// XFAIL: OS=windows-msvc

import StdlibUnittest
import POD

// TODO: Waiting on foreign reference type metadata implementation.
//
// struct StructHoldingPair {
// var pair: IntPair
// };
//
// class ClassHoldingPair {
// var pair: IntPair
//
// init(pair: IntPair) { self.pair = pair }
// };
struct StructHoldingPair {
var pair: IntPair
};

class ClassHoldingPair {
var pair: IntPair

init(pair: IntPair) { self.pair = pair }
};

var globalPair: IntPair? = nil

Expand Down Expand Up @@ -106,33 +105,31 @@ PODTestSuite.test("RefHoldingPairPtr") {
expectEqual(x.test(), 41)
}

// TODO: Waiting on foreign reference types metadata implementation.
//
// PODTestSuite.test("StructHoldingPair") {
// var x = StructHoldingPair(pair: IntPair.create())
// expectEqual(x.pair.test(), 1)
// expectEqual(x.pair.testMutable(), 1)
//
// mutateIt(x.pair)
// expectEqual(x.pair.test(), 2)
// expectEqual(x.pair.testMutable(), 2)
//
// x.pair = IntPair.create()
// expectEqual(x.pair.test(), 1)
// }
//
// PODTestSuite.test("ClassHoldingPair") {
// var x = ClassHoldingPair(pair: IntPair.create())
// expectEqual(x.pair.test(), 1)
// expectEqual(x.pair.testMutable(), 1)
//
// mutateIt(x.pair)
// expectEqual(x.pair.test(), 2)
// expectEqual(x.pair.testMutable(), 2)
//
// x.pair = IntPair.create()
// expectEqual(x.pair.test(), 1)
// }
PODTestSuite.test("StructHoldingPair") {
var x = StructHoldingPair(pair: IntPair.create())
expectEqual(x.pair.test(), 1)
expectEqual(x.pair.testMutable(), 1)

mutateIt(x.pair)
expectEqual(x.pair.test(), 2)
expectEqual(x.pair.testMutable(), 2)

x.pair = IntPair.create()
expectEqual(x.pair.test(), 1)
}

PODTestSuite.test("ClassHoldingPair") {
var x = ClassHoldingPair(pair: IntPair.create())
expectEqual(x.pair.test(), 1)
expectEqual(x.pair.testMutable(), 1)

mutateIt(x.pair)
expectEqual(x.pair.test(), 2)
expectEqual(x.pair.testMutable(), 2)

x.pair = IntPair.create()
expectEqual(x.pair.test(), 1)
}

PODTestSuite.test("BigType") {
var x = BigType.create()
Expand Down