Merge pull request #2758 from etcwilde/ewilde/remove-runAsyncAndBlock

etcwilde · web-flow · commit a80267a53d34 · 2021-03-29T12:03:04.000-07:00
Remove runAsyncAndBlock
diff --git a/lldb/test/API/lang/swift/async/async_fnargs/Makefile b/lldb/test/API/lang/swift/async/async_fnargs/Makefile
@@ -1,3 +1,3 @@
 SWIFT_SOURCES := main.swift
-SWIFTFLAGS_EXTRAS := -Xfrontend -enable-experimental-concurrency
+SWIFTFLAGS_EXTRAS := -Xfrontend -enable-experimental-concurrency -parse-as-library
 include Makefile.rules
diff --git a/lldb/test/API/lang/swift/async/async_fnargs/main.swift b/lldb/test/API/lang/swift/async/async_fnargs/main.swift
@@ -11,7 +11,9 @@ func sayGeneric<T>(_ msg: T) async {
   print(msg) // And also here.
 }
 
-runAsyncAndBlock {
-  await sayHello()
-  await sayGeneric("world")
+@main struct Main {
+  static func main() async {
+    await sayHello()
+    await sayGeneric("world")
+  }
 }
diff --git a/lldb/test/API/lang/swift/async/unwind/sayhello/Makefile b/lldb/test/API/lang/swift/async/unwind/sayhello/Makefile
@@ -1,3 +1,3 @@
 SWIFT_SOURCES := main.swift
-SWIFTFLAGS_EXTRAS := -Xfrontend -enable-experimental-concurrency
+SWIFTFLAGS_EXTRAS := -Xfrontend -enable-experimental-concurrency -parse-as-library
 include Makefile.rules
diff --git a/lldb/test/API/lang/swift/async/unwind/sayhello/main.swift b/lldb/test/API/lang/swift/async/unwind/sayhello/main.swift
@@ -20,7 +20,9 @@ func sayGeneric<T>(_ msg: T) async {
   print("\(str) after calls - arg \(msg)")
 }
 
-runAsyncAndBlock {
-  await sayGeneric("world")
-  await sayHello()
+@main struct Main {
+  static func main() async {
+    await sayGeneric("world")
+    await sayHello()
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,9 @@ func sayGeneric<T>(_ msg: T) async {`
`11`	`11`	`print(msg) // And also here.`
`12`	`12`	`}`
`13`	`13`
`14`		`-runAsyncAndBlock {`
`15`		`- await sayHello()`
`16`		`- await sayGeneric("world")`
	`14`	`+@main struct Main {`
	`15`	`+ static func main() async {`
	`16`	`+ await sayHello()`
	`17`	`+ await sayGeneric("world")`
	`18`	`+ }`
`17`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,9 @@ func sayGeneric<T>(_ msg: T) async {`
`20`	`20`	`print("\(str) after calls - arg \(msg)")`
`21`	`21`	`}`
`22`	`22`
`23`		`-runAsyncAndBlock {`
`24`		`- await sayGeneric("world")`
`25`		`- await sayHello()`
	`23`	`+@main struct Main {`
	`24`	`+ static func main() async {`
	`25`	`+ await sayGeneric("world")`
	`26`	`+ await sayHello()`
	`27`	`+ }`
`26`	`28`	`}`