mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-25 17:00:36 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1025_Dan_ParameterMapOrder' into Ghidra_10.0

Browse Source
This commit is contained in:
ghidra1
2021-06-09 17:12:59 -04:00
parent 066b285446 c711a6c5be
commit c77d5811ea
3 changed files with 70 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetMethod.java
View File

@@ -201,7 +201,10 @@ public interface TargetMethod extends TargetObject {
* @return a map of descriptions by name
*/
static TargetParameterMap makeParameters(Stream<ParameterDescription<?>> params) {
return TargetParameterMap.copyOf(params.collect(Collectors.toMap(p -> p.name, p -> p)));
return TargetParameterMap
.copyOf(params.collect(Collectors.toMap(p -> p.name, p -> p, (a, b) -> {
throw new IllegalArgumentException("duplicate parameters: " + a + " and " + b);
}, LinkedHashMap::new)));
}
/**

2
Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/CollectionUtils.java
View File

@@ -204,7 +204,7 @@ public enum CollectionUtils {
protected final Map<K, V> wrapped;
public AbstractNMap(Map<K, V> map) {
this.wrapped = Map.copyOf(map);
this.wrapped = Collections.unmodifiableMap(new LinkedHashMap<>(map));
}
@Override