RequirementMachine: Ignore requirements with ErrorTypes for GSB compatibility

slavapestov · slavapestov · commit 25cae6f479af · 2022-01-05T22:41:03.000-05:00
diff --git a/lib/AST/RequirementMachine/RequirementLowering.cpp b/lib/AST/RequirementMachine/RequirementLowering.cpp
@@ -87,6 +87,9 @@ static void desugarSameTypeRequirement(Type lhs, Type rhs,
     }
   } matcher(result);
 
+  if (lhs->hasError() || rhs->hasError())
+    return;
+
   // FIXME: Record redundancy and diagnose upstream
   (void) matcher.match(lhs, rhs);
 }

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,9 @@ static void desugarSameTypeRequirement(Type lhs, Type rhs,`
`87`	`87`	`}`
`88`	`88`	`} matcher(result);`
`89`	`89`
	`90`	`+ if (lhs->hasError() \|\| rhs->hasError())`
	`91`	`+ return;`
	`92`	`+`
`90`	`93`	`// FIXME: Record redundancy and diagnose upstream`
`91`	`94`	`(void) matcher.match(lhs, rhs);`
`92`	`95`	`}`