Merge pull request #5660 from DougGregor/disable-unstable-crashers

Disable unstable crashers

Author: DougGregor

lib/Sema/ConstraintSystem.h

@@ -2411,6 +2411,12 @@ class ExprCleaner {
         TS->Patterns.insert({ P, P->getType() });
         return { true, P };
       }
+
+      // Don't walk into statements.  This handles the BraceStmt in
+      // non-single-expr closures, so we don't walk into their body.
+      std::pair<bool, Stmt *> walkToStmtPre(Stmt *S) override {
+        return { false, S };
+      }
     };
 
     E->walk(ExprCleanserImpl(this));

lib/Sema/TypeCheckConstraints.cpp

@@ -1301,6 +1301,12 @@ void CleanupIllFormedExpressionRAII::doIt(Expr *expr, ASTContext &Context) {
       }
       return true;
     }
+
+    // Don't walk into statements.  This handles the BraceStmt in
+    // non-single-expr closures, so we don't walk into their body.
+    std::pair<bool, Stmt *> walkToStmtPre(Stmt *S) override {
+      return { false, S };
+    }
   };
 
   if (expr)

test/Constraints/closures.swift

@@ -1,5 +1,4 @@
 // RUN: %target-parse-verify-swift
-// REQUIRES: closurefixes
 
 func myMap<T1, T2>(_ array: [T1], _ fn: (T1) -> T2) -> [T2] {}
 

validation-test/compiler_crashers_fixed/28413-swift-typebase-getcanonicaltype.swift renamed to validation-test/compiler_crashers/28413-swift-typebase-getcanonicaltype.swift

@@ -5,7 +5,8 @@
 // See http://swift.org/LICENSE.txt for license information
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
-// RUN: not %target-swift-frontend %s -parse
+// RUN: not --crash %target-swift-frontend %s -parse
+// REQUIRES: SR-3149
 t c
 let : {{
 return $0

validation-test/compiler_crashers_fixed/28470-anonymous-namespace-verifier-verifychecked-swift-type-llvm-smallptrset-swift-arc.swift renamed to validation-test/compiler_crashers/28470-anonymous-namespace-verifier-verifychecked-swift-type-llvm-smallptrset-swift-arc.swift

@@ -5,7 +5,8 @@
 // See http://swift.org/LICENSE.txt for license information
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
-// RUN: not %target-swift-frontend %s -emit-ir
+// RUN: not --crash %target-swift-frontend %s -emit-ir
+// REQUIRES: SR-3149
 guard{{return $0
 == Int
 p

validation-test/compiler_crashers_fixed/28474-unreachable-executed-at-swift-lib-ast-type-cpp-1325.swift renamed to validation-test/compiler_crashers/28474-unreachable-executed-at-swift-lib-ast-type-cpp-1325.swift

@@ -5,5 +5,6 @@
 // See http://swift.org/LICENSE.txt for license information
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
-// RUN: not %target-swift-frontend %s -emit-ir
+// RUN: not --crash %target-swift-frontend %s -emit-ir
+// REQUIRE: SR-3149
 b<n([print{$0