Merge pull request #619 from jtbandes/subscript-fix

Propagate ErrorType when checking subscript decls

Author: cwillmor

lib/AST/Decl.cpp

@@ -3371,7 +3371,10 @@ void SubscriptDecl::setIndices(Pattern *p) {
 }
 
 Type SubscriptDecl::getIndicesType() const {
-  return getType()->castTo<AnyFunctionType>()->getInput();
+  const auto type = getType();
+  if (type->is<ErrorType>())
+    return type;
+  return type->castTo<AnyFunctionType>()->getInput();
 }
 
 Type SubscriptDecl::getIndicesInterfaceType() const {

lib/Sema/TypeCheckType.cpp

@@ -2987,6 +2987,9 @@ bool TypeChecker::isRepresentableInObjC(const SubscriptDecl *SD,
     if (TupleTy->getNumElements() == 1 && !TupleTy->getElement(0).isVararg())
       IndicesType = TupleTy->getElementType(0);
   }
+  
+  if (IndicesType->is<ErrorType>())
+    return false;
 
   bool IndicesResult = isRepresentableInObjC(SD->getDeclContext(), IndicesType);
   bool ElementResult = isRepresentableInObjC(SD->getDeclContext(),

validation-test/compiler_crashers/24670-isunknownobjecttype.swift renamed to validation-test/compiler_crashers_fixed/24670-isunknownobjecttype.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)

validation-test/compiler_crashers/27787-swift-typechecker-overapproximateosversionsatlocation.swift renamed to validation-test/compiler_crashers_fixed/27787-swift-typechecker-overapproximateosversionsatlocation.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)