mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 06:02:11 +02:00
Code Issues Wiki Activity

Restore counting iterations in computeContainsDeclaration cycle detector

Browse source 
A follow-up change to bug 509898 missed actually incrementing the counter,
restore it now.

Fixes: 5462bac381 ("Bug 509898 - IndexFileSet.containsDeclaration is slow and is causing UI freezes")
This commit is contained in:
Igor V. Kovalenko 2023-03-12 11:33:04 +03:00 • committed by Jonah Graham
parent 0923e66b7b
commit 74621c1048
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFileSet.java
View file

@ -100,6 +100,11 @@ public class IndexFileSet implements IIndexFileSet {
Set<Long> visited = null; Set<Long> visited = null;
long nameRecord; long nameRecord;
while ((nameRecord = nameIterator.next()) != 0) { while ((nameRecord = nameIterator.next()) != 0) {
if (++iterationCount >= 1000 && visited == null) {
// Iteration count is suspiciously high. Start keeping track of visited names
// to be able to detect a cycle.
visited = new HashSet<>();
}
if (visited != null && !visited.add(nameRecord)) { if (visited != null && !visited.add(nameRecord)) {
// Cycle detected! // Cycle detected!
logInvalidNameChain(pdom, binding); logInvalidNameChain(pdom, binding);
@ -114,12 +119,6 @@ public class IndexFileSet implements IIndexFileSet {
} }
return true; return true;
} }
if (iterationCount >= 1000 && visited == null) {
// Iteration count is suspiciously high. Start keeping track of visited names
// to be able to detect a cycle.
visited = new HashSet<>();
visited.add(nameRecord);
}
} }
} }
} catch (CoreException e) { } catch (CoreException e) {