Merge pull request #62661 from valeriyvan/Refactoring

CodaFi · web-flow · commit 23e66f723c3c · 2022-12-19T13:02:24.000-07:00
[Refactoring] Fix assert incorrect equality condition to same value
diff --git a/lib/Refactoring/Refactoring.cpp b/lib/Refactoring/Refactoring.cpp
@@ -661,8 +661,7 @@ class RenameRangeCollector : public IndexDataConsumer {
           assert(existingLoc->OldName == loc->OldName &&
                  existingLoc->NewName == loc->NewName &&
                  existingLoc->IsFunctionLike == loc->IsFunctionLike &&
-                 existingLoc->IsNonProtocolType ==
-                     existingLoc->IsNonProtocolType &&
+                 existingLoc->IsNonProtocolType == loc->IsNonProtocolType &&
                  "Asked to do a different rename for the same location?");
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -661,8 +661,7 @@ class RenameRangeCollector : public IndexDataConsumer {`
`661`	`661`	`assert(existingLoc->OldName == loc->OldName &&`
`662`	`662`	`existingLoc->NewName == loc->NewName &&`
`663`	`663`	`existingLoc->IsFunctionLike == loc->IsFunctionLike &&`
`664`		`- existingLoc->IsNonProtocolType ==`
`665`		`- existingLoc->IsNonProtocolType &&`
	`664`	`+ existingLoc->IsNonProtocolType == loc->IsNonProtocolType &&`
`666`	`665`	`"Asked to do a different rename for the same location?");`
`667`	`666`	`}`
`668`	`667`	`}`