Merge pull request #72609 from meg-gupta/circularerrorfix

Don't query serialized source loc during lifetime dependence inference

Author: meg-gupta

lib/Sema/LifetimeDependence.cpp

@@ -409,10 +409,6 @@ LifetimeDependenceInfo::infer(AbstractFunctionDecl *afd, Type resultType) {
     return std::nullopt;
   }
 
-  auto &diags = ctx.Diags;
-  auto returnTypeRepr = afd->getResultTypeRepr();
-  auto returnLoc = returnTypeRepr ? returnTypeRepr->getLoc() : afd->getLoc();
-
   if (hasEscapableResultOrYield(afd, resultType)) {
     return std::nullopt;
   }
@@ -421,6 +417,11 @@ LifetimeDependenceInfo::infer(AbstractFunctionDecl *afd, Type resultType) {
     return std::nullopt;
   }
 
+  auto &diags = ctx.Diags;
+  auto returnTypeRepr = afd->getResultTypeRepr();
+  auto returnLoc = returnTypeRepr ? returnTypeRepr->getLoc()
+                                  : afd->getLoc(/* SerializedOK */ false);
+
   auto *cd = dyn_cast<ConstructorDecl>(afd);
   if (cd && cd->isImplicit()) {
     if (cd->getParameters()->size() == 0) {
@@ -438,7 +439,7 @@ LifetimeDependenceInfo::infer(AbstractFunctionDecl *afd, Type resultType) {
     auto selfOwnership = afd->getImplicitSelfDecl()->getValueOwnership();
     if (!isLifetimeDependenceCompatibleWithOwnership(kind, selfOwnership,
                                                      afd)) {
-      diags.diagnose(afd->getLoc(),
+      diags.diagnose(returnLoc,
                      diag::lifetime_dependence_invalid_self_ownership);
       return std::nullopt;
     }