Skip to content

Commit 4a0f380

Browse files
meg-guptameg-gupta
authored
Merge pull request #72684 from meg-gupta/fixlifetimedemangling
Fix lifetime dependence demangling and add a new Sema diagnostic
2 parents 095173a + 5a96e6c commit 4a0f380

File tree

7 files changed

+51
-14
lines changed

7 files changed

+51
-14
lines changed

‎docs/ABI/Mangling.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,7 @@ Types
727727
C-TYPE is mangled according to the Itanium ABI, and prefixed with the length.
728728
Non-ASCII identifiers are preserved as-is; we do not use Punycode.
729729

730-
function-signature ::= params-type params-type async? sendable? throws? differentiable? function-isolation? // results and parameters
730+
function-signature ::= params-type params-type async? sendable? throws? differentiable? function-isolation? self-lifetime-dependence? // results and parameters
731731

732732
params-type ::= type 'z'? 'h'? // tuple in case of multiple parameters or a single parameter with a single tuple type
733733
// with optional inout convention, shared convention. parameters don't have labels,

‎include/swift/AST/DiagnosticsSema.def

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7889,6 +7889,10 @@ ERROR(lifetime_dependence_cannot_infer_ambiguous_candidate, none,
78897889
"invalid lifetime dependence on bitwise copyable type", ())
78907890
ERROR(lifetime_dependence_cannot_be_applied_to_tuple_elt, none,
78917891
"lifetime dependence specifiers cannot be applied to tuple elements", ())
7892+
ERROR(lifetime_dependence_method_escapable_bitwisecopyable_self, none,
7893+
"cannot infer lifetime dependence on a self which is BitwiseCopyable & "
7894+
"Escapable",
7895+
())
78927896

78937897
//===----------------------------------------------------------------------===//
78947898
// MARK: Transferring

‎lib/Demangling/Demangler.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1560,6 +1560,7 @@ NodePointer Demangler::popFunctionType(Node::Kind kind, bool hasClangType) {
15601560
ClangType = demangleClangType();
15611561
}
15621562
addChild(FuncType, ClangType);
1563+
addChild(FuncType, popNode(Node::Kind::SelfLifetimeDependence));
15631564
addChild(FuncType, popNode(Node::Kind::GlobalActorFunctionType));
15641565
addChild(FuncType, popNode(Node::Kind::IsolatedAnyFunctionType));
15651566
addChild(FuncType, popNode(Node::Kind::TransferringResultFunctionType));
@@ -1570,7 +1571,6 @@ NodePointer Demangler::popFunctionType(Node::Kind kind, bool hasClangType) {
15701571
}));
15711572
addChild(FuncType, popNode(Node::Kind::ConcurrentFunctionType));
15721573
addChild(FuncType, popNode(Node::Kind::AsyncAnnotation));
1573-
addChild(FuncType, popNode(Node::Kind::SelfLifetimeDependence));
15741574

15751575
FuncType = addChild(FuncType, popFunctionParams(Node::Kind::ArgumentTuple));
15761576
FuncType = addChild(FuncType, popFunctionParams(Node::Kind::ReturnType));
@@ -1603,6 +1603,9 @@ NodePointer Demangler::popFunctionParamLabels(NodePointer Type) {
16031603
return nullptr;
16041604

16051605
unsigned FirstChildIdx = 0;
1606+
if (FuncType->getChild(FirstChildIdx)->getKind() ==
1607+
Node::Kind::SelfLifetimeDependence)
1608+
++FirstChildIdx;
16061609
if (FuncType->getChild(FirstChildIdx)->getKind()
16071610
== Node::Kind::GlobalActorFunctionType)
16081611
++FirstChildIdx;
@@ -1629,9 +1632,6 @@ NodePointer Demangler::popFunctionParamLabels(NodePointer Type) {
16291632
if (FuncType->getChild(FirstChildIdx)->getKind() ==
16301633
Node::Kind::ParamLifetimeDependence)
16311634
++FirstChildIdx;
1632-
if (FuncType->getChild(FirstChildIdx)->getKind() ==
1633-
Node::Kind::SelfLifetimeDependence)
1634-
++FirstChildIdx;
16351635
auto ParameterType = FuncType->getChild(FirstChildIdx);
16361636

16371637
assert(ParameterType->getKind() == Node::Kind::ArgumentTuple);

‎lib/Sema/LifetimeDependence.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,7 @@ std::optional<LifetimeDependenceInfo>
399399
LifetimeDependenceInfo::infer(AbstractFunctionDecl *afd, Type resultType) {
400400
auto *dc = afd->getDeclContext();
401401
auto &ctx = dc->getASTContext();
402+
auto *mod = afd->getModuleContext();
402403

403404
if (!ctx.LangOpts.hasFeature(Feature::NonescapableTypes)) {
404405
return std::nullopt;
@@ -431,6 +432,19 @@ LifetimeDependenceInfo::infer(AbstractFunctionDecl *afd, Type resultType) {
431432

432433
if (afd->getKind() != DeclKind::Constructor && afd->hasImplicitSelfDecl()) {
433434
Type selfTypeInContext = dc->getSelfTypeInContext();
435+
if (selfTypeInContext->isEscapable()) {
436+
if (ctx.LangOpts.hasFeature(Feature::BitwiseCopyable)) {
437+
auto *bitwiseCopyableProtocol =
438+
ctx.getProtocol(KnownProtocolKind::BitwiseCopyable);
439+
if (bitwiseCopyableProtocol &&
440+
mod->checkConformance(selfTypeInContext, bitwiseCopyableProtocol)) {
441+
diags.diagnose(
442+
returnLoc,
443+
diag::lifetime_dependence_method_escapable_bitwisecopyable_self);
444+
return std::nullopt;
445+
}
446+
}
447+
}
434448
auto kind = getLifetimeDependenceKindFromType(selfTypeInContext);
435449
auto selfOwnership = afd->getImplicitSelfDecl()->getValueOwnership();
436450
if (!isLifetimeDependenceCompatibleWithOwnership(kind, selfOwnership,

‎test/SIL/implicit_lifetime_dependence.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %target-swift-frontend %s \
2-
// RUN: -emit-sil \
2+
// RUN: -emit-sil -disable-availability-checking \
33
// RUN: -enable-experimental-feature NonescapableTypes \
44
// RUN: -enable-experimental-feature NoncopyableGenerics | %FileCheck %s
55
// REQUIRES: asserts
@@ -82,13 +82,13 @@ struct Wrapper : ~Escapable {
8282
self._view = view
8383
}
8484
// TODO: Investigate why it was mangled as Yli and not YLi before
85-
// CHECK: sil hidden @$s28implicit_lifetime_dependence7WrapperV8getView1AA10BufferViewVyYLiF : $@convention(method) (@guaranteed Wrapper) -> _inherit(0) @owned BufferView {
86-
borrowing func getView1() -> BufferView {
85+
// CHECK: sil hidden @$s28implicit_lifetime_dependence7WrapperV8getView1AA10BufferViewVyKYLiF : $@convention(method) (@guaranteed Wrapper) -> _inherit(0) (@owned BufferView, @error any Error) {
86+
borrowing func getView1() throws -> BufferView {
8787
return _view
8888
}
8989

90-
// CHECK:sil hidden @$s28implicit_lifetime_dependence7WrapperV8getView2AA10BufferViewVyYLiF : $@convention(method) (@owned Wrapper) -> _inherit(0) @owned BufferView {
91-
consuming func getView2() -> BufferView {
90+
// CHECK: sil hidden @$s28implicit_lifetime_dependence7WrapperV8getView2AA10BufferViewVyYaKYLiF : $@convention(method) @async (@owned Wrapper) -> _inherit(0) (@owned BufferView, @error any Error) {
91+
consuming func getView2() async throws -> BufferView {
9292
return _view
9393
}
9494
}

‎test/Sema/explicit_lifetime_dependence_specifiers1.swift

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-typecheck-verify-swift -disable-availability-checking -enable-experimental-feature NonescapableTypes -enable-experimental-feature NoncopyableGenerics
1+
// RUN: %target-typecheck-verify-swift -disable-availability-checking -enable-experimental-feature NonescapableTypes -enable-experimental-feature NoncopyableGenerics -enable-experimental-feature BitwiseCopyable
22
// REQUIRES: asserts
33

44
struct Container {
@@ -218,3 +218,17 @@ func derive(_ x: BufferView) -> dependsOn(x) BufferView { // expected-note{{'der
218218
func derive(_ x: BufferView) -> dependsOn(scoped x) BufferView { // expected-error{{invalid redeclaration of 'derive'}}
219219
return BufferView(x.ptr)
220220
}
221+
222+
struct RawBufferView {
223+
let ptr: UnsafeRawBufferPointer
224+
@_unsafeNonescapableResult
225+
init(_ ptr: UnsafeRawBufferPointer) {
226+
self.ptr = ptr
227+
}
228+
}
229+
230+
extension RawBufferView {
231+
mutating func zeroBufferView() throws -> BufferView { // expected-error{{cannot infer lifetime dependence on a self which is BitwiseCopyable & Escapable}}
232+
return BufferView(ptr)
233+
}
234+
}

‎test/Sema/implicit_lifetime_dependence.swift

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
// RUN: %target-typecheck-verify-swift -disable-availability-checking -enable-experimental-feature NonescapableTypes -enable-experimental-feature NoncopyableGenerics
1+
// RUN: %target-typecheck-verify-swift -enable-experimental-feature NonescapableTypes -enable-experimental-feature NoncopyableGenerics
22
// REQUIRES: asserts
33

44
struct BufferView : ~Escapable, ~Copyable {
5-
let ptr: UnsafeRawBufferPointer
5+
let ptr: UnsafeRawBufferPointer?
66
let c: Int
77
@_unsafeNonescapableResult
8-
init(_ ptr: UnsafeRawBufferPointer, _ c: Int) {
8+
init(_ ptr: UnsafeRawBufferPointer?, _ c: Int) {
99
self.ptr = ptr
1010
self.c = c
1111
}
@@ -23,3 +23,8 @@ struct ImplicitInit3 : ~Escapable, ~Copyable { // expected-error{{cannot infer l
2323
let mbv1: BufferView
2424
let mbv2: BufferView
2525
}
26+
27+
func foo() -> BufferView { // expected-error{{cannot infer lifetime dependence , no parameters found that are ~Escapable or Escapable with a borrowing ownership}}
28+
return BufferView(nil, 0)
29+
}
30+

0 commit comments

Comments
 (0)