AST: Correct handling of ErrorType in TypeBase::getMemberSubstitutions()

slavapestov · slavapestov · commit 0033bda3314c · 2015-07-23T06:49:19.000Z
Swift SVN r30531
diff --git a/lib/AST/Type.cpp b/lib/AST/Type.cpp
@@ -2640,8 +2640,9 @@ TypeSubstitutionMap TypeBase::getMemberSubstitutions(DeclContext *dc) {
   LazyResolver *resolver = dc->getASTContext().getLazyResolver();
 
   // Find the superclass type with the context matching that of the member.
-  auto ownerNominal = dc->getDeclaredTypeOfContext()->getAnyNominal();
-  while (baseTy->getAnyNominal() != ownerNominal) {
+  auto ownerNominal = dc->isNominalTypeOrNominalTypeExtensionContext();
+  while (!baseTy->is<ErrorType>() &&
+         baseTy->getAnyNominal() != ownerNominal) {
     baseTy = baseTy->getSuperclass(resolver);
     assert(baseTy && "Couldn't find appropriate context");
   }
diff --git a/validation-test/compiler_crashers_fixed/1003-swift-nominaltypedecl-getdeclaredtypeincontext.swift b/validation-test/compiler_crashers_fixed/1003-swift-nominaltypedecl-getdeclaredtypeincontext.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)
diff --git a/validation-test/compiler_crashers_fixed/1520-llvm-bitstreamcursor-readrecord.swift b/validation-test/compiler_crashers_fixed/1520-llvm-bitstreamcursor-readrecord.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)
diff --git a/validation-test/compiler_crashers_fixed/2128-swift-nominaltypedecl-getdeclaredtypeincontext.swift b/validation-test/compiler_crashers_fixed/2128-swift-nominaltypedecl-getdeclaredtypeincontext.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)
diff --git a/validation-test/compiler_crashers_fixed/2231-swift-nominaltypedecl-getdeclaredtypeincontext.swift b/validation-test/compiler_crashers_fixed/2231-swift-nominaltypedecl-getdeclaredtypeincontext.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)
diff --git a/validation-test/compiler_crashers_fixed/25410-swift-typechecker-resolvetypeincontext.swift b/validation-test/compiler_crashers_fixed/25410-swift-typechecker-resolvetypeincontext.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)
diff --git a/validation-test/compiler_crashers_fixed/25429-swift-typechecker-resolvetypeincontext.swift b/validation-test/compiler_crashers_fixed/25429-swift-typechecker-resolvetypeincontext.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
`@@ -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)`