yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 18:29:37 +02:00
Code Issues Releases Wiki Activity

GP-296 avoid separately resolving nested composite definitions to avoid

Browse source 
duplicates.  Allow them to be resolved as needed (e.g., function
definitions).
This commit is contained in:
ghidra1 2020-10-21 14:44:58 -04:00
parent 3791d9d5d1
commit 0086c4c77a
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/AbstractComplexTypeApplier.java
View file

@ -59,6 +59,10 @@ public abstract class AbstractComplexTypeApplier extends MsTypeApplier {
return ((AbstractComplexMsType) msType).getMsProperty().isForwardReference(); return ((AbstractComplexMsType) msType).getMsProperty().isForwardReference();
} }
boolean isNested() {
return ((AbstractComplexMsType) msType).getMsProperty().isNestedClass();
}
boolean isFinal() { boolean isFinal() {
return ((AbstractComplexMsType) msType).getMsProperty().isSealed(); return ((AbstractComplexMsType) msType).getMsProperty().isSealed();
} }

10
Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/CompositeTypeApplier.java
View file

@ -135,7 +135,15 @@ public class CompositeTypeApplier extends AbstractComplexTypeApplier {
@Override @Override
void resolve() { void resolve() {
if (!isForwardReference()) {
// NOTE: Until we know better we do not want to explicitly
// apply nested composite datatypes and allow them to be
// created as-needed (e.g., function definition). This is
// done to minimize duplication of anonymous/unnamed nested
// composites since the parent composite reconsruction performed
// by DefaultCompisiteMember will generate such nested composites.
if (!isForwardReference() && !isNested()) {
super.resolve(); super.resolve();
} }
} }