SILGen: Remove a usage of replaceCovariantResultType()

slavapestov · slavapestov · commit b1150924a3b5 · 2025-08-15T18:37:15.000-04:00
diff --git a/lib/SILGen/SILGenApply.cpp b/lib/SILGen/SILGenApply.cpp
@@ -148,10 +148,10 @@ getPartialApplyOfDynamicMethodFormalType(SILGenModule &SGM, SILDeclRef member,
 
   // Adjust the result type to replace dynamic-self with AnyObject.
   CanType resultType = completeMethodTy.getResult();
-  if (auto fnDecl = dyn_cast<FuncDecl>(member.getDecl())) {
-    if (fnDecl->hasDynamicSelfResult()) {
+  if (isa<FuncDecl>(member.getDecl())) {
+    if (resultType->hasDynamicSelfType()) {
       auto anyObjectTy = SGM.getASTContext().getAnyObjectType();
-      resultType = resultType->replaceCovariantResultType(anyObjectTy, 0)
+      resultType = resultType->replaceDynamicSelfType(anyObjectTy)
                              ->getCanonicalType();
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -148,10 +148,10 @@ getPartialApplyOfDynamicMethodFormalType(SILGenModule &SGM, SILDeclRef member,`
`148`	`148`
`149`	`149`	`// Adjust the result type to replace dynamic-self with AnyObject.`
`150`	`150`	`CanType resultType = completeMethodTy.getResult();`
`151`		`- if (auto fnDecl = dyn_cast<FuncDecl>(member.getDecl())) {`
`152`		`- if (fnDecl->hasDynamicSelfResult()) {`
	`151`	`+ if (isa<FuncDecl>(member.getDecl())) {`
	`152`	`+ if (resultType->hasDynamicSelfType()) {`
`153`	`153`	`auto anyObjectTy = SGM.getASTContext().getAnyObjectType();`
`154`		`- resultType = resultType->replaceCovariantResultType(anyObjectTy, 0)`
	`154`	`+ resultType = resultType->replaceDynamicSelfType(anyObjectTy)`
`155`	`155`	`->getCanonicalType();`
`156`	`156`	`}`
`157`	`157`	`}`