Sema: Fix crash on invalid code in isOverrideBasedOnType()

slavapestov · slavapestov · commit 0d6470345b9c · 2025-06-17T09:52:04.000-04:00
diff --git a/lib/Sema/TypeCheckDeclOverride.cpp b/lib/Sema/TypeCheckDeclOverride.cpp
@@ -217,6 +217,9 @@ bool swift::isOverrideBasedOnType(const ValueDecl *decl, Type declTy,
         return false;
     }
 
+    if (declTy->is<ErrorType>())
+      return false;
+
     auto fnType1 = declTy->castTo<AnyFunctionType>();
     auto fnType2 = parentDeclTy->castTo<AnyFunctionType>();
     return AnyFunctionType::equalParams(fnType1->getParams(),
diff --git a/validation-test/compiler_crashers_2_fixed/90773c979d435f7.swift b/validation-test/compiler_crashers_2_fixed/90773c979d435f7.swift
@@ -1,5 +1,5 @@
 // {"signature":"swift::isOverrideBasedOnType(swift::ValueDecl const*, swift::Type, swift::ValueDecl const*)"}
-// RUN: not --crash %target-swift-frontend -typecheck %s
+// RUN: not %target-swift-frontend -typecheck %s
 struct a < b {
   protocol c { associatedtype d init(e : d
   }

Original file line number	Diff line number	Diff line change
`@@ -217,6 +217,9 @@ bool swift::isOverrideBasedOnType(const ValueDecl *decl, Type declTy,`
`217`	`217`	`return false;`
`218`	`218`	`}`
`219`	`219`
	`220`	`+ if (declTy->is<ErrorType>())`
	`221`	`+ return false;`
	`222`	`+`
`220`	`223`	`auto fnType1 = declTy->castTo<AnyFunctionType>();`
`221`	`224`	`auto fnType2 = parentDeclTy->castTo<AnyFunctionType>();`
`222`	`225`	`return AnyFunctionType::equalParams(fnType1->getParams(),`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`// {"signature":"swift::isOverrideBasedOnType(swift::ValueDecl const, swift::Type, swift::ValueDecl const)"}`
`2`		`-// RUN: not --crash %target-swift-frontend -typecheck %s`
	`2`	`+// RUN: not %target-swift-frontend -typecheck %s`
`3`	`3`	`struct a < b {`
`4`	`4`	`protocol c { associatedtype d init(e : d`
`5`	`5`	`}`