Merge pull request #34670 from DougGregor/conformance-unsatisfied-objc

DougGregor · web-flow · commit 1d3e96e72444 · 2020-11-11T09:21:03.000-08:00
[Protocol checker] Eliminate ordering dependency with "unsatisfied" check
diff --git a/lib/Sema/TypeCheckProtocol.cpp b/lib/Sema/TypeCheckProtocol.cpp
@@ -1566,7 +1566,7 @@ isUnsatisfiedReq(ConformanceChecker &checker,
         if (otherReq == req)
           continue;
 
-        if (conformance->hasWitness(otherReq))
+        if (conformance->getWitness(otherReq))
           return false;
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -1566,7 +1566,7 @@ isUnsatisfiedReq(ConformanceChecker &checker,`
`1566`	`1566`	`if (otherReq == req)`
`1567`	`1567`	`continue;`
`1568`	`1568`
`1569`		`- if (conformance->hasWitness(otherReq))`
	`1569`	`+ if (conformance->getWitness(otherReq))`
`1570`	`1570`	`return false;`
`1571`	`1571`	`}`
`1572`	`1572`	`}`