Skip to content

Commit 66801fd

Browse files
authored
Merge pull request #72145 from apple/revert-72130-no-inverse-mangle-reabstraction
Revert "Don't mangle inverse protocols within reabstraction thunks"
2 parents b06fb74 + 5ec97ae commit 66801fd

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

lib/AST/ASTMangler.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -450,9 +450,6 @@ std::string ASTMangler::mangleReabstractionThunkHelper(
450450
assert(ThunkType->getPatternSubstitutions().empty() && "not implemented");
451451
GenericSignature GenSig = ThunkType->getInvocationGenericSignature();
452452

453-
// Reabstraction thunks never reference inverse conformances.
454-
llvm::SaveAndRestore X(AllowInverses, false);
455-
456453
beginMangling();
457454
appendType(FromType, GenSig);
458455
appendType(ToType, GenSig);

lib/IRGen/IRGenMangler.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -496,9 +496,8 @@ IRGenMangler::appendExtendedExistentialTypeShape(CanGenericSignature genSig,
496496
CanType shapeType) {
497497
// Append the generalization signature.
498498
if (genSig) {
499-
// Generalization signature never references inverses.
499+
// Generalization signature never reference inverses.
500500
llvm::SaveAndRestore X(AllowInverses, false);
501-
502501
appendGenericSignature(genSig);
503502
}
504503

test/SILGen/existential_member_accesses_self_assoctype.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s
22

3+
// XFAIL: noncopyable_generics
4+
35
protocol P {
46
associatedtype A
57

test/SILGen/tuple_attribute_reabstraction.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// RUN: %target-swift-emit-silgen %s | %FileCheck %s
22

3+
// XFAIL: noncopyable_generics
4+
35
public struct G<T> {
46
var t: T
57

test/SILGen/variadic-generic-reabstract-tuple-result.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// RUN: %target-swift-emit-silgen -disable-availability-checking %s | %FileCheck %s
22

3+
// XFAIL: noncopyable_generics
4+
35
// rdar://110391963
46

57
struct Use<each T> {}

0 commit comments

Comments
 (0)