Skip to content

[6.2][cxx-interop] Handle Unowned values in implicit value ctors #84291

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
Sep 26, 2025
Merged

[6.2][cxx-interop] Handle Unowned values in implicit value ctors #84291

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
17 changes: 11 additions & 6 deletions lib/SILGen/SILGenConstructor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "ExecutorBreadcrumb.h"
#include "Initialization.h"
#include "LValue.h"
#include "ManagedValue.h"
#include "RValue.h"
#include "SILGenFunction.h"
#include "SILGenFunctionBuilder.h"
Expand All @@ -29,7 +30,9 @@
#include "swift/Basic/Generators.h"
#include "swift/SIL/SILArgument.h"
#include "swift/SIL/SILInstruction.h"
#include "swift/SIL/SILLocation.h"
#include "swift/SIL/SILUndef.h"
#include "swift/SIL/SILValue.h"
#include "swift/SIL/TypeLowering.h"
#include <map>

Expand Down Expand Up @@ -82,13 +85,14 @@ class LoweredParamsInContextGenerator {

} // end anonymous namespace

static ManagedValue emitManagedParameter(SILGenFunction &SGF,
SILValue value, bool isOwned) {
static ManagedValue emitManagedParameter(SILGenFunction &SGF, SILValue value,
bool isOwned, SILLocation loc) {
if (isOwned) {
return SGF.emitManagedRValueWithCleanup(value);
} else {
return ManagedValue::forBorrowedRValue(value);
}
if (value->getOwnershipKind() == OwnershipKind::Unowned)
return ManagedValue::forUnownedObjectValue(value).ensurePlusOne(SGF, loc);
return ManagedValue::forBorrowedRValue(value);
}

static SILValue emitConstructorMetatypeArg(SILGenFunction &SGF,
Expand Down Expand Up @@ -216,7 +220,8 @@ static RValue emitImplicitValueConstructorArg(SILGenFunction &SGF,
[&](Initialization *eltInit) {
auto eltAddr =
SGF.B.createPackElementGet(loc, packIndex, arg, eltTy);
ManagedValue eltMV = emitManagedParameter(SGF, eltAddr, argIsConsumed);
ManagedValue eltMV =
emitManagedParameter(SGF, eltAddr, argIsConsumed, loc);
eltMV = SGF.B.createLoadIfLoadable(loc, eltMV);
eltInit->copyOrInitValueInto(SGF, loc, eltMV, argIsConsumed);
eltInit->finishInitialization(SGF);
Expand All @@ -226,7 +231,7 @@ static RValue emitImplicitValueConstructorArg(SILGenFunction &SGF,
return RValue::forInContext();
}

ManagedValue mvArg = emitManagedParameter(SGF, arg, argIsConsumed);
ManagedValue mvArg = emitManagedParameter(SGF, arg, argIsConsumed, loc);

// This can happen if the value is resilient in the calling convention
// but not resilient locally.
Expand Down
25 changes: 25 additions & 0 deletions test/Interop/Cxx/foreign-reference/frts-as-fields.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,31 @@

import LoggingFrts

struct SwiftStruct {
var frt: SharedFRT
var token: MyToken
}

func go() {
let frt = SharedFRT()
let token = MyToken()
let _ = SwiftStruct(frt: frt, token: token)
let _ = SwiftStruct(frt: frt, token: token)
let _ = SwiftStruct(frt: frt, token: token)
}

go()

// CHECK: RefCount: 1, message: Ctor
// CHECK-NEXT: RefCount: 2, message: retain
// CHECK-NEXT: RefCount: 1, message: release
// CHECK-NEXT: RefCount: 2, message: retain
// CHECK-NEXT: RefCount: 1, message: release
// CHECK-NEXT: RefCount: 2, message: retain
// CHECK-NEXT: RefCount: 1, message: release
// CHECK-NEXT: RefCount: 0, message: release
// CHECK-NEXT: RefCount: 0, message: Dtor

func takesLargeStructWithRefCountedField(_ x: LargeStructWithRefCountedField) {
var a = x
}
Expand Down