Merge pull request #296 from jtbandes/fix-tests

Fix duplicate error and re-categorize test

Author: nadavrot

lib/Sema/TypeCheckDecl.cpp

@@ -3194,12 +3194,11 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
   void visitAssociatedTypeDecl(AssociatedTypeDecl *assocType) {
     if (assocType->isBeingTypeChecked()) {
 
-      if (!assocType->hasType()) {
+      if (!assocType->isInvalid()) {
         assocType->setInvalid();
         assocType->overwriteType(ErrorType::get(TC.Context));
+        TC.diagnose(assocType->getLoc(), diag::circular_type_alias, assocType->getName());
       }
-
-      TC.diagnose(assocType->getLoc(), diag::circular_type_alias, assocType->getName());
       return;
     }
 

validation-test/compiler_crashers/1741-swift-constraints-constraintsystem-simplifymemberconstraint.swift renamed to validation-test/compiler_crashers_fixed/1741-swift-constraints-constraintsystem-simplifymemberconstraint.swift

@@ -1,4 +1,4 @@
-// RUN: not --crash %target-swift-frontend %s -parse
+// RUN: not %target-swift-frontend %s -parse
 
 // Distributed under the terms of the MIT license
 // Test case submitted to project by https://github.com/practicalswift (practicalswift)