RequirementMachine: Fix logic error in mergeAssociatedTypes()

slavapestov · slavapestov · commit 3803767c0cc3 · 2021-06-30T01:34:07.000-04:00
diff --git a/lib/AST/RequirementMachine/RewriteSystemCompletion.cpp b/lib/AST/RequirementMachine/RewriteSystemCompletion.cpp
@@ -194,8 +194,9 @@ Atom RewriteSystem::mergeAssociatedTypes(Atom lhs, Atom rhs) const {
               Protos.inheritsFrom(thisProto, newProto));
     };
 
-    if (std::find_if(protos.begin(), protos.end(), inheritsFrom)
-        == protos.end()) {
+    if (std::find_if(minimalProtos.begin(), minimalProtos.end(),
+                     inheritsFrom)
+        == minimalProtos.end()) {
       minimalProtos.push_back(newProto);
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -194,8 +194,9 @@ Atom RewriteSystem::mergeAssociatedTypes(Atom lhs, Atom rhs) const {`
`194`	`194`	`Protos.inheritsFrom(thisProto, newProto));`
`195`	`195`	`};`
`196`	`196`
`197`		`- if (std::find_if(protos.begin(), protos.end(), inheritsFrom)`
`198`		`- == protos.end()) {`
	`197`	`+ if (std::find_if(minimalProtos.begin(), minimalProtos.end(),`
	`198`	`+ inheritsFrom)`
	`199`	`+ == minimalProtos.end()) {`
`199`	`200`	`minimalProtos.push_back(newProto);`
`200`	`201`	`}`
`201`	`202`	`}`