Merge pull request #69901 from ktoso/wip-remove-redundant-isa

ktoso · web-flow · commit f6e8fd2f369d · 2023-11-16T16:31:40.000+09:00
[Distributed] Remove redundant isa check in getting SR
diff --git a/lib/AST/DistributedDecl.cpp b/lib/AST/DistributedDecl.cpp
@@ -110,7 +110,7 @@ Type swift::getSerializationRequirementTypesForMember(
   auto SerReqAssocType = DA->getAssociatedType(C.Id_SerializationRequirement)
       ->getDeclaredInterfaceType();
 
-  if (DC->getSelfProtocolDecl() || isa<ExtensionDecl>(DC)) {
+  if (DC->getSelfProtocolDecl()) {
     GenericSignature signature;
     if (auto *genericContext = member->getAsGenericContext()) {
       signature = genericContext->getGenericSignature();
diff --git a/test/Distributed/distributed_protocols_distributed_func_serialization_requirements.swift b/test/Distributed/distributed_protocols_distributed_func_serialization_requirements.swift
@@ -88,6 +88,13 @@ extension NoSerializationRequirementYet
   }
 }
 
+extension ProtocolWithChecksSeqReqDA {
+  // expected-error@+1{{result type 'NotCodable' of distributed instance method 'test4' does not conform to serialization requirement 'Codable'}}
+  distributed func test4() -> NotCodable {
+    .init()
+  }
+}
+
 // FIXME(distributed): remove the -verify-ignore-unknown
 // <unknown>:0: error: unexpected error produced: instance method 'recordReturnType' requires that 'NotCodable' conform to 'Decodable'
 // <unknown>:0: error: unexpected error produced: instance method 'recordReturnType' requires that 'NotCodable' conform to 'Encodable'

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,13 @@ extension NoSerializationRequirementYet`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`
	`91`	`+extension ProtocolWithChecksSeqReqDA {`
	`92`	`+ // expected-error@+1{{result type 'NotCodable' of distributed instance method 'test4' does not conform to serialization requirement 'Codable'}}`
	`93`	`+ distributed func test4() -> NotCodable {`
	`94`	`+ .init()`
	`95`	`+ }`
	`96`	`+}`
	`97`	`+`
`91`	`98`	`// FIXME(distributed): remove the -verify-ignore-unknown`
`92`	`99`	`// <unknown>:0: error: unexpected error produced: instance method 'recordReturnType' requires that 'NotCodable' conform to 'Decodable'`
`93`	`100`	`// <unknown>:0: error: unexpected error produced: instance method 'recordReturnType' requires that 'NotCodable' conform to 'Encodable'`