Skip to content

feat(r8): Sort ambiguous no-range entries alphabetically #87

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
romtsn merged 1 commit into from
Feb 16, 2026
Merged

feat(r8): Sort ambiguous no-range entries alphabetically #87

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
10 changes: 10 additions & 0 deletions src/cache/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,6 +1214,7 @@ fn resolve_base_entries<'a>(
let mut first_no_range_offset: Option<u32> = None;
// Whether all no-range entries map to the same original method name.
let mut all_no_range_same_name = true;
let mut all_no_range_have_line_mapping = true;
for member in base_entries {
if member.startline().is_some() {
if member.original_endline != u32::MAX
Expand All @@ -1223,6 +1224,9 @@ fn resolve_base_entries<'a>(
}
} else {
no_range_count += 1;
if member.original_startline().is_none() {
all_no_range_have_line_mapping = false;
}
match first_no_range_offset {
None => first_no_range_offset = Some(member.original_name_offset),
Some(first) if member.original_name_offset != first => {
Expand Down Expand Up @@ -1268,6 +1272,12 @@ fn resolve_base_entries<'a>(
}
}

// Sort no-range frames by original method name when all have line mappings;
// bare method entries preserve original mapping file order.
if !all_no_range_same_name && all_no_range_have_line_mapping {
frames.sort_by(|a, b| a.method.cmp(b.method));
}

frames
}

Expand Down
10 changes: 10 additions & 0 deletions src/mapper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,7 @@ fn resolve_base_entries<'s>(
let mut first_no_range_name: Option<&str> = None;
// Whether all no-range entries map to the same original method name.
let mut all_no_range_same_name = true;
let mut all_no_range_have_line_mapping = true;
for member in base_entries {
if member.startline.is_some() {
if member.original_endline.is_some()
Expand All @@ -370,6 +371,9 @@ fn resolve_base_entries<'s>(
}
} else {
no_range_count += 1;
if member.original_startline.is_none() {
all_no_range_have_line_mapping = false;
}
match first_no_range_name {
None => first_no_range_name = Some(member.original),
Some(first) if member.original != first => all_no_range_same_name = false,
Expand Down Expand Up @@ -413,6 +417,12 @@ fn resolve_base_entries<'s>(
collected.rewrite_rules.extend(member.rewrite_rules.iter());
}
}

// Sort no-range frames by original method name when all have line mappings;
// bare method entries preserve original mapping file order.
if !all_no_range_same_name && all_no_range_have_line_mapping {
collected.frames.sort_by_key(|f| f.method);
}
}

/// A Proguard Remapper.
Expand Down