Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-27 23:17:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

GP-0: Fix several issues introduced by GP-6550. Some slowness has returned.

Browse Source
This commit is contained in:
Dan
2026-03-26 15:25:07 +00:00
parent dbd86fa8fe
commit b00ae3f648
7 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/AbstractConstraintsTree.java
+10 -4
View File
@@ -314,10 +314,16 @@ public abstract class AbstractConstraintsTree<
}
private void descend(NR nr) {
List<? extends DBTreeRecord<?, ? extends NS>> passed = getChildrenOf(nr).stream()
.filter(c -> query.testNode(c.getBounds()) != QueryInclusion.NONE)
.toList();
queue.addAll(passed);
Collection<? extends DBTreeRecord<?, ? extends NS>> all = getChildrenOf(nr);
if (query == null) {
queue.addAll(all);
}
else {
List<? extends DBTreeRecord<?, ? extends NS>> passed = all.stream()
.filter(c -> query.testNode(c.getBounds()) != QueryInclusion.NONE)
.toList();
queue.addAll(passed);
}
}
private DR findNext() {
Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/AbstractRStarConstraintsTree.java
+2 -3
View File
@@ -218,9 +218,8 @@ public abstract class AbstractRStarConstraintsTree<
PriorityQueue<LeastAreaEnlargementThenLeastArea> sorted =
new PriorityQueue<>(n.getChildCount());
List<NR> children = new ArrayList<>(getNodeChildrenOf(n));
for (NR leaf : children) {
assert leaf.getType().isLeaf();
sorted.offer(new LeastAreaEnlargementThenLeastArea(leaf, bounds));
for (NR child : children) {
sorted.offer(new LeastAreaEnlargementThenLeastArea(child, bounds));
}
LeastOverlap least = null;