Merge pull request #63807 from xedin/issue-63764-5.8

[5.8][BuilderTransform] Rework missing `buildWithLimitedAvailability` detection

Author: tkremenek

lib/Sema/CSSyntacticElement.cpp

@@ -1891,7 +1891,7 @@ class ResultBuilderRewriter : public SyntacticElementSolutionApplication {
   NullablePtr<Stmt> transformIf(IfStmt *ifStmt, TypeJoinExpr *join,
                                 unsigned index) {
     // FIXME: Turn this into a condition once warning is an error.
-    (void)diagnoseMissingBuildWithAvailability(ifStmt);
+    (void)diagnoseMissingBuildWithAvailability(ifStmt, join);
 
     auto *joinVar = join->getVar();
 
@@ -1993,7 +1993,8 @@ class ResultBuilderRewriter : public SyntacticElementSolutionApplication {
   /// have had the chance to adopt buildLimitedAvailability(), we'll upgrade
   /// this warning to an error.
   LLVM_NODISCARD
-  bool diagnoseMissingBuildWithAvailability(IfStmt *ifStmt) {
+  bool diagnoseMissingBuildWithAvailability(IfStmt *ifStmt,
+                                            TypeJoinExpr *join) {
     auto findAvailabilityCondition =
         [](StmtCondition stmtCond) -> const StmtConditionElement * {
       for (const auto &cond : stmtCond) {
@@ -2017,27 +2018,10 @@ class ResultBuilderRewriter : public SyntacticElementSolutionApplication {
       return false;
 
     SourceLoc loc = availabilityCond->getStartLoc();
-    Type bodyType;
-    if (availabilityCond->getAvailability()->isUnavailability()) {
-      BraceStmt *elseBody = nullptr;
-      // For #unavailable, we need to check the "else".
-      if (auto *innerIf = getAsStmt<IfStmt>(ifStmt->getElseStmt())) {
-        elseBody = castToStmt<BraceStmt>(innerIf->getThenStmt());
-      } else {
-        elseBody = castToStmt<BraceStmt>(ifStmt->getElseStmt());
-      }
-
-      Type elseBodyType =
-        solution.simplifyType(solution.getType(elseBody->getLastElement()));
-      bodyType = elseBodyType;
-    } else {
-      auto *thenBody = castToStmt<BraceStmt>(ifStmt->getThenStmt());
-      Type thenBodyType =
-          solution.simplifyType(solution.getType(thenBody->getLastElement()));
-      bodyType = thenBodyType;
-    }
-
     auto builderType = solution.simplifyType(Transform.builderType);
+    // Since all of the branches of `if` statement have to join into the same
+    // type we can just use the type of the join variable here.
+    Type bodyType = solution.getResolvedType(join->getVar());
 
     return bodyType.findIf([&](Type type) {
       auto nominal = type->getAnyNominal();

test/Constraints/result_builder_availability.swift

@@ -103,8 +103,6 @@ tuplify(true) { cond in
         globalFuncAvailableOn10_52()
       } else if false {
         globalFuncAvailableOn10_52()
-      } else {
-        globalFuncAvailableOn10_52()
       }
     }
   }
@@ -166,6 +164,11 @@ tuplifyWithAvailabilityErasure(true) { cond in
   } else {
     globalFuncAvailableOn10_52()
   }
+
+  // https://github.com/apple/swift/issues/63764
+  if #unavailable(OSX 10.52) {
+    cond // Ok
+  }
 }
 
 // rdar://97533700 – Make sure we can prefer an unavailable buildPartialBlock if