Skip to content

[llvm-gsymutil] Ensure stable ordering of merged functions #120796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 21, 2024
Merged

[llvm-gsymutil] Ensure stable ordering of merged functions #120796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions llvm/lib/DebugInfo/GSYM/GsymCreator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@ void GsymCreator::prepareMergedFunctions(OutputAggregator &Out) {
if (Funcs.size() < 2)
return;

// Sort the function infos by address range first
llvm::sort(Funcs);
// Sort the function infos by address range first, preserving input order
llvm::stable_sort(Funcs);
std::vector<FunctionInfo> TopLevelFuncs;

// Add the first function info to the top level functions
Expand Down
4 changes: 0 additions & 4 deletions llvm/test/tools/llvm-gsymutil/ARM_AArch64/macho-gsym-merged-callsites-dsym.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# FIXME: Currently disabled as it fails on some Linux hosts
# UNSUPPORTED: true


## Test that reconstructs a dSYM file from YAML and generates a gsym from it. The gsym has callsite info and merged functions.

# RUN: split-file %s %t
Expand Down
Loading