Merge remote-tracking branch 'origin/GP-3406_ghidra007_add_mingw_not_fix_check_to_RTTI_script--SQUASHED' into Ghidra_10.3

This commit is contained in:
ghidra1
2023-05-09 13:42:54 -04:00
2 changed files with 54 additions and 40 deletions

View File

@@ -703,8 +703,6 @@ public class RTTIGccClassRecoverer extends RTTIClassRecoverer {
for (GccTypeinfo typeinfo : typeinfos) {
monitor.checkCancelled();
Msg.debug(this, typeinfo.getNamespace().getName());
Address typeinfoAddress = typeinfo.getAddress();
Structure typeinfoStructure = getTypeinfoStructure(typeinfoAddress);
@@ -2643,10 +2641,6 @@ private Address getReferencedAddress(Address address) {
return null;
}
Msg.debug(this, "numBases for typeinfo: " + typeinfoAddress.toString() + " at address "
+ typeinfoAddress.add(offsetOfNumBases) + " numbases: " + numBases);
;
// get or create the vmiClassTypeInfoStruct
Structure vmiClassTypeinfoStructure = (Structure) dataTypeManager.getDataType(classDataTypesCategoryPath,
VMI_CLASS_TYPE_INFO_STRUCTURE + numBases);
@@ -2723,8 +2717,6 @@ private Address getReferencedAddress(Address address) {
Namespace classNamespace = typeinfoNameSymbol.getParentNamespace();
Msg.debug(this, typeinfoAddress.toString() + " " + classNamespace.getName());
if (classNamespace.isGlobal()) {
Msg.debug(this,
typeinfoAddress.toString() + "Could not create a class namespace for demangled namespace string ");