SIL: rename AssociatedTypeProtocolWitness -> AssociatedConformanceWitness in SILWitnessTable

eeckstein · eeckstein · commit 550237301823 · 2024-10-02T07:10:30.000+02:00
To be consistent with the naming convention in the AST
diff --git a/include/swift/SIL/SILBridging.h b/include/swift/SIL/SILBridging.h
@@ -1080,7 +1080,7 @@ struct BridgedWitnessTableEntry {
     invalid,
     method,
     associatedType,
-    associatedTypeProtocol,
+    associatedConformance,
     baseProtocol
   };
 
diff --git a/include/swift/SIL/SILWitnessTable.h b/include/swift/SIL/SILWitnessTable.h
@@ -63,7 +63,7 @@ class SILWitnessTable : public llvm::ilist_node<SILWitnessTable>,
   
   /// A witness table entry describing the witness for an associated type's
   /// protocol requirement.
-  struct AssociatedTypeProtocolWitness {
+  struct AssociatedConformanceWitness {
     /// The associated type required.  A dependent type in the protocol's
     /// context.
     CanType Requirement;
@@ -88,7 +88,7 @@ class SILWitnessTable : public llvm::ilist_node<SILWitnessTable>,
     Invalid,
     Method,
     AssociatedType,
-    AssociatedTypeProtocol,
+    AssociatedConformance,
     BaseProtocol
   } ENUM_EXTENSIBILITY_ATTR(open);
   
@@ -98,7 +98,7 @@ class SILWitnessTable : public llvm::ilist_node<SILWitnessTable>,
     union {
       MethodWitness Method;
       AssociatedTypeWitness AssociatedType;
-      AssociatedTypeProtocolWitness AssociatedTypeProtocol;
+      AssociatedConformanceWitness AssociatedConformance;
       BaseProtocolWitness BaseProtocol;
     };
     
@@ -113,9 +113,9 @@ class SILWitnessTable : public llvm::ilist_node<SILWitnessTable>,
       : Kind(WitnessKind::AssociatedType), AssociatedType(AssociatedType)
     {}
     
-    Entry(const AssociatedTypeProtocolWitness &AssociatedTypeProtocol)
-      : Kind(WitnessKind::AssociatedTypeProtocol),
-        AssociatedTypeProtocol(AssociatedTypeProtocol)
+    Entry(const AssociatedConformanceWitness &AssociatedConformance)
+      : Kind(WitnessKind::AssociatedConformance),
+        AssociatedConformance(AssociatedConformance)
     {}
     
     Entry(const BaseProtocolWitness &BaseProtocol)
@@ -135,10 +135,9 @@ class SILWitnessTable : public llvm::ilist_node<SILWitnessTable>,
       assert(Kind == WitnessKind::AssociatedType);
       return AssociatedType;
     }
-    const AssociatedTypeProtocolWitness &
-    getAssociatedTypeProtocolWitness() const {
-      assert(Kind == WitnessKind::AssociatedTypeProtocol);
-      return AssociatedTypeProtocol;
+    const AssociatedConformanceWitness &getAssociatedConformanceWitness() const {
+      assert(Kind == WitnessKind::AssociatedConformance);
+      return AssociatedConformance;
     }
     const BaseProtocolWitness &getBaseProtocolWitness() const {
       assert(Kind == WitnessKind::BaseProtocol);
diff --git a/lib/IRGen/GenMeta.cpp b/lib/IRGen/GenMeta.cpp
@@ -1159,12 +1159,12 @@ namespace {
 
       for (auto &entry : DefaultWitnesses->getEntries()) {
         if (!entry.isValid() ||
-            entry.getKind() != SILWitnessTable::AssociatedTypeProtocol ||
-            entry.getAssociatedTypeProtocolWitness().Protocol != requirement ||
-            entry.getAssociatedTypeProtocolWitness().Requirement != association)
+            entry.getKind() != SILWitnessTable::AssociatedConformance ||
+            entry.getAssociatedConformanceWitness().Protocol != requirement ||
+            entry.getAssociatedConformanceWitness().Requirement != association)
           continue;
 
-        auto witness = entry.getAssociatedTypeProtocolWitness().Witness;
+        auto witness = entry.getAssociatedConformanceWitness().Witness;
         AssociatedConformance conformance(Proto, association, requirement);
         defineDefaultAssociatedConformanceAccessFunction(conformance, witness);
         return IGM.getMangledAssociatedConformance(nullptr, conformance);
diff --git a/lib/IRGen/GenProto.cpp b/lib/IRGen/GenProto.cpp
@@ -1719,9 +1719,9 @@ class AccessorConformanceInfo : public ConformanceInfo {
           requirement.getAssociatedRequirement());
 
 #ifndef NDEBUG
-      assert(entry.getKind() == SILWitnessTable::AssociatedTypeProtocol
+      assert(entry.getKind() == SILWitnessTable::AssociatedConformance
              && "sil witness table does not match protocol");
-      auto associatedWitness = entry.getAssociatedTypeProtocolWitness();
+      auto associatedWitness = entry.getAssociatedConformanceWitness();
       assert(associatedWitness.Requirement == requirement.getAssociation()
              && "sil witness table does not match protocol");
       assert(associatedWitness.Protocol ==
@@ -1952,8 +1952,8 @@ void ResilientWitnessTableBuilder::collectResilientWitnesses(
     }
 
     // Associated conformance access function.
-    if (entry.getKind() == SILWitnessTable::AssociatedTypeProtocol) {
-      const auto &witness = entry.getAssociatedTypeProtocolWitness();
+    if (entry.getKind() == SILWitnessTable::AssociatedConformance) {
+      const auto &witness = entry.getAssociatedConformanceWitness();
 
       auto associate =
         ConformanceInContext.getAssociatedType(
@@ -2265,9 +2265,9 @@ namespace {
             IGM.getAddrOfLLVMVariableOrGOTEquivalent(
               LinkEntity::forAssociatedTypeDescriptor(assocType));
           B.addRelativeAddress(assocTypeDescriptor);
-        } else if (entry.getKind() == SILWitnessTable::AssociatedTypeProtocol) {
+        } else if (entry.getKind() == SILWitnessTable::AssociatedConformance) {
           // Associated conformance descriptor.
-          const auto &witness = entry.getAssociatedTypeProtocolWitness();
+          const auto &witness = entry.getAssociatedConformanceWitness();
 
           AssociatedConformance requirement(SILWT->getProtocol(),
                                             witness.Requirement,
@@ -2538,7 +2538,7 @@ static bool isConstantWitnessTable(SILWitnessTable *wt) {
       continue;
 
     case SILWitnessTable::AssociatedType:
-    case SILWitnessTable::AssociatedTypeProtocol:
+    case SILWitnessTable::AssociatedConformance:
       // Associated types and conformances are cached in the witness table.
       // FIXME: If we start emitting constant references to here,
       // we will need to ask the witness table builder for this information.
diff --git a/lib/SIL/IR/Linker.cpp b/lib/SIL/IR/Linker.cpp
@@ -335,8 +335,8 @@ void SILLinkerVisitor::visitProtocolConformance(
       maybeVisitRelatedConformance(ProtocolConformanceRef(baseConformance));
       break;
     }
-    case SILWitnessTable::WitnessKind::AssociatedTypeProtocol: {
-      auto assocConformance = E.getAssociatedTypeProtocolWitness().Witness;
+    case SILWitnessTable::WitnessKind::AssociatedConformance: {
+      auto assocConformance = E.getAssociatedConformanceWitness().Witness;
       maybeVisitRelatedConformance(assocConformance);
       break;
     }
diff --git a/lib/SIL/IR/SILPrinter.cpp b/lib/SIL/IR/SILPrinter.cpp
@@ -4149,10 +4149,10 @@ void SILWitnessTable::Entry::print(llvm::raw_ostream &out, bool verbose,
     assocWitness.Witness->print(out, options);
     break;
   }
-  case WitnessKind::AssociatedTypeProtocol: {
-    // associated_type_protocol (AssociatedTypeName: Protocol): <conformance>
-    auto &assocProtoWitness = getAssociatedTypeProtocolWitness();
-    out << "associated_type_protocol (";
+  case WitnessKind::AssociatedConformance: {
+    // associated_conformance (AssociatedTypeName: Protocol): <conformance>
+    auto &assocProtoWitness = getAssociatedConformanceWitness();
+    out << "associated_conformance (";
     (void) printAssociatedTypePath(out, assocProtoWitness.Requirement);
     out << ": " << assocProtoWitness.Protocol->getName() << "): ";
     if (assocProtoWitness.Witness.isConcrete())
diff --git a/lib/SIL/IR/SILWitnessTable.cpp b/lib/SIL/IR/SILWitnessTable.cpp
@@ -132,7 +132,7 @@ SILWitnessTable::~SILWitnessTable() {
       }
       break;
     case AssociatedType:
-    case AssociatedTypeProtocol:
+    case AssociatedConformance:
     case BaseProtocol:
     case Invalid:
       break;
@@ -160,7 +160,7 @@ void SILWitnessTable::convertToDefinition(
       }
       break;
     case AssociatedType:
-    case AssociatedTypeProtocol:
+    case AssociatedConformance:
     case BaseProtocol:
     case Invalid:
       break;
diff --git a/lib/SIL/Parser/ParseSIL.cpp b/lib/SIL/Parser/ParseSIL.cpp
@@ -7983,7 +7983,7 @@ static bool parseSILWitnessTableEntry(
   if (P.parseIdentifier(EntryKeyword, KeywordLoc,
                         /*diagnoseDollarPrefix=*/false,
                         diag::expected_tok_in_sil_instr,
-                        "method, associated_type, associated_type_protocol"
+                        "method, associated_type, associated_conformance"
                         ", base_protocol, no_default"))
     return true;
 
@@ -8009,12 +8009,12 @@ static bool parseSILWitnessTableEntry(
     return false;
   }
 
-  if (EntryKeyword.str() == "associated_type_protocol" ||
+  if (EntryKeyword.str() == "associated_conformance" ||
       EntryKeyword.str() == "conditional_conformance") {
     if (P.parseToken(tok::l_paren, diag::expected_sil_witness_lparen))
       return true;
     CanType assocOrSubject;
-    if (EntryKeyword.str() == "associated_type_protocol") {
+    if (EntryKeyword.str() == "associated_conformance") {
       assocOrSubject = parseAssociatedTypePath(P, witnessState, proto);
     } else {
       // Parse AST type.
@@ -8061,11 +8061,11 @@ static bool parseSILWitnessTableEntry(
       P.consumeToken();
     }
 
-    if (EntryKeyword.str() == "associated_type_protocol")
+    if (EntryKeyword.str() == "associated_conformance")
       witnessEntries.push_back(
-          SILWitnessTable::AssociatedTypeProtocolWitness{assocOrSubject,
-                                                         proto,
-                                                         conformance});
+          SILWitnessTable::AssociatedConformanceWitness{assocOrSubject,
+                                                        proto,
+                                                        conformance});
     else
       conditionalConformances.push_back(
           SILWitnessTable::ConditionalConformance{assocOrSubject,
@@ -8149,7 +8149,7 @@ static bool parseSILWitnessTableEntry(
 /// sil-witness-entry:
 ///   method SILDeclRef ':' @SILFunctionName
 ///   associated_type AssociatedTypeDeclName: Type
-///   associated_type_protocol (AssocName: ProtocolName):
+///   associated_conformance (AssocName: ProtocolName):
 ///                              protocol-conformance|dependent
 ///   base_protocol ProtocolName: protocol-conformance
 bool SILParserState::parseSILWitnessTable(Parser &P) {
diff --git a/lib/SIL/Utils/SILBridging.cpp b/lib/SIL/Utils/SILBridging.cpp
@@ -380,7 +380,7 @@ static_assert(sizeof(BridgedWitnessTableEntry) >= sizeof(swift::SILWitnessTable:
 static_assert((int)BridgedWitnessTableEntry::Kind::invalid == (int)swift::SILWitnessTable::WitnessKind::Invalid);
 static_assert((int)BridgedWitnessTableEntry::Kind::method == (int)swift::SILWitnessTable::WitnessKind::Method);
 static_assert((int)BridgedWitnessTableEntry::Kind::associatedType == (int)swift::SILWitnessTable::WitnessKind::AssociatedType);
-static_assert((int)BridgedWitnessTableEntry::Kind::associatedTypeProtocol == (int)swift::SILWitnessTable::WitnessKind::AssociatedTypeProtocol);
+static_assert((int)BridgedWitnessTableEntry::Kind::associatedConformance == (int)swift::SILWitnessTable::WitnessKind::AssociatedConformance);
 static_assert((int)BridgedWitnessTableEntry::Kind::baseProtocol == (int)swift::SILWitnessTable::WitnessKind::BaseProtocol);
 
 BridgedOwnedString BridgedWitnessTableEntry::getDebugDescription() const {
diff --git a/lib/SILGen/SILGenType.cpp b/lib/SILGen/SILGenType.cpp
@@ -675,7 +675,7 @@ class SILGenConformance : public SILGenWitnessTable<SILGenConformance> {
 
     SGM.useConformance(assocConformance);
 
-    Entries.push_back(SILWitnessTable::AssociatedTypeProtocolWitness{
+    Entries.push_back(SILWitnessTable::AssociatedConformanceWitness{
         req.getAssociation(), req.getAssociatedRequirement(),
         assocConformance});
   }
@@ -1084,7 +1084,7 @@ class SILGenDefaultWitnessTable
     if (witness.isInvalid())
       return addMissingDefault();
 
-    auto entry = SILWitnessTable::AssociatedTypeProtocolWitness{
+    auto entry = SILWitnessTable::AssociatedConformanceWitness{
         req.getAssociation(), req.getAssociatedRequirement(), witness};
     DefaultWitnesses.push_back(entry);
   }
diff --git a/lib/SILOptimizer/IPO/DeadFunctionElimination.cpp b/lib/SILOptimizer/IPO/DeadFunctionElimination.cpp
@@ -191,9 +191,9 @@ class DeadFunctionAndGlobalElimination {
           }
         } break;
 
-        case SILWitnessTable::AssociatedTypeProtocol: {
+        case SILWitnessTable::AssociatedConformance: {
           ProtocolConformanceRef CRef =
-             entry.getAssociatedTypeProtocolWitness().Witness;
+             entry.getAssociatedConformanceWitness().Witness;
           if (CRef.isConcrete())
             ensureAliveConformance(CRef.getConcrete());
           break;
diff --git a/lib/Serialization/DeserializeSIL.cpp b/lib/Serialization/DeserializeSIL.cpp
@@ -4073,7 +4073,7 @@ void SILDeserializer::readWitnessTableEntries(
       CanType type = MF->getType(assocId)->getCanonicalType();
       ProtocolDecl *proto = cast<ProtocolDecl>(MF->getDecl(protoId));
       auto conformance = MF->getConformance(conformanceId);
-      witnessEntries.push_back(SILWitnessTable::AssociatedTypeProtocolWitness{
+      witnessEntries.push_back(SILWitnessTable::AssociatedConformanceWitness{
         type, proto, conformance
       });
     } else if (kind == SIL_WITNESS_ASSOC_ENTRY) {
diff --git a/lib/Serialization/SerializeSIL.cpp b/lib/Serialization/SerializeSIL.cpp
@@ -3057,8 +3057,8 @@ void SILSerializer::writeSILWitnessTableEntry(
     return;
   }
 
-  if (entry.getKind() == SILWitnessTable::AssociatedTypeProtocol) {
-    auto &assoc = entry.getAssociatedTypeProtocolWitness();
+  if (entry.getKind() == SILWitnessTable::AssociatedConformance) {
+    auto &assoc = entry.getAssociatedConformanceWitness();
 
     auto requirementID = S.addTypeRef(assoc.Requirement);
     auto protocolID = S.addDeclRef(assoc.Protocol);
diff --git a/stdlib/public/runtime/Metadata.cpp b/stdlib/public/runtime/Metadata.cpp
@@ -5862,9 +5862,9 @@ static const unsigned swift_ptrauth_key_associated_type =
 
 /// Given an unsigned pointer to an associated-type protocol witness,
 /// fill in the appropriate slot in the witness table we're building.
-static void initAssociatedTypeProtocolWitness(const Metadata **slot,
-                                              const Metadata *witness,
-                                              const ProtocolRequirement &reqt) {
+static void initAssociatedConformanceWitness(const Metadata **slot,
+                                             const Metadata *witness,
+                                             const ProtocolRequirement &reqt) {
   assert(reqt.Flags.getKind() ==
            ProtocolRequirementFlags::Kind::AssociatedTypeAccessFunction);
   // FIXME: this should use ptrauth_key_process_independent_data
@@ -5918,11 +5918,11 @@ static void initProtocolWitness(void **slot, void *witness,
     return;
 
   case ProtocolRequirementFlags::Kind::AssociatedTypeAccessFunction:
-    initAssociatedTypeProtocolWitness(reinterpret_cast<const Metadata **>(
+    initAssociatedConformanceWitness(reinterpret_cast<const Metadata **>(
                                         const_cast<const void**>(slot)),
-                                      reinterpret_cast<const Metadata *>(
+                                     reinterpret_cast<const Metadata *>(
                                         witness),
-                                      reqt);
+                                     reqt);
     return;
   }
   swift_unreachable("bad witness kind");
diff --git a/test/IRGen/protocol_resilience.sil b/test/IRGen/protocol_resilience.sil
@@ -301,7 +301,7 @@ bb0(%0 : $*ConformingStruct):
 }
 
 sil_witness_table ConformingStruct : ResilientProtocol module protocol_resilience {
-  associated_type_protocol (T: OtherResilientProtocol): ResilientConformingType: OtherResilientProtocol module protocol_resilience
+  associated_conformance (T: OtherResilientProtocol): ResilientConformingType: OtherResilientProtocol module protocol_resilience
 
   associated_type T: ResilientConformingType
   method #ResilientProtocol.noDefaultA: @noDefaultA
@@ -413,7 +413,7 @@ struct ConformsWithResilientAssoc : HasResilientAssoc {
 }
 
 sil_witness_table ConformsWithResilientAssoc : HasResilientAssoc module protocol_resilience {
-  associated_type_protocol (T: OtherResilientProtocol): ResilientConformingType: OtherResilientProtocol module protocol_resilience
+  associated_conformance (T: OtherResilientProtocol): ResilientConformingType: OtherResilientProtocol module protocol_resilience
   associated_type T: ResilientConformingType
 }
 
diff --git a/test/IRGen/ptrauth-protocols.sil b/test/IRGen/ptrauth-protocols.sil
@@ -51,7 +51,7 @@ bb0(%0 : $*B, %1 : $@thick B.Type):
 }
 
 sil_witness_table B : Q module test {
-  associated_type_protocol (Assoc: P): A: P module main
+  associated_conformance (Assoc: P): A: P module main
   associated_type Assoc: A
   method #Q.init!allocator: @B_init
 }
diff --git a/test/SIL/Parser/default_witness_tables.sil b/test/SIL/Parser/default_witness_tables.sil
@@ -48,7 +48,7 @@ bb0(%0 : $*Self):
 
 
 // CHECK-LABEL: sil_default_witness_table ResilientProtocol {
-// CHECK: associated_type_protocol (T: Proto): Wrapper<Self>: specialize <Self> (<T> Wrapper<T>: Proto module witness_tables)
+// CHECK: associated_conformance (T: Proto): Wrapper<Self>: specialize <Self> (<T> Wrapper<T>: Proto module witness_tables)
 // CHECK: associated_type T: Wrapper<Self>
 // CHECK: no_default
 // CHECK: no_default
@@ -58,7 +58,7 @@ bb0(%0 : $*Self):
 // CHECK: }
 
 sil_default_witness_table ResilientProtocol {
-  associated_type_protocol (T: Proto): Wrapper<Self>: specialize <Self> (<T> Wrapper<T>: Proto module witness_tables)
+  associated_conformance (T: Proto): Wrapper<Self>: specialize <Self> (<T> Wrapper<T>: Proto module witness_tables)
   associated_type T: Wrapper<Self>
   no_default
   no_default
diff --git a/test/SIL/Parser/specialized_conformance.sil b/test/SIL/Parser/specialized_conformance.sil
@@ -29,7 +29,7 @@ sil_witness_table hidden <T where T : Inner> Generic<T>: Inner module sil {
 }
 
 sil_witness_table hidden <U where U : Outer> Concrete<U>: Outer module sil {
-  associated_type_protocol (T: Inner): Generic<U.T>: specialize <U.T> (<T where T : Inner> Generic<T>: Inner module main)
+  associated_conformance (T: Inner): Generic<U.T>: specialize <U.T> (<T where T : Inner> Generic<T>: Inner module main)
   associated_type T: Generic<U.T>
 }
 
diff --git a/test/SIL/Parser/witness_specialize.sil b/test/SIL/Parser/witness_specialize.sil
@@ -20,8 +20,8 @@ struct ConformsWithDependentAssocType2<DD> : AssocTypeWithReqt {
 
 // CHECK-LABEL: sil_witness_table <DD> ConformsWithDependentAssocType2<DD>: AssocTypeWithReqt module
 // CHECK: associated_type AssocType: GenericAssocType<DD>
-// CHECK: associated_type_protocol (AssocType: AssocReqt): GenericAssocType<DD>: specialize <DD> (<T> GenericAssocType<T>: AssocReqt module
+// CHECK: associated_conformance (AssocType: AssocReqt): GenericAssocType<DD>: specialize <DD> (<T> GenericAssocType<T>: AssocReqt module
 sil_witness_table <DD> ConformsWithDependentAssocType2<DD>: AssocTypeWithReqt module witness_specialize {
   associated_type AssocType: GenericAssocType<DD>
-  associated_type_protocol (AssocType: AssocReqt): GenericAssocType<DD>: specialize <DD> (<T> GenericAssocType<T>: AssocReqt module witness_specialize)
+  associated_conformance (AssocType: AssocReqt): GenericAssocType<DD>: specialize <DD> (<T> GenericAssocType<T>: AssocReqt module witness_specialize)
 }
diff --git a/test/SIL/Parser/witness_tables.sil b/test/SIL/Parser/witness_tables.sil
@@ -66,11 +66,11 @@ sil_witness_table InheritedConformance: InheritedProtocol1 module witness_tables
 
 // CHECK-LABEL: sil_witness_table shared InheritedConformance: AnyProtocol module
 // CHECK: associated_type AssocType: SomeAssoc
-// CHECK: associated_type_protocol (AssocWithReqt: AssocReqt): ConformingAssoc: AssocReqt module
+// CHECK: associated_conformance (AssocWithReqt: AssocReqt): ConformingAssoc: AssocReqt module
 // CHECK: }
 sil_witness_table shared InheritedConformance: AnyProtocol module witness_tables {
   associated_type AssocType: SomeAssoc
-  associated_type_protocol (AssocWithReqt: AssocReqt): ConformingAssoc: AssocReqt module witness_tables
+  associated_conformance (AssocWithReqt: AssocReqt): ConformingAssoc: AssocReqt module witness_tables
 }
 
 // CHECK-LABEL: sil_witness_table InheritedConformance2: InheritedProtocol1 module witness_tables
diff --git a/test/SIL/Parser/witness_with_inherited_gp.sil b/test/SIL/Parser/witness_with_inherited_gp.sil
diff --git a/test/SIL/Serialization/witness_tables.sil b/test/SIL/Serialization/witness_tables.sil
diff --git a/test/SILGen/class_conforms_with_default_implementation.swift b/test/SILGen/class_conforms_with_default_implementation.swift
diff --git a/test/SILGen/external-associated-type-conformance.swift b/test/SILGen/external-associated-type-conformance.swift
diff --git a/test/SILGen/protocol_resilience.swift b/test/SILGen/protocol_resilience.swift
diff --git a/test/SILGen/synthesized_conformance_enum.swift b/test/SILGen/synthesized_conformance_enum.swift
diff --git a/test/SILGen/witness_tables.swift b/test/SILGen/witness_tables.swift
diff --git a/test/SILGen/witnesses_canonical.swift b/test/SILGen/witnesses_canonical.swift
diff --git a/test/SILGen/witnesses_refinement.swift b/test/SILGen/witnesses_refinement.swift
diff --git a/test/Serialization/Inputs/def_basic.sil b/test/Serialization/Inputs/def_basic.sil

Original file line number	Diff line number	Diff line change
`@@ -335,8 +335,8 @@ void SILLinkerVisitor::visitProtocolConformance(`
`335`	`335`	`maybeVisitRelatedConformance(ProtocolConformanceRef(baseConformance));`
`336`	`336`	`break;`
`337`	`337`	`}`
`338`		`- case SILWitnessTable::WitnessKind::AssociatedTypeProtocol: {`
`339`		`- auto assocConformance = E.getAssociatedTypeProtocolWitness().Witness;`
	`338`	`+ case SILWitnessTable::WitnessKind::AssociatedConformance: {`
	`339`	`+ auto assocConformance = E.getAssociatedConformanceWitness().Witness;`
`340`	`340`	`maybeVisitRelatedConformance(assocConformance);`
`341`	`341`	`break;`
`342`	`342`	`}`
Original file line number	Diff line number	Diff line change
`@@ -675,7 +675,7 @@ class SILGenConformance : public SILGenWitnessTable<SILGenConformance> {`
`675`	`675`
`676`	`676`	`SGM.useConformance(assocConformance);`
`677`	`677`
`678`		`- Entries.push_back(SILWitnessTable::AssociatedTypeProtocolWitness{`
	`678`	`+ Entries.push_back(SILWitnessTable::AssociatedConformanceWitness{`
`679`	`679`	`req.getAssociation(), req.getAssociatedRequirement(),`
`680`	`680`	`assocConformance});`
`681`	`681`	`}`
`@@ -1084,7 +1084,7 @@ class SILGenDefaultWitnessTable`
`1084`	`1084`	`if (witness.isInvalid())`
`1085`	`1085`	`return addMissingDefault();`
`1086`	`1086`
`1087`		`- auto entry = SILWitnessTable::AssociatedTypeProtocolWitness{`
	`1087`	`+ auto entry = SILWitnessTable::AssociatedConformanceWitness{`
`1088`	`1088`	`req.getAssociation(), req.getAssociatedRequirement(), witness};`
`1089`	`1089`	`DefaultWitnesses.push_back(entry);`
`1090`	`1090`	`}`