Merge pull request #620 from jtbandes/member-fix

More error checking for member type lookup

Author: DougGregor

lib/AST/Type.cpp

@@ -2313,9 +2313,12 @@ static Type getMemberForBaseType(Module *module,
   // If the parent is an archetype, extract the child archetype with the
   // given name.
   if (auto archetypeParent = substBase->getAs<ArchetypeType>()) {
-    if (!archetypeParent->hasNestedType(name) &&
-        archetypeParent->getParent()->isSelfDerived()) {
-      return archetypeParent->getParent()->getNestedTypeValue(name);
+    if (!archetypeParent->hasNestedType(name)) {
+      const auto parent = archetypeParent->getParent();
+      if (!parent)
+        return ErrorType::get(module->getASTContext());
+      if (parent->isSelfDerived())
+        return parent->getNestedTypeValue(name);
     }
 
     return archetypeParent->getNestedTypeValue(name);

validation-test/IDE/crashers/018-swift-type-transform.swift

@@ -0,0 +1,6 @@
+// RUN: %target-swift-ide-test -code-completion -code-completion-token=A -source-filename=%s
+protocol A{
+typealias e
+class A{let A{
+protocol A{typealias f=e
+#^A^#

validation-test/IDE/crashers_fixed/018-swift-type-transform.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/00647-std-function-func-swift-type-subst.swift renamed to validation-test/compiler_crashers_fixed/00647-std-function-func-swift-type-subst.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/01487-std-function-func-swift-type-subst.swift renamed to validation-test/compiler_crashers_fixed/01487-std-function-func-swift-type-subst.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/02030-std-function-func-swift-type-subst.swift renamed to validation-test/compiler_crashers_fixed/02030-std-function-func-swift-type-subst.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/24531-swift-metatypetype-get.swift renamed to validation-test/compiler_crashers_fixed/24531-swift-metatypetype-get.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/zneak (zneak)

validation-test/compiler_crashers/24879-getmemberforbasetype.swift renamed to validation-test/compiler_crashers_fixed/24879-getmemberforbasetype.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/25488-std-function-func-swift-type-subst.swift renamed to validation-test/compiler_crashers_fixed/25488-std-function-func-swift-type-subst.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)