Skip to content

Commit 5502373

Browse files
eecksteineeckstein
committed
SIL: rename AssociatedTypeProtocolWitness -> AssociatedConformanceWitness in SILWitnessTable
To be consistent with the naming convention in the AST
1 parent 10782cf commit 5502373

30 files changed

+91
-92
lines changed

‎include/swift/SIL/SILBridging.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1080,7 +1080,7 @@ struct BridgedWitnessTableEntry {
10801080
invalid,
10811081
method,
10821082
associatedType,
1083-
associatedTypeProtocol,
1083+
associatedConformance,
10841084
baseProtocol
10851085
};
10861086

‎include/swift/SIL/SILWitnessTable.h‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class SILWitnessTable : public llvm::ilist_node<SILWitnessTable>,
6363

6464
/// A witness table entry describing the witness for an associated type's
6565
/// protocol requirement.
66-
struct AssociatedTypeProtocolWitness {
66+
struct AssociatedConformanceWitness {
6767
/// The associated type required. A dependent type in the protocol's
6868
/// context.
6969
CanType Requirement;
@@ -88,7 +88,7 @@ class SILWitnessTable : public llvm::ilist_node<SILWitnessTable>,
8888
Invalid,
8989
Method,
9090
AssociatedType,
91-
AssociatedTypeProtocol,
91+
AssociatedConformance,
9292
BaseProtocol
9393
} ENUM_EXTENSIBILITY_ATTR(open);
9494

@@ -98,7 +98,7 @@ class SILWitnessTable : public llvm::ilist_node<SILWitnessTable>,
9898
union {
9999
MethodWitness Method;
100100
AssociatedTypeWitness AssociatedType;
101-
AssociatedTypeProtocolWitness AssociatedTypeProtocol;
101+
AssociatedConformanceWitness AssociatedConformance;
102102
BaseProtocolWitness BaseProtocol;
103103
};
104104

@@ -113,9 +113,9 @@ class SILWitnessTable : public llvm::ilist_node<SILWitnessTable>,
113113
: Kind(WitnessKind::AssociatedType), AssociatedType(AssociatedType)
114114
{}
115115

116-
Entry(const AssociatedTypeProtocolWitness &AssociatedTypeProtocol)
117-
: Kind(WitnessKind::AssociatedTypeProtocol),
118-
AssociatedTypeProtocol(AssociatedTypeProtocol)
116+
Entry(const AssociatedConformanceWitness &AssociatedConformance)
117+
: Kind(WitnessKind::AssociatedConformance),
118+
AssociatedConformance(AssociatedConformance)
119119
{}
120120

121121
Entry(const BaseProtocolWitness &BaseProtocol)
@@ -135,10 +135,9 @@ class SILWitnessTable : public llvm::ilist_node<SILWitnessTable>,
135135
assert(Kind == WitnessKind::AssociatedType);
136136
return AssociatedType;
137137
}
138-
const AssociatedTypeProtocolWitness &
139-
getAssociatedTypeProtocolWitness() const {
140-
assert(Kind == WitnessKind::AssociatedTypeProtocol);
141-
return AssociatedTypeProtocol;
138+
const AssociatedConformanceWitness &getAssociatedConformanceWitness() const {
139+
assert(Kind == WitnessKind::AssociatedConformance);
140+
return AssociatedConformance;
142141
}
143142
const BaseProtocolWitness &getBaseProtocolWitness() const {
144143
assert(Kind == WitnessKind::BaseProtocol);

‎lib/IRGen/GenMeta.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,12 +1159,12 @@ namespace {
11591159

11601160
for (auto &entry : DefaultWitnesses->getEntries()) {
11611161
if (!entry.isValid() ||
1162-
entry.getKind() != SILWitnessTable::AssociatedTypeProtocol ||
1163-
entry.getAssociatedTypeProtocolWitness().Protocol != requirement ||
1164-
entry.getAssociatedTypeProtocolWitness().Requirement != association)
1162+
entry.getKind() != SILWitnessTable::AssociatedConformance ||
1163+
entry.getAssociatedConformanceWitness().Protocol != requirement ||
1164+
entry.getAssociatedConformanceWitness().Requirement != association)
11651165
continue;
11661166

1167-
auto witness = entry.getAssociatedTypeProtocolWitness().Witness;
1167+
auto witness = entry.getAssociatedConformanceWitness().Witness;
11681168
AssociatedConformance conformance(Proto, association, requirement);
11691169
defineDefaultAssociatedConformanceAccessFunction(conformance, witness);
11701170
return IGM.getMangledAssociatedConformance(nullptr, conformance);

‎lib/IRGen/GenProto.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1719,9 +1719,9 @@ class AccessorConformanceInfo : public ConformanceInfo {
17191719
requirement.getAssociatedRequirement());
17201720

17211721
#ifndef NDEBUG
1722-
assert(entry.getKind() == SILWitnessTable::AssociatedTypeProtocol
1722+
assert(entry.getKind() == SILWitnessTable::AssociatedConformance
17231723
&& "sil witness table does not match protocol");
1724-
auto associatedWitness = entry.getAssociatedTypeProtocolWitness();
1724+
auto associatedWitness = entry.getAssociatedConformanceWitness();
17251725
assert(associatedWitness.Requirement == requirement.getAssociation()
17261726
&& "sil witness table does not match protocol");
17271727
assert(associatedWitness.Protocol ==
@@ -1952,8 +1952,8 @@ void ResilientWitnessTableBuilder::collectResilientWitnesses(
19521952
}
19531953

19541954
// Associated conformance access function.
1955-
if (entry.getKind() == SILWitnessTable::AssociatedTypeProtocol) {
1956-
const auto &witness = entry.getAssociatedTypeProtocolWitness();
1955+
if (entry.getKind() == SILWitnessTable::AssociatedConformance) {
1956+
const auto &witness = entry.getAssociatedConformanceWitness();
19571957

19581958
auto associate =
19591959
ConformanceInContext.getAssociatedType(
@@ -2265,9 +2265,9 @@ namespace {
22652265
IGM.getAddrOfLLVMVariableOrGOTEquivalent(
22662266
LinkEntity::forAssociatedTypeDescriptor(assocType));
22672267
B.addRelativeAddress(assocTypeDescriptor);
2268-
} else if (entry.getKind() == SILWitnessTable::AssociatedTypeProtocol) {
2268+
} else if (entry.getKind() == SILWitnessTable::AssociatedConformance) {
22692269
// Associated conformance descriptor.
2270-
const auto &witness = entry.getAssociatedTypeProtocolWitness();
2270+
const auto &witness = entry.getAssociatedConformanceWitness();
22712271

22722272
AssociatedConformance requirement(SILWT->getProtocol(),
22732273
witness.Requirement,
@@ -2538,7 +2538,7 @@ static bool isConstantWitnessTable(SILWitnessTable *wt) {
25382538
continue;
25392539

25402540
case SILWitnessTable::AssociatedType:
2541-
case SILWitnessTable::AssociatedTypeProtocol:
2541+
case SILWitnessTable::AssociatedConformance:
25422542
// Associated types and conformances are cached in the witness table.
25432543
// FIXME: If we start emitting constant references to here,
25442544
// we will need to ask the witness table builder for this information.

‎lib/SIL/IR/Linker.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,8 +335,8 @@ void SILLinkerVisitor::visitProtocolConformance(
335335
maybeVisitRelatedConformance(ProtocolConformanceRef(baseConformance));
336336
break;
337337
}
338-
case SILWitnessTable::WitnessKind::AssociatedTypeProtocol: {
339-
auto assocConformance = E.getAssociatedTypeProtocolWitness().Witness;
338+
case SILWitnessTable::WitnessKind::AssociatedConformance: {
339+
auto assocConformance = E.getAssociatedConformanceWitness().Witness;
340340
maybeVisitRelatedConformance(assocConformance);
341341
break;
342342
}

‎lib/SIL/IR/SILPrinter.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4149,10 +4149,10 @@ void SILWitnessTable::Entry::print(llvm::raw_ostream &out, bool verbose,
41494149
assocWitness.Witness->print(out, options);
41504150
break;
41514151
}
4152-
case WitnessKind::AssociatedTypeProtocol: {
4153-
// associated_type_protocol (AssociatedTypeName: Protocol): <conformance>
4154-
auto &assocProtoWitness = getAssociatedTypeProtocolWitness();
4155-
out << "associated_type_protocol (";
4152+
case WitnessKind::AssociatedConformance: {
4153+
// associated_conformance (AssociatedTypeName: Protocol): <conformance>
4154+
auto &assocProtoWitness = getAssociatedConformanceWitness();
4155+
out << "associated_conformance (";
41564156
(void) printAssociatedTypePath(out, assocProtoWitness.Requirement);
41574157
out << ": " << assocProtoWitness.Protocol->getName() << "): ";
41584158
if (assocProtoWitness.Witness.isConcrete())

‎lib/SIL/IR/SILWitnessTable.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ SILWitnessTable::~SILWitnessTable() {
132132
}
133133
break;
134134
case AssociatedType:
135-
case AssociatedTypeProtocol:
135+
case AssociatedConformance:
136136
case BaseProtocol:
137137
case Invalid:
138138
break;
@@ -160,7 +160,7 @@ void SILWitnessTable::convertToDefinition(
160160
}
161161
break;
162162
case AssociatedType:
163-
case AssociatedTypeProtocol:
163+
case AssociatedConformance:
164164
case BaseProtocol:
165165
case Invalid:
166166
break;

‎lib/SIL/Parser/ParseSIL.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7983,7 +7983,7 @@ static bool parseSILWitnessTableEntry(
79837983
if (P.parseIdentifier(EntryKeyword, KeywordLoc,
79847984
/*diagnoseDollarPrefix=*/false,
79857985
diag::expected_tok_in_sil_instr,
7986-
"method, associated_type, associated_type_protocol"
7986+
"method, associated_type, associated_conformance"
79877987
", base_protocol, no_default"))
79887988
return true;
79897989

@@ -8009,12 +8009,12 @@ static bool parseSILWitnessTableEntry(
80098009
return false;
80108010
}
80118011

8012-
if (EntryKeyword.str() == "associated_type_protocol" ||
8012+
if (EntryKeyword.str() == "associated_conformance" ||
80138013
EntryKeyword.str() == "conditional_conformance") {
80148014
if (P.parseToken(tok::l_paren, diag::expected_sil_witness_lparen))
80158015
return true;
80168016
CanType assocOrSubject;
8017-
if (EntryKeyword.str() == "associated_type_protocol") {
8017+
if (EntryKeyword.str() == "associated_conformance") {
80188018
assocOrSubject = parseAssociatedTypePath(P, witnessState, proto);
80198019
} else {
80208020
// Parse AST type.
@@ -8061,11 +8061,11 @@ static bool parseSILWitnessTableEntry(
80618061
P.consumeToken();
80628062
}
80638063

8064-
if (EntryKeyword.str() == "associated_type_protocol")
8064+
if (EntryKeyword.str() == "associated_conformance")
80658065
witnessEntries.push_back(
8066-
SILWitnessTable::AssociatedTypeProtocolWitness{assocOrSubject,
8067-
proto,
8068-
conformance});
8066+
SILWitnessTable::AssociatedConformanceWitness{assocOrSubject,
8067+
proto,
8068+
conformance});
80698069
else
80708070
conditionalConformances.push_back(
80718071
SILWitnessTable::ConditionalConformance{assocOrSubject,
@@ -8149,7 +8149,7 @@ static bool parseSILWitnessTableEntry(
81498149
/// sil-witness-entry:
81508150
/// method SILDeclRef ':' @SILFunctionName
81518151
/// associated_type AssociatedTypeDeclName: Type
8152-
/// associated_type_protocol (AssocName: ProtocolName):
8152+
/// associated_conformance (AssocName: ProtocolName):
81538153
/// protocol-conformance|dependent
81548154
/// base_protocol ProtocolName: protocol-conformance
81558155
bool SILParserState::parseSILWitnessTable(Parser &P) {

‎lib/SIL/Utils/SILBridging.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ static_assert(sizeof(BridgedWitnessTableEntry) >= sizeof(swift::SILWitnessTable:
380380
static_assert((int)BridgedWitnessTableEntry::Kind::invalid == (int)swift::SILWitnessTable::WitnessKind::Invalid);
381381
static_assert((int)BridgedWitnessTableEntry::Kind::method == (int)swift::SILWitnessTable::WitnessKind::Method);
382382
static_assert((int)BridgedWitnessTableEntry::Kind::associatedType == (int)swift::SILWitnessTable::WitnessKind::AssociatedType);
383-
static_assert((int)BridgedWitnessTableEntry::Kind::associatedTypeProtocol == (int)swift::SILWitnessTable::WitnessKind::AssociatedTypeProtocol);
383+
static_assert((int)BridgedWitnessTableEntry::Kind::associatedConformance == (int)swift::SILWitnessTable::WitnessKind::AssociatedConformance);
384384
static_assert((int)BridgedWitnessTableEntry::Kind::baseProtocol == (int)swift::SILWitnessTable::WitnessKind::BaseProtocol);
385385

386386
BridgedOwnedString BridgedWitnessTableEntry::getDebugDescription() const {

‎lib/SILGen/SILGenType.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@ class SILGenConformance : public SILGenWitnessTable<SILGenConformance> {
675675

676676
SGM.useConformance(assocConformance);
677677

678-
Entries.push_back(SILWitnessTable::AssociatedTypeProtocolWitness{
678+
Entries.push_back(SILWitnessTable::AssociatedConformanceWitness{
679679
req.getAssociation(), req.getAssociatedRequirement(),
680680
assocConformance});
681681
}
@@ -1084,7 +1084,7 @@ class SILGenDefaultWitnessTable
10841084
if (witness.isInvalid())
10851085
return addMissingDefault();
10861086

1087-
auto entry = SILWitnessTable::AssociatedTypeProtocolWitness{
1087+
auto entry = SILWitnessTable::AssociatedConformanceWitness{
10881088
req.getAssociation(), req.getAssociatedRequirement(), witness};
10891089
DefaultWitnesses.push_back(entry);
10901090
}

0 commit comments

Comments
 (0)