Skip to content

Commit 729f152

Browse files
slavapestovslavapestov
authored
Merge pull request #40983 from slavapestov/fix-rdar86861522-5.6
Sema: Back out #36752 entirely [5.6]
2 parents 617ef13 + 8224096 commit 729f152

File tree

6 files changed

+9
-128
lines changed

6 files changed

+9
-128
lines changed

‎lib/Sema/TypeCheckProtocol.cpp‎

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -4146,35 +4146,6 @@ void ConformanceChecker::checkNonFinalClassWitness(ValueDecl *requirement,
41464146
}
41474147
}
41484148

4149-
static bool isSwiftRawRepresentableEnum(Type adoptee) {
4150-
auto *enumDecl = dyn_cast<EnumDecl>(adoptee->getAnyNominal());
4151-
return (enumDecl && enumDecl->hasRawType() && !enumDecl->isObjC());
4152-
}
4153-
4154-
// If the given witness matches a generic RawRepresentable function conforming
4155-
// with a given protocol e.g. `func == <T : RawRepresentable>(lhs: T, rhs: T) ->
4156-
// Bool where T.RawValue : Equatable`
4157-
static bool isRawRepresentableGenericFunction(
4158-
ASTContext &ctx, const ValueDecl *witness,
4159-
const NormalProtocolConformance *conformance) {
4160-
auto *fnDecl = dyn_cast<AbstractFunctionDecl>(witness);
4161-
if (!fnDecl || !fnDecl->isStdlibDecl())
4162-
return false;
4163-
4164-
return fnDecl->isGeneric() && fnDecl->getGenericParams()->size() == 1 &&
4165-
fnDecl->getGenericRequirements().size() == 2 &&
4166-
llvm::all_of(
4167-
fnDecl->getGenericRequirements(), [&](Requirement genericReq) {
4168-
if (genericReq.getKind() != RequirementKind::Conformance)
4169-
return false;
4170-
return genericReq.getProtocolDecl() ==
4171-
ctx.getProtocol(
4172-
KnownProtocolKind::RawRepresentable) ||
4173-
genericReq.getProtocolDecl() ==
4174-
conformance->getProtocol();
4175-
});
4176-
}
4177-
41784149
ResolveWitnessResult
41794150
ConformanceChecker::resolveWitnessViaLookup(ValueDecl *requirement) {
41804151
assert(!isa<AssociatedTypeDecl>(requirement) && "Use resolveTypeWitnessVia*");
@@ -4228,10 +4199,6 @@ ConformanceChecker::resolveWitnessViaLookup(ValueDecl *requirement) {
42284199
!canDerive && !requirement->getAttrs().hasAttribute<OptionalAttr>() &&
42294200
!requirement->getAttrs().isUnavailable(getASTContext());
42304201

4231-
auto &ctx = getASTContext();
4232-
bool isEquatableConformance = (Conformance->getProtocol() ==
4233-
ctx.getProtocol(KnownProtocolKind::Equatable));
4234-
42354202
if (findBestWitness(requirement,
42364203
considerRenames ? &ignoringNames : nullptr,
42374204
Conformance,
@@ -4240,28 +4207,6 @@ ConformanceChecker::resolveWitnessViaLookup(ValueDecl *requirement) {
42404207
const auto &best = matches[bestIdx];
42414208
auto witness = best.Witness;
42424209

4243-
if (canDerive &&
4244-
isEquatableConformance &&
4245-
isSwiftRawRepresentableEnum(Adoptee) &&
4246-
!Conformance->getDeclContext()->getParentModule()->isResilient()) {
4247-
// For swift enum types that can derive an Equatable conformance,
4248-
// if the best witness is the default implementation
4249-
//
4250-
// func == <T : RawRepresentable>(lhs: T, rhs: T) -> Bool
4251-
// where T.RawValue : Equatable
4252-
//
4253-
// let's return as missing and derive the conformance, since it will be
4254-
// more efficient than comparing rawValues.
4255-
//
4256-
// However, we only do this if the module is non-resilient. If it is
4257-
// resilient, this change can break ABI by publishing a synthesized ==
4258-
// declaration that may not exist in versions of the framework built
4259-
// with an older compiler.
4260-
if (isRawRepresentableGenericFunction(ctx, witness, Conformance)) {
4261-
return ResolveWitnessResult::Missing;
4262-
}
4263-
}
4264-
42654210
// If the name didn't actually line up, complain.
42664211
if (ignoringNames &&
42674212
requirement->getName() != best.Witness->getName() &&

‎test/DebugInfo/debug_scope_propagate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %target-swift-frontend -primary-file %s -g -O -emit-sil | %FileCheck %s
22

3-
public enum BenchmarkCategory : String {
3+
public enum BenchmarkCategory {
44
case validation
55
case api, Array, String, Dictionary, Codable, Set, Data, IndexPath, SIMD
66
}

‎test/SILGen/enum_equatable_witness.swift‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public enum MyState : String {
99

1010
// CHECK-LABEL: sil [ossa] @$s4main11check_stateySiAA7MyStateOF : $@convention(thin) (MyState) -> Int {
1111
public func check_state(_ state : MyState) -> Int {
12-
// FRAGILE: function_ref @$s4main7MyStateO21__derived_enum_equalsySbAC_ACtFZ
12+
// FRAGILE: function_ref @$ss2eeoiySbx_xtSYRzSQ8RawValueRpzlF
1313
// RESILIENT: function_ref @$ss2eeoiySbx_xtSYRzSQ8RawValueRpzlF
1414
return state == .opened ? 1 : 0
1515
}
@@ -22,7 +22,7 @@ public enum GenericMyState<T> : String {
2222

2323
// CHECK-LABEL: sil [ossa] @$s4main19check_generic_stateySiAA14GenericMyStateOySiGF : $@convention(thin) (GenericMyState<Int>) -> Int {
2424
public func check_generic_state(_ state : GenericMyState<Int>) -> Int {
25-
// FRAGILE: function_ref @$s4main14GenericMyStateO21__derived_enum_equalsySbACyxG_AEtFZ
25+
// FRAGILE: function_ref @$ss2eeoiySbx_xtSYRzSQ8RawValueRpzlF
2626
// RESILIENT: function_ref @$ss2eeoiySbx_xtSYRzSQ8RawValueRpzlF
2727
return state == .opened ? 1 : 0
2828
}
@@ -35,7 +35,7 @@ public enum Regular {
3535

3636
// CHECK-LABEL: sil [ossa] @$s4main13check_regularySiAA7RegularOF : $@convention(thin) (Regular) -> Int {
3737
public func check_regular(_ state : Regular) -> Int {
38-
// FRAGILE: function_ref @$s4main7RegularO21__derived_enum_equalsySbAC_ACtFZ
38+
// FRAGILE: function_ref @$ss2eeoiySbx_xtSYRzSQ8RawValueRpzlF
3939
// RESILIENT: function_ref @$ss2eeoiySbx_xtSYRzSQ8RawValueRpzlF
4040
return state == .closed ? 1 : 0
4141
}
@@ -47,14 +47,14 @@ public enum Alphabet : String {
4747

4848
// CHECK-LABEL: sil [ossa] @$s4main14check_alphabetySiAA8AlphabetOF : $@convention(thin) (Alphabet) -> Int {
4949
public func check_alphabet(_ state : Alphabet) -> Int {
50-
// FRAGILE: function_ref @$s4main8AlphabetO21__derived_enum_equalsySbAC_ACtFZ
50+
// FRAGILE: function_ref @$ss2eeoiySbx_xtSYRzSQ8RawValueRpzlF
5151
// RESILIENT: function_ref @$ss2eeoiySbx_xtSYRzSQ8RawValueRpzlF
5252
return state == .E ? 1 : 0
5353
}
5454

5555
// CHECK-LABEL: sil [ossa] @$s4main9compareItySbAA8AlphabetO_ADtF : $@convention(thin) (Alphabet, Alphabet) -> Bool {
5656
public func compareIt(_ state : Alphabet, _ rhs: Alphabet) -> Bool {
57-
// FRAGILE: function_ref @$s4main8AlphabetO21__derived_enum_equalsySbAC_ACtFZ
57+
// FRAGILE: function_ref @$ss2eeoiySbx_xtSYRzSQ8RawValueRpzlF
5858
// RESILIENT: function_ref @$ss2eeoiySbx_xtSYRzSQ8RawValueRpzlF
5959
return state == rhs
6060
}
@@ -66,14 +66,14 @@ public enum AlphabetInt : Int {
6666

6767
// CHECK-LABEL: sil [ossa] @$s4main18check_alphabet_intySiAA11AlphabetIntOF : $@convention(thin) (AlphabetInt) -> Int {
6868
public func check_alphabet_int(_ state : AlphabetInt) -> Int {
69-
// FRAGILE: function_ref @$s4main11AlphabetIntO21__derived_enum_equalsySbAC_ACtFZ
69+
// FRAGILE: function_ref @$ss2eeoiySbx_xtSYRzSQ8RawValueRpzlF
7070
// RESILIENT: function_ref @$ss2eeoiySbx_xtSYRzSQ8RawValueRpzlF
7171
return state == .E ? 1 : 0
7272
}
7373

7474
// CHECK-LABEL: sil [ossa] @$s4main9compareItySbAA11AlphabetIntO_ADtF : $@convention(thin) (AlphabetInt, AlphabetInt) -> Bool {
7575
public func compareIt(_ state : AlphabetInt, _ rhs: AlphabetInt) -> Bool {
76-
// FRAGILE: function_ref @$s4main11AlphabetIntO21__derived_enum_equalsySbAC_ACtFZ
76+
// FRAGILE: function_ref @$ss2eeoiySbx_xtSYRzSQ8RawValueRpzlF
7777
// RESILIENT: function_ref @$ss2eeoiySbx_xtSYRzSQ8RawValueRpzlF
7878
return state == rhs
7979
}

‎test/SILGen/opaque_ownership.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ public struct Int : _ExpressibleByBuiltinIntegerLiteral, ExpressibleByIntegerLit
178178
// CHECK: %5 = apply %4(%0, %1, %3) : $@convention(method) (FloatingPointSign, FloatingPointSign, @thin FloatingPointSign.Type) -> Bool // user: %6
179179
// CHECK: return %5 : $Bool
180180
// CHECK-LABEL: } // end sil function '$ss17FloatingPointSignOSQsSQ2eeoiySbx_xtFZTW'
181-
public enum FloatingPointSign: Int64 {
181+
public enum FloatingPointSign {
182182
/// The sign for a positive value.
183183
case plus
184184

‎test/api-digester/Outputs/cake-abi.json‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -594,38 +594,6 @@
594594
"moduleName": "cake",
595595
"fixedbinaryorder": 0
596596
},
597-
{
598-
"kind": "Function",
599-
"name": "__derived_enum_equals",
600-
"printedName": "__derived_enum_equals(_:_:)",
601-
"children": [
602-
{
603-
"kind": "TypeNominal",
604-
"name": "Bool",
605-
"printedName": "Swift.Bool",
606-
"usr": "s:Sb"
607-
},
608-
{
609-
"kind": "TypeNominal",
610-
"name": "Number",
611-
"printedName": "cake.Number",
612-
"usr": "s:4cake6NumberO"
613-
},
614-
{
615-
"kind": "TypeNominal",
616-
"name": "Number",
617-
"printedName": "cake.Number",
618-
"usr": "s:4cake6NumberO"
619-
}
620-
],
621-
"declKind": "Func",
622-
"usr": "s:4cake6NumberO21__derived_enum_equalsySbAC_ACtFZ",
623-
"mangledName": "$s4cake6NumberO21__derived_enum_equalsySbAC_ACtFZ",
624-
"moduleName": "cake",
625-
"static": true,
626-
"implicit": true,
627-
"funcSelfKind": "NonMutating"
628-
},
629597
{
630598
"kind": "Constructor",
631599
"name": "init",

‎test/api-digester/Outputs/cake.json‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -596,38 +596,6 @@
596596
"mangledName": "$s4cake6NumberO3oneyA2CmF",
597597
"moduleName": "cake"
598598
},
599-
{
600-
"kind": "Function",
601-
"name": "__derived_enum_equals",
602-
"printedName": "__derived_enum_equals(_:_:)",
603-
"children": [
604-
{
605-
"kind": "TypeNominal",
606-
"name": "Bool",
607-
"printedName": "Swift.Bool",
608-
"usr": "s:Sb"
609-
},
610-
{
611-
"kind": "TypeNominal",
612-
"name": "Number",
613-
"printedName": "cake.Number",
614-
"usr": "s:4cake6NumberO"
615-
},
616-
{
617-
"kind": "TypeNominal",
618-
"name": "Number",
619-
"printedName": "cake.Number",
620-
"usr": "s:4cake6NumberO"
621-
}
622-
],
623-
"declKind": "Func",
624-
"usr": "s:4cake6NumberO21__derived_enum_equalsySbAC_ACtFZ",
625-
"mangledName": "$s4cake6NumberO21__derived_enum_equalsySbAC_ACtFZ",
626-
"moduleName": "cake",
627-
"static": true,
628-
"implicit": true,
629-
"funcSelfKind": "NonMutating"
630-
},
631599
{
632600
"kind": "Constructor",
633601
"name": "init",

0 commit comments

Comments
 (0)