Gardening: Migrate test suite to GH issues: decl

Author: AnthonyLatsis

test/decl/circularity.swift

@@ -110,10 +110,10 @@ class D4 : C4, P1 { // expected-note 3 {{through reference here}}
   }
 }
 
-// SR-12236
+// https://github.com/apple/swift/issues/54662
 // N.B. This used to compile in 5.1.
-protocol SR12236 { }
-class SR12236_A { // expected-note {{through reference here}}
-    typealias Nest = SR12236 // expected-error {{circular reference}} expected-note {{through reference here}}
+protocol P_54662 { }
+class C_54662 { // expected-note {{through reference here}}
+    typealias Nest = P_54662 // expected-error {{circular reference}} expected-note {{through reference here}}
 }
-extension SR12236_A: SR12236_A.Nest { }
+extension C_54662: C_54662.Nest { }

test/decl/overload.swift

@@ -465,25 +465,29 @@ protocol r21783216b {
   associatedtype `Protocol` // ok
 }
 
-struct SR7249<T> {
-  var x: T { fatalError() } // expected-note {{previously declared}}
+// https://github.com/apple/swift/issues/49797
+
+struct S_49797<T> {
+  var x: T { get {} } // expected-note {{previously declared}}
   var y: Int // expected-note {{previously declared}}
   var z: Int // expected-note {{previously declared}}
 }
 
-extension SR7249 {
-  var x: Int { fatalError() } // expected-warning{{redeclaration of 'x' is deprecated and will be an error in Swift 5}}
-  var y: T { fatalError() } // expected-warning{{redeclaration of 'y' is deprecated and will be an error in Swift 5}}
-  var z: Int { fatalError() } // expected-error{{invalid redeclaration of 'z'}}
+extension S_49797 {
+  var x: Int { get {} } // expected-warning{{redeclaration of 'x' is deprecated and will be an error in Swift 5}}
+  var y: T { get {} } // expected-warning{{redeclaration of 'y' is deprecated and will be an error in Swift 5}}
+  var z: Int { get {} } // expected-error{{invalid redeclaration of 'z'}}
 }
 
 // A constrained extension is okay.
-extension SR7249 where T : P1 {
-  var x: Int { fatalError() }
-  var y: T { fatalError() }
-  var z: Int { fatalError() }
+extension S_49797 where T : P1 {
+  var x: Int { get {} }
+  var y: T { get {} }
+  var z: Int { get {} }
 }
 
+// https://github.com/apple/swift/issues/49798
+
 protocol P3 {
   var i: Int { get }
   subscript(i: Int) -> String { get }
@@ -494,135 +498,129 @@ extension P3 {
   subscript(i: Int) -> String { return "" }
 }
 
-struct SR7250<T> : P3 {}
+struct S_49798<T> : P3 {}
 
-extension SR7250 where T : P3 {
-  var i: Int { return 0 }
-  subscript(i: Int) -> String { return "" }
+extension S_49798 where T : P3 {
+  var i: Int { get {} }
+  subscript(i: Int) -> String { get {} }
 }
 
-// SR-10084
+// https://github.com/apple/swift/issues/52486
 
-struct SR_10084_S {
+struct S_52486 {
   let name: String
 }
 
-enum SR_10084_E {
-  case foo(SR_10084_S) // expected-note {{'foo' previously declared here}}
+enum E_52486 {
+  case foo(S_52486) // expected-note {{'foo' previously declared here}}
 
-  static func foo(_ name: String) -> SR_10084_E { // Okay
-    return .foo(SR_10084_S(name: name))
+  static func foo(_ name: String) -> E_52486 { // Okay
+    return .foo(S_52486(name: name))
   }
 
-  func foo(_ name: Bool) -> SR_10084_E { // Okay
-    return .foo(SR_10084_S(name: "Test"))
+  func foo(_ name: Bool) -> E_52486 { // Okay
+    return .foo(S_52486(name: "Test"))
   }
 
-  static func foo(_ value: SR_10084_S) -> SR_10084_E { // expected-error {{invalid redeclaration of 'foo'}}
+  static func foo(_ value: S_52486) -> E_52486 { // expected-error {{invalid redeclaration of 'foo'}}
     return .foo(value)
   }
 }
 
-enum SR_10084_E_1 {
-  static func foo(_ name: String) -> SR_10084_E_1 { // Okay
-    return .foo(SR_10084_S(name: name))
+enum E1_52486 {
+  static func foo(_ name: String) -> E1_52486 { // Okay
+    return .foo(S_52486(name: name))
   }
 
-  static func foo(_ value: SR_10084_S) -> SR_10084_E_1 { // expected-note {{'foo' previously declared here}}
+  static func foo(_ value: S_52486) -> E1_52486 { // expected-note {{'foo' previously declared here}}
     return .foo(value)
   }
 
-  case foo(SR_10084_S) // expected-error {{invalid redeclaration of 'foo'}}
+  case foo(S_52486) // expected-error {{invalid redeclaration of 'foo'}}
 }
 
-enum SR_10084_E_2 {
+enum E2_52486 {
   case fn(() -> Void) // expected-note {{'fn' previously declared here}}
 
-  static func fn(_ x: @escaping () -> Void) -> SR_10084_E_2 { // expected-error {{invalid redeclaration of 'fn'}}
-    fatalError()
-  }
+  static func fn(_ x: @escaping () -> Void) -> E2_52486 {} // expected-error {{invalid redeclaration of 'fn'}}
 
-  static func fn(_ x: @escaping () -> Int) -> SR_10084_E_2 { // Okay
-    fatalError()
-  }
+  static func fn(_ x: @escaping () -> Int) -> E2_52486 {} // Okay
 
-  static func fn(_ x: @escaping () -> Bool) -> SR_10084_E_2 { // Okay
-    fatalError()
-  }
+  static func fn(_ x: @escaping () -> Bool) -> E2_52486 {} // Okay
 }
 
 // N.B. Redeclaration checks don't see this case because `protocol A` is invalid.
-enum SR_10084_E_3 {
+enum E3_52486 {
   protocol A {} //expected-error {{protocol 'A' cannot be nested inside another declaration}}
   case A
 }
 
-enum SR_10084_E_4 {
+enum E4_52486 {
   class B {} // expected-note {{'B' previously declared here}}
   case B // expected-error {{invalid redeclaration of 'B'}}
 }
 
-enum SR_10084_E_5 {
+enum E5_52486 {
   struct C {} // expected-note {{'C' previously declared here}}
   case C // expected-error {{invalid redeclaration of 'C'}}
 }
 
 // N.B. Redeclaration checks don't see this case because `protocol D` is invalid.
-enum SR_10084_E_6 {
+enum E6_52486 {
   case D
   protocol D {} //expected-error {{protocol 'D' cannot be nested inside another declaration}}
 }
 
-enum SR_10084_E_7 {
+enum E7_52486 {
   case E // expected-note {{'E' previously declared here}}
   class E {} // expected-error {{invalid redeclaration of 'E'}} 
 }
 
-enum SR_10084_E_8 {
+enum E8_52486 {
   case F // expected-note {{'F' previously declared here}}
   struct F {} // expected-error {{invalid redeclaration of 'F'}} 
 }
 
-enum SR_10084_E_9 {
+enum E9_52486 {
   case A // expected-note {{'A' previously declared here}} expected-note {{found this candidate}}
-  static let A: SR_10084_E_9 = .A // expected-error {{invalid redeclaration of 'A'}}
+  static let A: E9_52486 = .A // expected-error {{invalid redeclaration of 'A'}}
   // expected-error@-1 {{ambiguous use of 'A'}} expected-note@-1 {{found this candidate}}
 }
 
-enum SR_10084_E_10 {
-  static let A: SR_10084_E_10 = .A // expected-note {{'A' previously declared here}}
+enum E10_52486 {
+  static let A: E10_52486 = .A // expected-note {{'A' previously declared here}}
   // expected-error@-1 {{ambiguous use of 'A'}} expected-note@-1 {{found this candidate}}
   case A // expected-error {{invalid redeclaration of 'A'}} expected-note {{found this candidate}}
 }
 
-enum SR_10084_E_11 {
+enum E11_52486 {
   case A // expected-note {{'A' previously declared here}} expected-note {{found this candidate}}
-  static var A: SR_10084_E_11 = .A // expected-error {{invalid redeclaration of 'A'}}
+  static var A: E11_52486 = .A // expected-error {{invalid redeclaration of 'A'}}
   // expected-error@-1 {{ambiguous use of 'A'}} expected-note@-1 {{found this candidate}}
 }
 
-enum SR_10084_E_12 {
-  static var A: SR_10084_E_12 = .A // expected-note {{'A' previously declared here}}
+enum E12_52486 {
+  static var A: E12_52486 = .A // expected-note {{'A' previously declared here}}
   // expected-error@-1 {{ambiguous use of 'A'}} expected-note@-1 {{found this candidate}}
   case A // expected-error {{invalid redeclaration of 'A'}} expected-note {{found this candidate}}
 }
 
-enum SR_10084_E_13 {
+enum E13_52486 {
   case X // expected-note {{'X' previously declared here}}
   struct X<T> {} // expected-error {{invalid redeclaration of 'X'}}
 }
 
-enum SR_10084_E_14 {
+enum E14_52486 {
   struct X<T> {} // expected-note {{'X' previously declared here}}
   case X // expected-error {{invalid redeclaration of 'X'}}
 }
 
-enum SR_10084_E_15 {
+enum E15_52486 {
   case Y // expected-note {{'Y' previously declared here}}
   typealias Y = Int // expected-error {{invalid redeclaration of 'Y'}}
 }
 
-enum SR_10084_E_16 {
+enum E16_52486 {
   typealias Z = Int // expected-note {{'Z' previously declared here}}
   case Z // expected-error {{invalid redeclaration of 'Z'}}
 }

test/decl/overload_swift4.swift

@@ -1,18 +1,20 @@
 // RUN: %target-typecheck-verify-swift -swift-version 4
 
-struct SR7251<T> {
+// https://github.com/apple/swift/issues/49799
+
+struct S1<T> {
   struct j {} // expected-note {{previously declared here}}
-  static var k: Int { return 0 } // expected-note {{previously declared here}}
+  static var k: Int { get {} } // expected-note {{previously declared here}}
 }
-extension SR7251 {
-  static var i: Int { return 0 }
+extension S1 {
+  static var i: Int { get {} }
   // expected-note@-1 {{previously declared here}}
   // expected-note@-2 {{previously declared here}}
 
   struct i {} // expected-warning {{redeclaration of 'i' is deprecated and will be an error in Swift 5}}
   typealias i = Int // expected-warning {{redeclaration of 'i' is deprecated and will be an error in Swift 5}}
 
-  static var j: Int { return 0 } // expected-warning {{redeclaration of 'j' is deprecated and will be an error in Swift 5}}
+  static var j: Int { get {} } // expected-warning {{redeclaration of 'j' is deprecated and will be an error in Swift 5}}
 
   struct k {} // expected-error{{invalid redeclaration of 'k'}}
 }

test/decl/overload_swift5.swift

@@ -1,24 +1,27 @@
 // RUN: %target-typecheck-verify-swift -swift-version 5
 
-struct SR7251<T> {
+// https://github.com/apple/swift/issues/49799
+
+struct S1<T> {
   struct j {} // expected-note {{previously declared here}}
-  static var k: Int { return 0 } // expected-note {{previously declared here}}
+  static var k: Int { get {} } // expected-note {{previously declared here}}
 }
-extension SR7251 {
-  static var i: Int { return 0 } // expected-note {{previously declared here}}
+extension S1 {
+  static var i: Int { get {} } // expected-note {{previously declared here}}
   struct i {} // expected-error{{invalid redeclaration of 'i'}}
-  static var j: Int { return 0 } // expected-error{{invalid redeclaration of 'j'}}
+  static var j: Int { get {} } // expected-error{{invalid redeclaration of 'j'}}
   struct k {} // expected-error{{invalid redeclaration of 'k'}}
 }
 
-struct SR7249<T> {
-    var x: T { fatalError() } // expected-note {{previously declared}}
-    var y: Int // expected-note {{previously declared}}
-    var z: Int // expected-note {{previously declared}}
-}
+// https://github.com/apple/swift/issues/49797
 
-extension SR7249 {
-    var x: Int { fatalError() } // expected-error{{invalid redeclaration of 'x'}}
-    var y: T { fatalError() } // expected-error{{invalid redeclaration of 'y'}}
-    var z: Int { fatalError() } // expected-error{{invalid redeclaration of 'z'}}
+struct S2<T> {
+  var x: T { get {} } // expected-note {{previously declared}}
+  var y: Int // expected-note {{previously declared}}
+  var z: Int // expected-note {{previously declared}}
+}
+extension S2 {
+  var x: Int { get {} } // expected-error{{invalid redeclaration of 'x'}}
+  var y: T { get {} } // expected-error{{invalid redeclaration of 'y'}}
+  var z: Int { get {} } // expected-error{{invalid redeclaration of 'z'}}
 }