Merge pull request #296 from jtbandes/fix-tests

nadavrot · nadavrot · commit 9c6b0e6323fe · 2015-12-07T13:30:05.000-08:00
Fix duplicate error and re-categorize test
diff --git a/lib/Sema/TypeCheckDecl.cpp b/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;
     }
 
diff --git a/validation-test/compiler_crashers_fixed/1741-swift-constraints-constraintsystem-simplifymemberconstraint.swift b/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)

Original file line number	Diff line number	Diff line change
`@@ -3194,12 +3194,11 @@ class DeclChecker : public DeclVisitor<DeclChecker> {`
`3194`	`3194`	`void visitAssociatedTypeDecl(AssociatedTypeDecl *assocType) {`
`3195`	`3195`	`if (assocType->isBeingTypeChecked()) {`
`3196`	`3196`
`3197`		`- if (!assocType->hasType()) {`
	`3197`	`+ if (!assocType->isInvalid()) {`
`3198`	`3198`	`assocType->setInvalid();`
`3199`	`3199`	`assocType->overwriteType(ErrorType::get(TC.Context));`
	`3200`	`+ TC.diagnose(assocType->getLoc(), diag::circular_type_alias, assocType->getName());`
`3200`	`3201`	`}`
`3201`		`-`
`3202`		`- TC.diagnose(assocType->getLoc(), diag::circular_type_alias, assocType->getName());`
`3203`	`3202`	`return;`
`3204`	`3203`	`}`
`3205`	`3204`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: not --crash %target-swift-frontend %s -parse`
	`1`	`+// RUN: not %target-swift-frontend %s -parse`
`2`	`2`
`3`	`3`	`// Distributed under the terms of the MIT license`
`4`	`4`	`// Test case submitted to project by https://github.com/practicalswift (practicalswift)`