---

swift-ci · swift-ci · commit dfb3419ce3b9 · 2019-08-09T12:24:14.000-07:00
yaml --- r: 349341 b: refs/heads/master-next c: 10f7b2d h: refs/heads/master i: 349339: b543c47
diff --git a/[refs] b/[refs]
@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: 29ca77ebcb07df6b460afee38b26f2ce959bf060
+refs/heads/master-next: 10f7b2df92bbc6c41f195bdcef92b301fa2b4a18
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/array_of_tuples.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/array_of_tuples.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 20 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 1 --end 20 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/more_specialized_generic_func.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/more_specialized_generic_func.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 8 --end 40 --step 2 --select NumLeafScopes %s --expected-exit-code 0 -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 8 --end 40 --step 2 --select NumLeafScopes %s --expected-exit-code 0
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar17024694.swift b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar17024694.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1 -solver-disable-shrink -disable-constraint-solver-performance-hacks -solver-enable-operator-designated-types
+// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1
 // REQUIRES: tools-release,no_asserts
 
 _ = (2...100).reversed().filter({ $0 % 11 == 0 }).map {
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar17077404.swift b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar17077404.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1 -solver-disable-shrink -disable-constraint-solver-performance-hacks -solver-enable-operator-designated-types
+// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1
 // REQUIRES: tools-release,no_asserts
 
 func memoize<A: Hashable, R>(
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar18360240.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar18360240.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 10 --step 2 --select NumConstraintScopes --polynomial-threshold 1.5 %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 2 --end 10 --step 2 --select NumConstraintScopes --polynomial-threshold 1.5 %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar18522024.swift b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar18522024.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1 -solver-disable-shrink -disable-constraint-solver-performance-hacks -solver-enable-operator-designated-types
+// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1
 // REQUIRES: tools-release,no_asserts
 
 func test(a: [String], b: String, c: String) -> [String] {
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar18699199.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar18699199.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 10 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 1 --end 10 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 public enum E
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar18724501.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar18724501.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 5 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 1 --end 5 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar19029974.swift b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar19029974.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1 -solver-disable-shrink -disable-constraint-solver-performance-hacks -solver-enable-operator-designated-types
+// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1
 // REQUIRES: tools-release,no_asserts
 
 infix operator <*> : AdditionPrecedence
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar19181998.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar19181998.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 30 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 1 --end 30 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar19181998_nominals.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar19181998_nominals.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 30 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 1 --end 30 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar19394804.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar19394804.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 10 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 1 --end 10 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar19738292.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar19738292.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 7 --end 12 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 7 --end 12 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 // REQUIRES: rdar42650365
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar19777895.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar19777895.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 3 --end 7 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 3 --end 7 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar20233198_any.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar20233198_any.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 6 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 2 --end 6 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar20233198_explicit_overloads.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar20233198_explicit_overloads.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 6 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 2 --end 6 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar20233198_named.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar20233198_named.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 6 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 2 --end 6 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar20233198_typed.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar20233198_typed.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 6 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 2 --end 6 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar20233198_weak.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar20233198_weak.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 6 --step 1 --select NumLeafScopes %s -Xfrontend=-verify -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 2 --end 6 --step 1 --select NumLeafScopes %s -Xfrontend=-verify
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar20875936.swift b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar20875936.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1 -solver-disable-shrink -disable-constraint-solver-performance-hacks -solver-enable-operator-designated-types
+// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1
 // REQUIRES: tools-release,no_asserts
 
 let _ = Array([0].lazy.reversed().filter { $0 % 2 == 0 }.map { $0 / 2 })
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar21070413.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar21070413.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 5 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 1 --end 5 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar21328584.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar21328584.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 5 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 1 --end 5 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar21374729.swift b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar21374729.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1 -solver-disable-shrink -disable-constraint-solver-performance-hacks -solver-enable-operator-designated-types
+// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1
 // REQUIRES: tools-release,no_asserts
 
 protocol P {
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar21398466.swift b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar21398466.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1 -solver-disable-shrink -disable-constraint-solver-performance-hacks -solver-enable-operator-designated-types
+// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 // REQUIRES: rdar48061151
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar21720888.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar21720888.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 10 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 1 --end 10 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar21930551.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar21930551.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 6 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 2 --end 6 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar22022980.swift b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar22022980.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1 -swift-version 5 -solver-disable-shrink -disable-constraint-solver-performance-hacks -solver-enable-operator-designated-types
+// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1 -swift-version 5
 // REQUIRES: tools-release,no_asserts
 
 _ = [1, 3, 5, 7, 11].filter{ $0 == 1 || $0 == 3 || $0 == 11 || $0 == 1 || $0 == 3 || $0 == 11 } == [ 1, 3, 11 ]
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar22249571.swift b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar22249571.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1 -solver-disable-shrink -disable-constraint-solver-performance-hacks -solver-enable-operator-designated-types
+// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1
 // REQUIRES: tools-release,no_asserts
 
 func rdar22249571() -> [UInt8] {
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar22282851.swift b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar22282851.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1 -solver-disable-shrink -disable-constraint-solver-performance-hacks -solver-enable-operator-designated-types
+// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1
 // REQUIRES: tools-release,no_asserts
 
 struct S {
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar22466245.swift b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar22466245.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1 -solver-disable-shrink -disable-constraint-solver-performance-hacks -solver-enable-operator-designated-types
+// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1
 // REQUIRES: tools-release,no_asserts
 
 _ = (1...10).map(String.init) + [": hi"]
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar22532650.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar22532650.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 10 --end 15 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 10 --end 15 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar22626740.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar22626740.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 7 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 2 --end 7 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar22810685.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar22810685.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 5 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 1 --end 5 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar23327871.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar23327871.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 8 --end 16 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 8 --end 16 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar23620262.swift b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar23620262.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1 -solver-disable-shrink -disable-constraint-solver-performance-hacks -solver-enable-operator-designated-types
+// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1
 // REQUIRES: tools-release,no_asserts
 // REQUIRES: rdar38378503
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar24543332.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar24543332.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 5 --end 20 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 5 --end 20 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar26939465.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar26939465.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 7 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 2 --end 7 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar28018866.swift b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar28018866.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1 -solver-disable-shrink -disable-constraint-solver-performance-hacks -solver-enable-operator-designated-types
+// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1
 // REQUIRES: tools-release,no_asserts
 
 struct P {
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar29025667.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar29025667.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 7 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 2 --end 7 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar29358447.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar29358447.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 0 --end 10000 --step 1000 --typecheck --select incrementConstraintsPerContractionCounter %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 0 --end 10000 --step 1000 --typecheck --select incrementConstraintsPerContractionCounter %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar30213053.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar30213053.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 3 --end 7 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 3 --end 7 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar30389602.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar30389602.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 7 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 2 --end 7 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar30729643.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar30729643.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 15 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 1 --end 15 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar31563957.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar31563957.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 5 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 1 --end 5 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar32221800.swift b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar32221800.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1 -solver-disable-shrink -disable-constraint-solver-performance-hacks -solver-enable-operator-designated-types
+// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1
 // REQUIRES: tools-release,no_asserts
 
 func test(header_field_mark: Bool?, header_value_mark: Bool?,
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar32999041.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar32999041.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 3 --end 8 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 3 --end 8 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 // FIXME: https://bugs.swift.org/browse/SR-6997
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar33688063.swift b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar33688063.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1 -solver-disable-shrink -disable-constraint-solver-performance-hacks -solver-enable-operator-designated-types
+// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1
 // REQUIRES: tools-release,no_asserts
 
 let _ = 1 | UInt32(0) << 0 | UInt32(1) << 1 | UInt32(2) << 2 | UInt32(3) << 3 | UInt32(4) << 4
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar33806601.swift b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar33806601.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1 -solver-disable-shrink -disable-constraint-solver-performance-hacks -solver-enable-operator-designated-types
+// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1
 // REQUIRES: tools-release,no_asserts
 
 class P {
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar36838495.swift b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar36838495.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1 -solver-disable-shrink -disable-constraint-solver-performance-hacks -solver-enable-operator-designated-types
+// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1
 // REQUIRES: tools-release,no_asserts
 
 struct T {
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar40344044.swift.gyb b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar40344044.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 3 --end 20  --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
+// RUN: %scale-test --begin 3 --end 20  --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar42672946.swift b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar42672946.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1 -solver-disable-shrink -disable-constraint-solver-performance-hacks -solver-enable-operator-designated-types
+// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1
 func f(tail: UInt64, byteCount: UInt64) {
   if tail & ~(1 << ((byteCount & 7) << 3) - 1) == 0 { }
 }
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar46541800.swift b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar46541800.swift
@@ -1,5 +1,5 @@
 // RUN: %target-typecheck-verify-swift
-// RUN: %target-typecheck-verify-swift -solver-enable-operator-designated-types
+// RUN: %target-typecheck-verify-swift
 // REQUIRES: OS=macosx
 
 import simd
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar46687985.swift b/branches/master-next/validation-test/Sema/type_checker_perf/fast/rdar46687985.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1 -solver-enable-operator-designated-types
+// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1
 
 func test(_ d: Double) -> Double {
   return d + d - d - (d / 2) + (d / 2) + (d / 2.0)
diff --git a/branches/master-next/validation-test/Sema/type_checker_perf/fast/sr139.swift b/branches/master-next/validation-test/Sema/type_checker_perf/fast/sr139.swift
@@ -1,5 +1,5 @@
 // RUN: %target-typecheck-verify-swift
-// RUN: %target-swift-frontend -typecheck %s -solver-enable-operator-designated-types
+// RUN: %target-swift-frontend -typecheck %s
 
 // SR-139:
 // Infinite recursion parsing bitwise operators

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %scale-test --begin 1 --end 20 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types`
	`1`	`+// RUN: %scale-test --begin 1 --end 20 --step 1 --select NumLeafScopes %s`
`2`	`2`	`// REQUIRES: OS=macosx`
`3`	`3`	`// REQUIRES: asserts`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %scale-test --begin 8 --end 40 --step 2 --select NumLeafScopes %s --expected-exit-code 0 -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types`
	`1`	`+// RUN: %scale-test --begin 8 --end 40 --step 2 --select NumLeafScopes %s --expected-exit-code 0`
`2`	`2`	`// REQUIRES: OS=macosx`
`3`	`3`	`// REQUIRES: asserts`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1 -solver-disable-shrink -disable-constraint-solver-performance-hacks -solver-enable-operator-designated-types`
	`1`	`+// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1`
`2`	`2`	`// REQUIRES: tools-release,no_asserts`
`3`	`3`
`4`	`4`	`_ = (2...100).reversed().filter({ $0 % 11 == 0 }).map {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %scale-test --begin 2 --end 10 --step 2 --select NumConstraintScopes --polynomial-threshold 1.5 %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types`
	`1`	`+// RUN: %scale-test --begin 2 --end 10 --step 2 --select NumConstraintScopes --polynomial-threshold 1.5 %s`
`2`	`2`	`// REQUIRES: OS=macosx`
`3`	`3`	`// REQUIRES: asserts`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %scale-test --begin 1 --end 10 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types`
	`1`	`+// RUN: %scale-test --begin 1 --end 10 --step 1 --select NumLeafScopes %s`
`2`	`2`	`// REQUIRES: OS=macosx`
`3`	`3`	`// REQUIRES: asserts`
`4`	`4`	`public enum E`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %scale-test --begin 1 --end 5 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types`
	`1`	`+// RUN: %scale-test --begin 1 --end 5 --step 1 --select NumLeafScopes %s`
`2`	`2`	`// REQUIRES: OS=macosx`
`3`	`3`	`// REQUIRES: asserts`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %scale-test --begin 1 --end 30 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types`
	`1`	`+// RUN: %scale-test --begin 1 --end 30 --step 1 --select NumLeafScopes %s`
`2`	`2`	`// REQUIRES: OS=macosx`
`3`	`3`	`// REQUIRES: asserts`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %scale-test --begin 7 --end 12 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types`
	`1`	`+// RUN: %scale-test --begin 7 --end 12 --step 1 --select NumLeafScopes %s`
`2`	`2`	`// REQUIRES: OS=macosx`
`3`	`3`	`// REQUIRES: asserts`
`4`	`4`	`// REQUIRES: rdar42650365`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %scale-test --begin 3 --end 7 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types`
	`1`	`+// RUN: %scale-test --begin 3 --end 7 --step 1 --select NumLeafScopes %s`
`2`	`2`	`// REQUIRES: OS=macosx`
`3`	`3`	`// REQUIRES: asserts`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %scale-test --begin 2 --end 6 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types`
	`1`	`+// RUN: %scale-test --begin 2 --end 6 --step 1 --select NumLeafScopes %s`
`2`	`2`	`// REQUIRES: OS=macosx`
`3`	`3`	`// REQUIRES: asserts`
`4`	`4`