Skip to content

Commit 4420210

Browse files
gottesmmgottesmm
authored
Merge pull request swiftlang#78666 from gottesmm/release/6.1-rdar141962865
[6.1] [rbi] Fix demangling of sending results when demangling impl-function-type
2 parents 97b8bd3 + 32df57e commit 4420210

File tree

9 files changed

+64
-18
lines changed

9 files changed

+64
-18
lines changed

‎docs/ABI/Mangling.rst‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@ mangled in to disambiguate.
836836
impl-function-type ::= type* 'I' FUNC-ATTRIBUTES '_'
837837
impl-function-type ::= type* generic-signature 'I' FUNC-ATTRIBUTES '_'
838838

839-
FUNC-ATTRIBUTES ::= PATTERN-SUBS? INVOCATION-SUBS? PSEUDO-GENERIC? CALLEE-ESCAPE? ISOLATION? DIFFERENTIABILITY-KIND? CALLEE-CONVENTION FUNC-REPRESENTATION? COROUTINE-KIND? SENDABLE? ASYNC? (PARAM-CONVENTION PARAM-DIFFERENTIABILITY?)* RESULT-CONVENTION* ('Y' PARAM-CONVENTION)* ('z' RESULT-CONVENTION RESULT-DIFFERENTIABILITY?)?
839+
FUNC-ATTRIBUTES ::= PATTERN-SUBS? INVOCATION-SUBS? PSEUDO-GENERIC? CALLEE-ESCAPE? ISOLATION? DIFFERENTIABILITY-KIND? CALLEE-CONVENTION FUNC-REPRESENTATION? COROUTINE-KIND? SENDABLE? ASYNC? SENDING-RESULT? (PARAM-CONVENTION PARAM-DIFFERENTIABILITY?)* RESULT-CONVENTION* ('Y' PARAM-CONVENTION)* ('z' RESULT-CONVENTION RESULT-DIFFERENTIABILITY?)?
840840

841841
PATTERN-SUBS ::= 's' // has pattern substitutions
842842
INVOCATION-SUB ::= 'I' // has invocation substitutions
@@ -870,8 +870,12 @@ mangled in to disambiguate.
870870
COROUTINE-KIND ::= 'G' // yield-many coroutine
871871

872872
#if SWIFT_RUNTIME_VERSION >= 5.5
873-
SENDABLE ::= 'h' // @Sendable
874-
ASYNC ::= 'H' // @async
873+
SENDABLE ::= 'h' // @Sendable
874+
ASYNC ::= 'H' // @async
875+
#endif
876+
877+
#if SWIFT_RUNTIME_VERSION >= 6.0
878+
SENDING-RESULT ::= 'T' // sending result
875879
#endif
876880

877881
PARAM-CONVENTION ::= 'i' // indirect in

‎include/swift/AST/Types.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4789,12 +4789,12 @@ class SILResultInfo {
47894789
SILType getSILStorageInterfaceType() const;
47904790
/// Return a version of this result info with the type replaced.
47914791
SILResultInfo getWithInterfaceType(CanType type) const {
4792-
return SILResultInfo(type, getConvention());
4792+
return SILResultInfo(type, getConvention(), getOptions());
47934793
}
47944794

47954795
/// Return a version of this result info with the convention replaced.
47964796
SILResultInfo getWithConvention(ResultConvention c) const {
4797-
return SILResultInfo(getInterfaceType(), c);
4797+
return SILResultInfo(getInterfaceType(), c, getOptions());
47984798
}
47994799

48004800
// Does this result convention require indirect storage? This reflects a

‎include/swift/Demangling/TypeDecoder.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,7 +1093,14 @@ class TypeDecoder {
10931093
flags = flags.withSendable();
10941094
} else if (child->getText() == "@async") {
10951095
flags = flags.withAsync();
1096+
} else if (child->getText() == "sending-result") {
1097+
flags = flags.withSendingResult();
10961098
}
1099+
} else if (child->getKind() == NodeKind::ImplSendingResult) {
1100+
// NOTE: This flag needs to be set both at the function level and on
1101+
// each of the parameters. The flag on the function just means that
1102+
// all parameters are sending (which is always true today).
1103+
flags = flags.withSendingResult();
10971104
} else if (child->getKind() == NodeKind::ImplCoroutineKind) {
10981105
if (!child->hasText())
10991106
return MAKE_NODE_TYPE_ERROR0(child, "expected text");

‎lib/AST/ASTDemangler.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -677,6 +677,10 @@ Type ASTBuilder::createImplFunctionType(
677677
auto type = result.getType()->getCanonicalType();
678678
auto conv = getResultConvention(result.getConvention());
679679
auto options = *getResultOptions(result.getOptions());
680+
// We currently set sending result at the function level, but we set sending
681+
// result on each result.
682+
if (flags.hasSendingResult())
683+
options |= SILResultInfo::IsSending;
680684
funcResults.emplace_back(type, conv, options);
681685
}
682686

‎lib/AST/ASTMangler.cpp‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2200,6 +2200,19 @@ void ASTMangler::appendImplFunctionType(SILFunctionType *fn,
22002200
OpArgs.push_back('H');
22012201
}
22022202

2203+
// Mangle if we have a sending result and we are in a recursive position.
2204+
//
2205+
// DISCUSSION: We only want sending results to be in the mangling if it is
2206+
// being used in a function value passed to a parameter or generic
2207+
// position... but not if it is just added to a return type.
2208+
//
2209+
// E.x.:
2210+
//
2211+
// func foo() -> sending X // No mangling
2212+
// func bar(_ x: () -> sending X) {} // Add to mangling for x
2213+
if (isInRecursion && fn->hasSendingResult())
2214+
OpArgs.push_back('T');
2215+
22032216
GenericSignature sig = fn->getSubstGenericSignature();
22042217

22052218
// Mangle the parameters.
@@ -2212,10 +2225,6 @@ void ASTMangler::appendImplFunctionType(SILFunctionType *fn,
22122225
appendType(param.getInterfaceType(), sig, forDecl);
22132226
}
22142227

2215-
// Mangle if we have a sending result.
2216-
if (isInRecursion && fn->hasSendingResult())
2217-
OpArgs.push_back('T');
2218-
22192228
// Mangle the results.
22202229
for (auto result : fn->getResults()) {
22212230
OpArgs.push_back(getResultConvention(result.getConvention()));

‎lib/Demangling/Demangler.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2412,6 +2412,10 @@ NodePointer Demangler::demangleImplFunctionType() {
24122412
*this);
24132413
}
24142414

2415+
if (nextIf('T')) {
2416+
type->addChild(createNode(Node::Kind::ImplSendingResult), *this);
2417+
}
2418+
24152419
addChild(type, GenSig);
24162420

24172421
int NumTypesToAdd = 0;
@@ -2425,10 +2429,6 @@ NodePointer Demangler::demangleImplFunctionType() {
24252429
++NumTypesToAdd;
24262430
}
24272431

2428-
if (nextIf('T')) {
2429-
type->addChild(createNode(Node::Kind::ImplSendingResult), *this);
2430-
}
2431-
24322432
while (NodePointer Result = demangleImplResultConvention(
24332433
Node::Kind::ImplResult)) {
24342434
type = addChild(type, Result);
@@ -2461,7 +2461,7 @@ NodePointer Demangler::demangleImplFunctionType() {
24612461
return nullptr;
24622462
type->getChild(type->getNumChildren() - Idx - 1)->addChild(ConvTy, *this);
24632463
}
2464-
2464+
24652465
return createType(type);
24662466
}
24672467

‎lib/Demangling/Remangler.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2111,9 +2111,9 @@ ManglingError Remangler::mangleImplFunctionType(Node *node, unsigned depth) {
21112111
}
21122112
case Node::Kind::ImplFunctionAttribute: {
21132113
char FuncAttr = llvm::StringSwitch<char>(Child->getText())
2114-
.Case("@Sendable", 'h')
2115-
.Case("@async", 'H')
2116-
.Default(0);
2114+
.Case("@Sendable", 'h')
2115+
.Case("@async", 'H')
2116+
.Default(0);
21172117
if (!FuncAttr) {
21182118
return MANGLING_ERROR(ManglingError::InvalidImplFunctionAttribute,
21192119
Child);

‎test/Concurrency/sending_mangling.swift‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// RUN: %target-swift-frontend %s -emit-silgen -swift-version 6 | swift-demangle | %FileCheck -check-prefix=CHECK %s
1+
// RUN: %empty-directory(%t)
2+
// RUN: %target-swift-frontend %s -emit-silgen -swift-version 6 | swift-demangle | %FileCheck %s
3+
// RUN: %target-swift-frontend %s -emit-silgen -swift-version 6 | %FileCheck -check-prefix=SIL %s
24

35
// REQUIRES: concurrency
46
// REQUIRES: asserts
@@ -110,3 +112,21 @@ struct ConstructorSharedTest {
110112
// CHECK: sil hidden [ossa] @sending_mangling.ConstructorSharedTest.functionSuppressed(sending_mangling.NonSendableKlass) -> () : $@convention(method) (@sil_sending @guaranteed NonSendableKlass, ConstructorSharedTest) -> () {
111113
func functionSuppressed(_ x: __shared sending NonSendableKlass) {}
112114
}
115+
116+
// Make sure that we produce the appropriate reabstraction thunk.
117+
func reabstractionThunkTest_takeSendingReturnSending<T>(
118+
_ x: sending T) -> sending T { fatalError() }
119+
func reabstractionThunkTest_reabstractionThunkGenerator<T>(
120+
_ x: sending T,
121+
_ f: (sending T) -> T) {}
122+
123+
// CHECK: sil shared [transparent] [serialized] [reabstraction_thunk] [ossa] @reabstraction thunk helper from @escaping @callee_guaranteed (@in sending sending_mangling.NonSendableKlass) -> sending (@out sending_mangling.NonSendableKlass) to @escaping @callee_guaranteed (@owned sending sending_mangling.NonSendableKlass) -> sending (@owned sending_mangling.NonSendableKlass) : $@convention(thin) (@sil_sending @owned NonSendableKlass, @guaranteed @callee_guaranteed (@sil_sending @in NonSendableKlass) -> @sil_sending @out NonSendableKlass) -> @sil_sending @owned NonSendableKlass {
124+
// SIL: sil shared [transparent] [serialized] [reabstraction_thunk] [ossa] @$s16sending_mangling16NonSendableKlassCACIegTiTr_A2CIegTxTo_TR : $@convention(thin) (@sil_sending @owned NonSendableKlass, @guaranteed @callee_guaranteed (@sil_sending @in NonSendableKlass) -> @sil_sending @out NonSendableKlass) -> @sil_sending @owned NonSendableKlass {
125+
126+
// CHECK: sil shared [transparent] [serialized] [reabstraction_thunk] [ossa] @reabstraction thunk helper from @callee_guaranteed (@owned sending sending_mangling.NonSendableKlass) -> (@owned sending_mangling.NonSendableKlass) to @escaping @callee_guaranteed (@in sending sending_mangling.NonSendableKlass) -> (@out sending_mangling.NonSendableKlass) : $@convention(thin) (@sil_sending @in NonSendableKlass, @guaranteed @noescape @callee_guaranteed (@sil_sending @owned NonSendableKlass) -> @owned NonSendableKlass) -> @out NonSendableKlass {
127+
// SIL: sil shared [transparent] [serialized] [reabstraction_thunk] [ossa] @$s16sending_mangling16NonSendableKlassCACIgxTo_A2CIegiTr_TR : $@convention(thin) (@sil_sending @in NonSendableKlass, @guaranteed @noescape @callee_guaranteed (@sil_sending @owned NonSendableKlass) -> @owned NonSendableKlass) -> @out NonSendableKlass {
128+
func reabstractionThunkTest() {
129+
reabstractionThunkTest_reabstractionThunkGenerator(
130+
NonSendableKlass(),
131+
reabstractionThunkTest_takeSendingReturnSending)
132+
}

‎test/Demangle/Inputs/manglings.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,3 +485,5 @@ $s4main6VectorVy$1_SiG ---> main.Vector<2, Swift.Int>
485485
$s$n3_SSBV ---> Builtin.FixedArray<-4, Swift.String>
486486
$s3red7MyActorC3runyxxyYaKACYcYTXEYaKlFZ ---> static red.MyActor.run<A>(@red.MyActor () async throws -> sending A) async throws -> A
487487
$s3red7MyActorC3runyxxyYaKYAYTXEYaKlFZ ---> static red.MyActor.run<A>(@isolated(any) () async throws -> sending A) async throws -> A
488+
$s7ToolKit10TypedValueOACs5Error_pIgHTnTrzo_A2CsAD_pIegHiTrzr_TR ---> {T:} reabstraction thunk helper from @callee_guaranteed @async (@in_guaranteed sending ToolKit.TypedValue) -> sending (@out ToolKit.TypedValue, @error @owned Swift.Error) to @escaping @callee_guaranteed @async (@in sending ToolKit.TypedValue) -> (@out ToolKit.TypedValue, @error @out Swift.Error)
489+
$s16sending_mangling16NonSendableKlassCACIegTiTr_A2CIegTxTo_TR ---> {T:} reabstraction thunk helper from @escaping @callee_guaranteed (@in sending sending_mangling.NonSendableKlass) -> sending (@out sending_mangling.NonSendableKlass) to @escaping @callee_guaranteed (@owned sending sending_mangling.NonSendableKlass) -> sending (@owned sending_mangling.NonSendableKlass)

0 commit comments

Comments
 (0)