Merge pull request #20439 from slavapestov/remaining-swift3-tests

Fix remaining tests that pass -swift-version 3

Author: slavapestov

test/lit.cfg

@@ -576,7 +576,7 @@ config.target_runtime = "unknown"
 swift_reflection_test_name = 'swift-reflection-test' + config.variant_suffix
 
 def use_interpreter_for_simple_runs():
-    def make_simple_target_run(gyb=False, stdlib=False, swift3=False, opt=""):
+    def make_simple_target_run(gyb=False, stdlib=False, opt=""):
         result = ''
         if gyb:
             result += ('%empty-directory(%t) && '
@@ -592,22 +592,16 @@ def use_interpreter_for_simple_runs():
                swift_execution_tests_extra_flags))
         if stdlib:
             result += '-Xfrontend -disable-access-control '
-        if swift3:
-            result += '-swift-version 3 '
         if opt:
             result += opt + ' '
         if gyb:
             result += '%t/main.swift'
         else:
             result += '%s'
         return result
-    config.target_run_stdlib_swiftgyb_swift3 = make_simple_target_run(gyb=True, stdlib=True, swift3=True)
-    config.target_run_stdlib_swiftgyb = make_simple_target_run(gyb=True, swift3=True)
-    config.target_run_simple_swiftgyb_swift3 = make_simple_target_run(gyb=True, swift3=True)
+    config.target_run_stdlib_swiftgyb = make_simple_target_run(gyb=True)
     config.target_run_simple_swiftgyb = make_simple_target_run(gyb=True)
-    config.target_run_stdlib_swift_swift3 = make_simple_target_run(stdlib=True, swift3=True)
     config.target_run_stdlib_swift = make_simple_target_run(stdlib=True)
-    config.target_run_simple_swift_swift3 = make_simple_target_run(swift3=True)
     config.target_run_simple_opt_Osize_swift = make_simple_target_run(opt='-Osize')
     config.target_run_simple_opt_O_swift = make_simple_target_run(opt='-O')
     config.target_run_simple_swift = make_simple_target_run()
@@ -1105,26 +1099,13 @@ if not getattr(config, 'target_run_simple_swift', None):
         '%s %%t/a.out &&'
         '%s %%t/a.out'
         % (config.target_build_swift, mcp_opt, config.target_codesign, config.target_run))
-    config.target_run_simple_swift_swift3 = (
-        '%%empty-directory(%%t) && '
-        '%s %s %%s -o %%t/a.out -module-name main -swift-version 3 && '
-        '%s %%t/a.out &&'
-        '%s %%t/a.out'
-        % (config.target_build_swift, mcp_opt, config.target_codesign, config.target_run))
     config.target_run_stdlib_swift = (
         '%%empty-directory(%%t) && '
         '%s %s %%s -o %%t/a.out -module-name main '
         '-Xfrontend -disable-access-control && '
         '%s %%t/a.out &&'
         '%s %%t/a.out'
         % (config.target_build_swift, mcp_opt, config.target_codesign, config.target_run))
-    config.target_run_stdlib_swift_swift3 = (
-        '%%empty-directory(%%t) && '
-        '%s %s %%s -o %%t/a.out -module-name main '
-        '-Xfrontend -disable-access-control -swift-version 3 && '
-        '%s %%t/a.out &&'
-        '%s %%t/a.out'
-        % (config.target_build_swift, mcp_opt, config.target_codesign, config.target_run))
     config.target_run_simple_swiftgyb = (
         '%%empty-directory(%%t) && '
         '%%gyb %%s -o %%t/main.swift && '
@@ -1134,15 +1115,6 @@ if not getattr(config, 'target_run_simple_swift', None):
         '%%line-directive %%t/main.swift -- '
         '%s %%t/a.out'
         % (config.target_build_swift, mcp_opt, config.target_codesign, config.target_run))
-    config.target_run_simple_swiftgyb_swift3 = (
-        '%%empty-directory(%%t) && '
-        '%%gyb %%s -o %%t/main.swift && '
-        '%%line-directive %%t/main.swift -- '
-        '%s %s %%t/main.swift -o %%t/a.out -module-name main -swift-version 3 && '
-        '%s %%t/a.out &&'
-        '%%line-directive %%t/main.swift -- '
-        '%s %%t/a.out'
-        % (config.target_build_swift, mcp_opt, config.target_codesign, config.target_run))
     config.target_run_stdlib_swiftgyb = (
         '%%empty-directory(%%t) && '
         '%%gyb %%s -o %%t/main.swift && '
@@ -1153,16 +1125,6 @@ if not getattr(config, 'target_run_simple_swift', None):
         '%%line-directive %%t/main.swift -- '
         '%s %%t/a.out'
         % (config.target_build_swift, mcp_opt, config.target_codesign, config.target_run))
-    config.target_run_stdlib_swiftgyb_swift3 = (
-        '%%empty-directory(%%t) && '
-        '%%gyb %%s -o %%t/main.swift && '
-        '%%line-directive %%t/main.swift -- '
-        '%s %s %%t/main.swift -o %%t/a.out -module-name main -swift-version 3 '
-        '-Xfrontend -disable-access-control && '
-        '%s %%t/a.out &&'
-        '%%line-directive %%t/main.swift -- '
-        '%s %%t/a.out'
-        % (config.target_build_swift, mcp_opt, config.target_codesign, config.target_run))
 
 subst_target_jit_run = ""
 if 'swift_interpreter' in config.available_features:
@@ -1224,15 +1186,11 @@ config.substitutions.append(
 config.substitutions.append(('%target-swift-frontend', config.target_swift_frontend))
 
 
-config.substitutions.append(('%target-run-simple-swiftgyb-swift3', config.target_run_simple_swiftgyb_swift3))
 config.substitutions.append(('%target-run-simple-swiftgyb', config.target_run_simple_swiftgyb))
-config.substitutions.append(('%target-run-simple-swift-swift3', config.target_run_simple_swift_swift3))
 config.substitutions.append(('%target-run-simple-swift', config.target_run_simple_swift))
 config.substitutions.append(('%target-run-simple-opt-O-swift', config.target_run_simple_opt_O_swift))
 config.substitutions.append(('%target-run-simple-opt-Osize-swift', config.target_run_simple_opt_Osize_swift))
-config.substitutions.append(('%target-run-stdlib-swiftgyb-swift3', config.target_run_stdlib_swiftgyb_swift3))
 config.substitutions.append(('%target-run-stdlib-swiftgyb', config.target_run_stdlib_swiftgyb))
-config.substitutions.append(('%target-run-stdlib-swift-swift3', config.target_run_stdlib_swift_swift3))
 config.substitutions.append(('%target-run-stdlib-swift', config.target_run_stdlib_swift))
 config.substitutions.append(('%target-repl-run-simple-swift', subst_target_repl_run_simple_swift))
 config.substitutions.append(('%target-run', config.target_run))

test/stdlib/NewStringAppending.swift

@@ -1,4 +1,4 @@
-// RUN: %target-run-stdlib-swift-swift3 | %FileCheck %s
+// RUN: %target-run-stdlib-swift | %FileCheck %s
 // REQUIRES: executable_test
 //
 // Parts of this test depend on memory allocator specifics.  The test

validation-test/stdlib/CollectionOld.swift

@@ -1,4 +1,4 @@
-// RUN: %target-run-simple-swift-swift3 --stdlib-unittest-in-process | tee %t.txt
+// RUN: %target-run-simple-swift --stdlib-unittest-in-process | tee %t.txt
 // RUN: %FileCheck %s < %t.txt
 // note: remove the --stdlib-unittest-in-process once all the FileCheck tests
 // have been converted to StdlibUnittest

validation-test/stdlib/FixedPoint.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %target-run-stdlib-swiftgyb-swift3
+// RUN: %target-run-stdlib-swiftgyb
 // REQUIRES: executable_test
 
 import StdlibUnittest
@@ -80,7 +80,7 @@ _UnimplementedError()
 }
 
 //===----------------------------------------------------------------------===//
-// 'Int(truncatingBitPattern:)' initializer
+// 'Int(truncatingIfNeeded:)' initializer
 //===----------------------------------------------------------------------===//
 
 %{
@@ -97,11 +97,11 @@ truncating_bit_pattern_test_template = gyb.parse_template("truncating_bit_patter
 %
 %       for bit_pattern in test_bit_patterns:
 
-FixedPoint.test("${Dst}(truncatingBitPattern:) from ${Src}(${bit_pattern})") {
+FixedPoint.test("${Dst}(truncatingIfNeeded:) from ${Src}(${bit_pattern})") {
 %       input = prepare_bit_pattern(bit_pattern, src_ty.bits, src_ty.is_signed)
   let input = get${Src}(${input})
 %       input = prepare_bit_pattern(input, src_ty.bits, False)
-  let output = get${Dst}(${Dst}(truncatingBitPattern: input))
+  let output = get${Dst}(${Dst}(truncatingIfNeeded: input))
   let expected = get${Dst}(${prepare_bit_pattern(input, dst_ty.bits, dst_ty.is_signed)})
   expectEqual(expected, output)
 }

validation-test/stdlib/HashedCollectionFilter4.swift renamed to validation-test/stdlib/HashedCollectionFilter.swift

@@ -1,13 +1,11 @@
-// RUN: %target-run-stdlib-swift-swift3
+// RUN: %target-run-stdlib-swift
 // REQUIRES: executable_test
 
 import StdlibUnittest
 
 var FilterTestSuite = TestSuite("HashedCollectionFilter")
 
-FilterTestSuite.test("Dictionary.filter(_:) -> [Key: Value]")
-  .xfail(.always("Not actually running under Swift 4")).code
-{
+FilterTestSuite.test("Dictionary.filter(_:) -> [Key: Value]") {
   let d = [10: 1010, 20: 1020, 30: 1030, 40: 1040]
   // filter(_:) should produce a dictionary in Swift 4
   let f: Any = d.filter { $0.key > 20 }
@@ -21,9 +19,7 @@ FilterTestSuite.test("Dictionary.filter(_:) -> [(Key, Value)] available") {
   expectEqual(2, f.count)
 }
 
-FilterTestSuite.test("Set.filter(_:) -> Set<Element>")
-  .xfail(.always("Not actually running under Swift 4")).code
-{
+FilterTestSuite.test("Set.filter(_:) -> Set<Element>") {
   let s: Set = [10, 20, 30, 40]
   // filter(_:) should produce a set in Swift 4
   let f: Any = s.filter { $0 > 20 }
@@ -37,18 +33,14 @@ FilterTestSuite.test("Set.filter(_:) -> [Element] available") {
   expectEqual(2, f.count)
 }
 
-FilterTestSuite.test("Dictionary.keys -> Keys")
-  .xfail(.always("Not actually running under Swift 4")).code
-{
+FilterTestSuite.test("Dictionary.keys -> Keys") {
   let d = [10: 1010, 20: 1020, 30: 1030, 40: 1040]
   // .keys should produce a Dictionary.Keys in Swift 4
   let f: Any = d.keys
   expectTrue(f is Dictionary<Int, Int>.Keys)
 }
 
-FilterTestSuite.test("Dictionary.values -> Values")
-  .xfail(.always("Not actually running under Swift 4")).code
-{
+FilterTestSuite.test("Dictionary.values -> Values") {
   let d = [10: 1010, 20: 1020, 30: 1030, 40: 1040]
   // .values should produce a Dictionary.Values in Swift 4
   let f: Any = d.values

validation-test/stdlib/HashedCollectionFilter3.swift

@@ -1,4 +1,4 @@
-// RUN: %target-run-simple-swift-swift3
+// RUN: %target-run-simple-swift
 // REQUIRES: executable_test
 
 // REQUIRES: objc_interop
@@ -140,12 +140,12 @@ struct InProcessHashtableHasher : Hasher {
   mutating func squeezeHashValue<I : SignedInteger>(
     _ resultRange: Range<I>) -> I {
     // ... finalize hash value computation first...
-    return I(IntMax(_state)) // Should actually clamp the value
+    return I(Int64(_state)) // Should actually clamp the value
   }
   mutating func squeezeHashValue<I : UnsignedInteger>(
     _ resultRange: Range<I>) -> I {
     // ... finalize hash value computation first...
-    return I(UIntMax(_state)) // Should actually clamp the value
+    return I(UInt64(_state)) // Should actually clamp the value
   }
 }