Migrate two more Sema tests to Swift 4

Author: slavapestov

test/attr/attr_dynamic_infer.swift

@@ -1,24 +1,24 @@
-// RUN: %target-swift-ide-test -print-ast-typechecked -source-filename=%s -print-implicit-attrs -disable-objc-attr-requires-foundation-module -swift-version 3 | %FileCheck %s
+// RUN: %target-swift-ide-test -print-ast-typechecked -source-filename=%s -print-implicit-attrs -disable-objc-attr-requires-foundation-module | %FileCheck %s
 
 @objc class Super {
-  func baseFoo() {}
+  @objc dynamic func baseFoo() {}
 }
 
 // CHECK: extension Super {
 extension Super {
   // CHECK:  @objc dynamic func foo
-  func foo() { }
+  @objc func foo() { }
 
   // CHECK: @objc dynamic var prop: Super
-  var prop: Super {
+  @objc var prop: Super {
     // CHECK: @objc dynamic get
     get { return Super() }
     // CHECK: @objc dynamic set
     set { }
   }
 
   // CHECK: @objc dynamic subscript(sup: Super) -> Super
-  subscript(sup: Super) -> Super {
+  @objc subscript(sup: Super) -> Super {
     // CHECK: @objc dynamic get
     get { return sup }
     // CHECK: @objc dynamic set
@@ -60,28 +60,28 @@ extension Sub {
 
 extension FinalTests {
   // CHECK: @objc final func foo
-  final func foo() { }
+  @objc final func foo() { }
 
   // CHECK: @objc final var prop: Super
-  final var prop: Super {
+  @objc final var prop: Super {
     // CHECK: @objc final get
     get { return Super() }
     // CHECK: @objc final set
     set { }
   }
 
   // CHECK: @objc final subscript(sup: Super) -> Super
-  final subscript(sup: Super) -> Super {
+  @objc final subscript(sup: Super) -> Super {
     // CHECK: @objc final get
     get { return sup }
     // CHECK: @objc final set
     set { }
   }
 
   // CHECK: @objc static var x
-  static var x: Int = 0
+  @objc static var x: Int = 0
 
   // CHECK: @objc static func bar
-  static func bar() { }
+  @objc static func bar() { }
 }
 

test/decl/class/override.swift

@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -parse-as-library -enable-objc-interop -swift-version 3
+// RUN: %target-typecheck-verify-swift -parse-as-library -enable-objc-interop
 
 class A {
   func ret_sametype() -> Int { return 0 }
@@ -161,23 +161,23 @@ class H : G {
 }
 
 @objc class IUOTestBaseClass {
-  func none() {}
+  @objc func none() {}
 
-  func oneA(_: AnyObject) {}
-  func oneB(x: AnyObject) {}
-  func oneC(_ x: AnyObject) {}
+  @objc func oneA(_: AnyObject) {}
+  @objc func oneB(x: AnyObject) {}
+  @objc func oneC(_ x: AnyObject) {}
 
-  func manyA(_: AnyObject, _: AnyObject) {}
-  func manyB(_ a: AnyObject, b: AnyObject) {}
-  func manyC(var a: AnyObject,  // expected-error {{'var' as a parameter attribute is not allowed}}
-             var b: AnyObject) {} // expected-error {{'var' as a parameter attribute is not allowed}}
+  @objc func manyA(_: AnyObject, _: AnyObject) {}
+  @objc func manyB(_ a: AnyObject, b: AnyObject) {}
+  @objc func manyC(var a: AnyObject,  // expected-error {{'var' as a parameter attribute is not allowed}}
+                   var b: AnyObject) {} // expected-error {{'var' as a parameter attribute is not allowed}}
 
-  func result() -> AnyObject? { return nil }
-  func both(_ x: AnyObject) -> AnyObject? { return x }
+  @objc func result() -> AnyObject? { return nil }
+  @objc func both(_ x: AnyObject) -> AnyObject? { return x }
 
-  init(_: AnyObject) {}
-  init(one: AnyObject) {}
-  init(a: AnyObject, b: AnyObject) {}
+  @objc init(_: AnyObject) {}
+  @objc init(one: AnyObject) {}
+  @objc init(a: AnyObject, b: AnyObject) {}
 }
 
 class IUOTestSubclass : IUOTestBaseClass {