[Async Refactoring] Drop bool flag parameter binding

If we have a known bool flag parameter, drop it
from the success parameters being bound in a
refactored await call, as the async variant drops
it.

rdar://81896460

Author: hamishknight

lib/IDE/Refactoring.cpp

@@ -4982,6 +4982,10 @@ class ClosureCallbackParams final {
   bool hasBinding(const ParamDecl *Param) const {
     if (!hasParam(Param))
       return false;
+    if (auto BoolFlag = getKnownBoolFlagParam()) {
+      if (Param == BoolFlag->Param)
+        return false;
+    }
     return true;
   }
 

test/refactoring/ConvertAsync/convert_bool.swift

@@ -384,8 +384,7 @@ func testConvertBool() async throws {
   // OPT-BOOL-WITH-ERR-NEXT:   print("g \(err)")
   // OPT-BOOL-WITH-ERR-NEXT: }
 
-  // We cannot use refactor-check-compiles, as a placeholder cannot be force unwrapped.
-  // RUN: %refactor -convert-call-to-async-alternative -dump-text -source-filename %s -pos=%(line+1):3 -I %S/Inputs -I %t -target %target-triple %clang-importer-sdk-nosource | %FileCheck -check-prefix=OBJC-BOOL-WITH-ERR %s
+  // RUN: %refactor-check-compiles -convert-call-to-async-alternative -dump-text -source-filename %s -pos=%(line+1):3 -I %S/Inputs -I %t -target %target-triple %clang-importer-sdk-nosource | %FileCheck -check-prefix=OBJC-BOOL-WITH-ERR %s
   ClassWithHandlerMethods.firstBoolFlagSuccess("") { str, success, unrelated, err in
     if !unrelated {
       print(err!)
@@ -405,7 +404,7 @@ func testConvertBool() async throws {
   }
 
   // OBJC-BOOL-WITH-ERR:      do {
-  // OBJC-BOOL-WITH-ERR-NEXT:   let (str, success, unrelated) = try await ClassWithHandlerMethods.firstBoolFlagSuccess("")
+  // OBJC-BOOL-WITH-ERR-NEXT:   let (str, unrelated) = try await ClassWithHandlerMethods.firstBoolFlagSuccess("")
   // OBJC-BOOL-WITH-ERR-NEXT:   if !unrelated {
   // OBJC-BOOL-WITH-ERR-NEXT:     print(<#err#>!)
   // OBJC-BOOL-WITH-ERR-NEXT:   }
@@ -416,8 +415,7 @@ func testConvertBool() async throws {
   // OBJC-BOOL-WITH-ERR-NEXT:   print(err)
   // OBJC-BOOL-WITH-ERR-NEXT: }
 
-  // We cannot use refactor-check-compiles, as a placeholder cannot be force unwrapped.
-  // RUN: %refactor -convert-call-to-async-alternative -dump-text -source-filename %s -pos=%(line+1):3 -I %S/Inputs -I %t -target %target-triple %clang-importer-sdk-nosource | %FileCheck -check-prefix=OBJC-BOOL-WITH-ERR2 %s
+  // RUN: %refactor-check-compiles -convert-call-to-async-alternative -dump-text -source-filename %s -pos=%(line+1):3 -I %S/Inputs -I %t -target %target-triple %clang-importer-sdk-nosource | %FileCheck -check-prefix=OBJC-BOOL-WITH-ERR2 %s
   ClassWithHandlerMethods.secondBoolFlagFailure("") { str, unrelated, failure, err in
     if unrelated {
       print(err!)
@@ -446,13 +444,13 @@ func testConvertBool() async throws {
   }
 
   // OBJC-BOOL-WITH-ERR2:      do {
-  // OBJC-BOOL-WITH-ERR2-NEXT:   let (str, unrelated, failure) = try await ClassWithHandlerMethods.secondBoolFlagFailure("")
+  // OBJC-BOOL-WITH-ERR2-NEXT:   let (str, unrelated) = try await ClassWithHandlerMethods.secondBoolFlagFailure("")
   // OBJC-BOOL-WITH-ERR2-NEXT:   if unrelated {
   // OBJC-BOOL-WITH-ERR2-NEXT:     print(<#err#>!)
   // OBJC-BOOL-WITH-ERR2-NEXT:   }
   // OBJC-BOOL-WITH-ERR2-NEXT:   print("woo")
   // OBJC-BOOL-WITH-ERR2-NEXT:   print("also woo")
-  // OBJC-BOOL-WITH-ERR2-NEXT:   if failure && <#err#> == nil {
+  // OBJC-BOOL-WITH-ERR2-NEXT:   if <#failure#> && <#err#> == nil {
   // OBJC-BOOL-WITH-ERR2-NEXT:     print("wat")
   // OBJC-BOOL-WITH-ERR2-NEXT:   }
   // OBJC-BOOL-WITH-ERR2-NEXT: } catch let err {