Merge pull request #71472 from jckarter/borrowing-switch-7

jckarter · web-flow · commit 72486c975f0e · 2024-02-12T13:18:28.000-08:00
Pass on the `BorrowingSwitch` feature flag to the SwiftSyntax parser.
diff --git a/lib/ASTGen/Sources/ASTGen/SourceFile.swift b/lib/ASTGen/Sources/ASTGen/SourceFile.swift
@@ -60,6 +60,7 @@ extension Parser.ExperimentalFeatures {
     mapFeature(.DoExpressions, to: .doExpressions)
     mapFeature(.NonescapableTypes, to: .nonescapableTypes)
     mapFeature(.TransferringArgsAndResults, to: .transferringArgsAndResults)
+    mapFeature(.BorrowingSwitch, to: .borrowingSwitch)
   }
 }
 
diff --git a/test/SILGen/borrowing_switch_subjects.swift b/test/SILGen/borrowing_switch_subjects.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-silgen -enable-experimental-feature BorrowingSwitch -disable-experimental-parser-round-trip %s | %FileCheck %s
+// RUN: %target-swift-emit-silgen -enable-experimental-feature BorrowingSwitch %s | %FileCheck %s
 
 struct Inner: ~Copyable {}
 
diff --git a/test/SILOptimizer/moveonly_borrowing_switch.swift b/test/SILOptimizer/moveonly_borrowing_switch.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -emit-sil -verify -enable-experimental-feature BorrowingSwitch -disable-experimental-parser-round-trip %s
+// RUN: %target-swift-frontend -emit-sil -verify -enable-experimental-feature BorrowingSwitch %s
 
 struct Payload: ~Copyable {
     var x: Int
diff --git a/test/SILOptimizer/moveonly_borrowing_switch_copyable_subpattern.swift b/test/SILOptimizer/moveonly_borrowing_switch_copyable_subpattern.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -emit-sil -verify -enable-experimental-feature BorrowingSwitch -disable-experimental-parser-round-trip %s
+// RUN: %target-swift-frontend -emit-sil -verify -enable-experimental-feature BorrowingSwitch %s
 
 struct Payload: ~Copyable {
     var x: Int

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ extension Parser.ExperimentalFeatures {`
`60`	`60`	`mapFeature(.DoExpressions, to: .doExpressions)`
`61`	`61`	`mapFeature(.NonescapableTypes, to: .nonescapableTypes)`
`62`	`62`	`mapFeature(.TransferringArgsAndResults, to: .transferringArgsAndResults)`
	`63`	`+ mapFeature(.BorrowingSwitch, to: .borrowingSwitch)`
`63`	`64`	`}`
`64`	`65`	`}`
`65`	`66`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-swift-emit-silgen -enable-experimental-feature BorrowingSwitch -disable-experimental-parser-round-trip %s \| %FileCheck %s`
	`1`	`+// RUN: %target-swift-emit-silgen -enable-experimental-feature BorrowingSwitch %s \| %FileCheck %s`
`2`	`2`
`3`	`3`	`struct Inner: ~Copyable {}`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-swift-frontend -emit-sil -verify -enable-experimental-feature BorrowingSwitch -disable-experimental-parser-round-trip %s`
	`1`	`+// RUN: %target-swift-frontend -emit-sil -verify -enable-experimental-feature BorrowingSwitch %s`
`2`	`2`
`3`	`3`	`struct Payload: ~Copyable {`
`4`	`4`	`var x: Int`