Merge pull request #3331 from gregomni/getDeclaredType-cleanup

Author: swift-ci

lib/AST/Decl.cpp

@@ -1994,10 +1994,8 @@ Type NominalTypeDecl::getDeclaredTypeInContext() const {
     return DeclaredTyInContext;
 
   auto *decl = const_cast<NominalTypeDecl *>(this);
-  auto Ty = computeNominalType(decl, DeclTypeKind::DeclaredTypeInContext);
-  if (!Ty)
-    Ty = ErrorType::get(getASTContext());
-  decl->DeclaredTyInContext = Ty;
+  decl->DeclaredTyInContext = computeNominalType(decl,
+                                                 DeclTypeKind::DeclaredTypeInContext);
   return DeclaredTyInContext;
 }
 

lib/AST/DeclContext.cpp

@@ -127,8 +127,10 @@ enum class DeclTypeKind : unsigned {
 };
 
 static Type computeExtensionType(const ExtensionDecl *ED, DeclTypeKind kind) {
-  auto type = ED->getExtendedType();
+  if (ED->isInvalid())
+    return ErrorType::get(ED->getASTContext());
 
+  auto type = ED->getExtendedType();
   if (!type)
     return Type();
 

validation-test/compiler_crashers/28324-swift-diagnosticengine-emitdiagnostic.swift renamed to validation-test/compiler_crashers_fixed/28324-swift-diagnosticengine-emitdiagnostic.swift

@@ -5,6 +5,6 @@
 // See http://swift.org/LICENSE.txt for license information
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
-// RUN: not --crash %target-swift-frontend %s -parse
+// RUN: not %target-swift-frontend %s -parse
 // REQUIRES: asserts
 protocol a{extension{@objc protocol A:a

validation-test/compiler_crashers/28326-swift-typebase-getmembersubstitutions.swift renamed to validation-test/compiler_crashers_fixed/28326-swift-typebase-getmembersubstitutions.swift

@@ -5,5 +5,5 @@
 // See http://swift.org/LICENSE.txt for license information
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
-// RUN: not --crash %target-swift-frontend %s -parse
+// RUN: not %target-swift-frontend %s -parse
 class d{init(){{extension{{}protocol a{struct B{let a