Fixes after merge conflict

meg-gupta · meg-gupta · commit 0eb32f694339 · 2025-06-23T16:52:18.000-07:00
diff --git a/lib/AST/LifetimeDependence.cpp b/lib/AST/LifetimeDependence.cpp
@@ -1274,6 +1274,7 @@ class LifetimeDependenceChecker {
       break;
     case AccessorKind::Set: {
       const unsigned newValIdx = 0;
+      auto *afd = cast<AbstractFunctionDecl>(decl);
       auto *param = afd->getParameters()->get(newValIdx);
       Type paramTypeInContext =
         afd->mapTypeIntoContext(param->getInterfaceType());
@@ -1354,6 +1355,7 @@ class LifetimeDependenceChecker {
         }
       }
     }
+    auto *afd = cast<AbstractFunctionDecl>(decl);
     // Either a Get or Modify without any wrapped accessor. Handle these like a
     // read of the stored property.
     return inferLifetimeDependenceKind(

Original file line number	Diff line number	Diff line change
`@@ -1274,6 +1274,7 @@ class LifetimeDependenceChecker {`
`1274`	`1274`	`break;`
`1275`	`1275`	`case AccessorKind::Set: {`
`1276`	`1276`	`const unsigned newValIdx = 0;`
	`1277`	`+ auto *afd = cast<AbstractFunctionDecl>(decl);`
`1277`	`1278`	`auto *param = afd->getParameters()->get(newValIdx);`
`1278`	`1279`	`Type paramTypeInContext =`
`1279`	`1280`	`afd->mapTypeIntoContext(param->getInterfaceType());`
`@@ -1354,6 +1355,7 @@ class LifetimeDependenceChecker {`
`1354`	`1355`	`}`
`1355`	`1356`	`}`
`1356`	`1357`	`}`
	`1358`	`+ auto *afd = cast<AbstractFunctionDecl>(decl);`
`1357`	`1359`	`// Either a Get or Modify without any wrapped accessor. Handle these like a`
`1358`	`1360`	`// read of the stored property.`
`1359`	`1361`	`return inferLifetimeDependenceKind(`