Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-28 07:46:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing several debugger-related tests

Browse Source
This commit is contained in:
Dan
2021-01-19 08:24:09 -05:00
parent 4bb7cfaa71
commit c481a87ab5
19 changed files with 214 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/DBCachedObjectStoreFactory.java
+4 -1
View File
@@ -558,7 +558,10 @@ public class DBCachedObjectStoreFactory {
@SuppressWarnings("unchecked")
public static <T extends DBAnnotatedObject> TableInfo<T> getInfo(Class<T> cls) {
return (TableInfo<T>) INFO_MAP.computeIfAbsent(cls, DBCachedObjectStoreFactory::buildInfo);
synchronized (INFO_MAP) {
return (TableInfo<T>) INFO_MAP.computeIfAbsent(cls,
DBCachedObjectStoreFactory::buildInfo);
}
}
static <OT extends DBAnnotatedObject> List<DBFieldCodec<?, OT, ?>> getCodecs(
Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/AbstractConstraintsTree.java
+2 -2
View File
@@ -247,7 +247,7 @@ public abstract class AbstractConstraintsTree< //
data.sort(Comparator.comparing(DR::getBounds, query.getBoundsComparator()));
}
for (DR d : data) {
if (query != null && query.terminateEarlyData(d.getShape())) {
if (query != null && ordered && query.terminateEarlyData(d.getShape())) {
break;
}
boolean included = query == null || query.testData(d.getShape());
@@ -268,7 +268,7 @@ public abstract class AbstractConstraintsTree< //
nodes.sort(Comparator.comparing(NR::getBounds, query.getBoundsComparator()));
}
for (NR n : nodes) {
if (query != null && query.terminateEarlyNode(n.getShape())) {
if (query != null && ordered && query.terminateEarlyNode(n.getShape())) {
break;
}
r = visit(node, n, query, visitor, ordered);