Debugger: Run the function scanner on the main symbol database

This commit is contained in:
chaoticgd 2024-11-14 22:58:57 +00:00 committed by Ty
parent 3b9b9a84cd
commit 9da4459ab3
1 changed files with 8 additions and 5 deletions

View File

@ -212,11 +212,6 @@ void SymbolImporter::AnalyseElf(
SymbolGuardian::GenerateFunctionHashes(temp_database, reader); SymbolGuardian::GenerateFunctionHashes(temp_database, reader);
} }
if (m_interrupt_import_thread)
return;
ScanForFunctions(temp_database, worker_symbol_file, options);
if (m_interrupt_import_thread) if (m_interrupt_import_thread)
return; return;
@ -227,6 +222,14 @@ void SymbolImporter::AnalyseElf(
return; return;
database.merge_from(temp_database); database.merge_from(temp_database);
if (m_interrupt_import_thread)
return;
// The function scanner has to be run on the main database so that
// functions created before the importer was run are still
// considered. Otherwise, duplicate functions will be created.
ScanForFunctions(database, worker_symbol_file, options);
}); });
}); });
} }