Skip to content

[5.5-05142021] [Async Refactoring] Fix crash on recursive AST walk #37724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 2, 2021
Merged

[5.5-05142021] [Async Refactoring] Fix crash on recursive AST walk #37724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions include/swift/IDE/SourceEntityWalker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "swift/Basic/LLVM.h"
#include "swift/Basic/SourceLoc.h"
#include "llvm/ADT/PointerUnion.h"
#include "llvm/Support/SaveAndRestore.h"

namespace clang {
class Module;
Expand Down Expand Up @@ -189,10 +190,7 @@ class SourceEntityWalker {

/// Utility that lets us keep track of an ASTWalker when walking.
bool performWalk(ASTWalker &W, llvm::function_ref<bool(void)> DoWalk) {
Walker = &W;
SWIFT_DEFER {
Walker = nullptr;
};
llvm::SaveAndRestore<ASTWalker *> SV(Walker, &W);
return DoWalk();
}
};
Expand Down
20 changes: 20 additions & 0 deletions test/refactoring/ConvertAsync/convert_function.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,3 +289,23 @@ func testReturnHandling3(_ completion: (String?, Error?) -> Void) {
// RETURN-HANDLING3: func testReturnHandling3() async throws -> String {
// RETURN-HANDLING3-NEXT: {{^}} return (<#completion#>("", nil)){{$}}
// RETURN-HANDLING3-NEXT: }

// RUN: %refactor -convert-to-async -dump-text -source-filename %s -pos=%(line+1):1 | %FileCheck -check-prefix=RDAR78693050 %s
func rdar78693050(_ completion: () -> Void) {
simple { str in
print(str)
}
if .random() {
return completion()
}
completion()
}

// RDAR78693050: func rdar78693050() async {
// RDAR78693050-NEXT: let str = await simple()
// RDAR78693050-NEXT: print(str)
// RDAR78693050-NEXT: if .random() {
// RDAR78693050-NEXT: return
// RDAR78693050-NEXT: }
// RDAR78693050-NEXT: return
// RDAR78693050-NEXT: }