Merge pull request #39013 from apple/cherry-rdar82158389

[5.5][Refactoring] Do not try to unique '_'

Author: bnbarham

lib/IDE/Refactoring.cpp

@@ -7255,7 +7255,7 @@ class AsyncConverter : private SourceEntityWalker {
                                   /*Success=*/true);
 
     addAwaitCall(CE, ArgList.ref(), Blocks.SuccessBlock, SuccessParams,
-                 InlinePatterns, HandlerDesc, /*AddDeclarations*/ true);
+                 InlinePatterns, HandlerDesc, /*AddDeclarations=*/true);
     printOutOfLineBindingPatterns(Blocks.SuccessBlock, InlinePatterns);
     convertNodes(Blocks.SuccessBlock.nodesToPrint());
     clearNames(SuccessParams);
@@ -7266,7 +7266,8 @@ class AsyncConverter : private SourceEntityWalker {
 
       // Always use the ErrParam name if none is bound.
       prepareNames(Blocks.ErrorBlock, llvm::makeArrayRef(ErrParam),
-                   ErrInlinePatterns, HandlerDesc.Type != HandlerType::RESULT);
+                   ErrInlinePatterns,
+                   /*AddIfMissing=*/HandlerDesc.Type != HandlerType::RESULT);
       preparePlaceholdersAndUnwraps(HandlerDesc, SuccessParams, ErrParam,
                                     /*Success=*/false);
 
@@ -7547,7 +7548,7 @@ class AsyncConverter : private SourceEntityWalker {
   void addCatch(const ParamDecl *ErrParam) {
     OS << "\n" << tok::r_brace << " " << tok::kw_catch << " ";
     auto ErrName = newNameFor(ErrParam, false);
-    if (!ErrName.empty()) {
+    if (!ErrName.empty() && ErrName != "_") {
       OS << tok::kw_let << " " << ErrName << " ";
     }
     OS << tok::l_brace;
@@ -7631,6 +7632,8 @@ class AsyncConverter : private SourceEntityWalker {
   /// other names in the current scope.
   Identifier createUniqueName(StringRef Name) {
     Identifier Ident = getASTContext().getIdentifier(Name);
+    if (Name == "_")
+      return Ident;
 
     auto &CurrentNames = Scopes.back().Names;
     if (CurrentNames.count(Ident)) {

test/refactoring/ConvertAsync/convert_function.swift

@@ -635,3 +635,46 @@ func twoCompletionHandlerCalls(completion: @escaping (String?, Error?) -> Void)
 // TWO-COMPLETION-HANDLER-CALLS-NEXT:   return res
 // TWO-COMPLETION-HANDLER-CALLS-NEXT:   return res
 // TWO-COMPLETION-HANDLER-CALLS-NEXT: }
+
+// RUN: %refactor-check-compiles -convert-to-async -dump-text -source-filename %s -pos=%(line+1):1 | %FileCheck -check-prefix=NESTED-IGNORED %s
+func nestedIgnored() throws {
+  simple { _ in
+    print("done")
+    simple { _ in
+      print("done")
+    }
+  }
+}
+// NESTED-IGNORED:      func nestedIgnored() async throws {
+// NESTED-IGNORED-NEXT:   let _ = await simple()
+// NESTED-IGNORED-NEXT:   print("done")
+// NESTED-IGNORED-NEXT:   let _ = await simple()
+// NESTED-IGNORED-NEXT:   print("done")
+// NESTED-IGNORED-NEXT: }
+
+// RUN: %refactor-check-compiles -convert-to-async -dump-text -source-filename %s -pos=%(line+1):1 | %FileCheck -check-prefix=IGNORED-ERR %s
+func nestedIgnoredErr() throws {
+  simpleErr(arg: "") { str, _ in
+    if str == nil {
+      print("error")
+    }
+
+    simpleErr(arg: "") { str, _ in
+      if str == nil {
+        print("error")
+      }
+    }
+  }
+}
+// IGNORED-ERR:      func nestedIgnoredErr() async throws {
+// IGNORED-ERR-NEXT:   do {
+// IGNORED-ERR-NEXT:     let str = try await simpleErr(arg: "")
+// IGNORED-ERR-NEXT:     do {
+// IGNORED-ERR-NEXT:       let str1 = try await simpleErr(arg: "")
+// IGNORED-ERR-NEXT:     } catch {
+// IGNORED-ERR-NEXT:       print("error")
+// IGNORED-ERR-NEXT:     }
+// IGNORED-ERR-NEXT:   } catch {
+// IGNORED-ERR-NEXT:     print("error")
+// IGNORED-ERR-NEXT:   }
+// IGNORED-ERR-NEXT: }