Sema: FailureDiagnostic::resolveType() wraps GenericParameterTypes in ErrorTypes to avoid triggering asserts

slavapestov · slavapestov · commit e894d4afbb28 · 2024-01-17T21:15:38.000-05:00
diff --git a/lib/Sema/CSDiagnostics.cpp b/lib/Sema/CSDiagnostics.cpp
@@ -114,7 +114,9 @@ Type FailureDiagnostic::resolveType(Type rawType, bool reconstituteSugar,
       }
 
       Type GP = typeVar->getImpl().getGenericParameter();
-      return resolvedType->is<UnresolvedType>() && GP ? GP : resolvedType;
+      return resolvedType->is<UnresolvedType>() && GP
+          ? ErrorType::get(GP)
+          : resolvedType;
     }
 
     if (type->hasElementArchetype()) {

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,9 @@ Type FailureDiagnostic::resolveType(Type rawType, bool reconstituteSugar,`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`Type GP = typeVar->getImpl().getGenericParameter();`
`117`		`- return resolvedType->is<UnresolvedType>() && GP ? GP : resolvedType;`
	`117`	`+ return resolvedType->is<UnresolvedType>() && GP`
	`118`	`+ ? ErrorType::get(GP)`
	`119`	`+ : resolvedType;`
`118`	`120`	`}`
`119`	`121`
`120`	`122`	`if (type->hasElementArchetype()) {`