Merge pull request #6091 from xedin/cs_crashers

Author: swift-ci

lib/Sema/ConstraintSystem.h

@@ -1444,6 +1444,9 @@ class ConstraintSystem {
   void removeInactiveConstraint(Constraint *constraint) {
     CG.removeConstraint(constraint);
     InactiveConstraints.erase(constraint);
+
+    if (solverState)
+      solverState->retiredConstraints.push_back(constraint);
   }
 
   /// Retrieve the list of inactive constraints.

validation-test/compiler_crashers/28231-swift-constraints-constraintsystem-solvesimplified.swift renamed to validation-test/compiler_crashers_fixed/28231-swift-constraints-constraintsystem-solvesimplified.swift

@@ -5,5 +5,5 @@
 // See https://swift.org/LICENSE.txt for license information
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
-// RUN: not --crash %target-swift-frontend %s -typecheck
+// RUN: not %target-swift-frontend %s -typecheck
 {func a(a)class a{deinit{a(a{

validation-test/compiler_crashers/28242-swift-constraints-constraintsystem-simplify.swift renamed to validation-test/compiler_crashers_fixed/28242-swift-constraints-constraintsystem-simplify.swift

@@ -5,5 +5,5 @@
 // See https://swift.org/LICENSE.txt for license information
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
-// RUN: not --crash %target-swift-frontend %s -typecheck
+// RUN: not %target-swift-frontend %s -typecheck
 {struct b{let a{struct D{let a=b([print{}}}}struct b

validation-test/compiler_crashers/28247-swift-constraints-constraintsystem-solverscope-solverscope.swift renamed to validation-test/compiler_crashers_fixed/28247-swift-constraints-constraintsystem-solverscope-solverscope.swift

@@ -5,5 +5,5 @@
 // See https://swift.org/LICENSE.txt for license information
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
-// RUN: not --crash %target-swift-frontend %s -typecheck
+// RUN: not %target-swift-frontend %s -typecheck
 {func a(a)class a{var _=a(a{{a{

validation-test/compiler_crashers/28359-swift-constraints-constraintsystem-addtypevariableconstraintstoworklist.swift renamed to validation-test/compiler_crashers_fixed/28359-swift-constraints-constraintsystem-addtypevariableconstraintstoworklist.swift

@@ -5,5 +5,5 @@
 // See https://swift.org/LICENSE.txt for license information
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
-// RUN: not --crash %target-swift-frontend %s -typecheck
+// RUN: not %target-swift-frontend %s -typecheck
 {class a{}func a(a)class c{func b{{{a(a{