feat(r8): Sort ambiguous no-range entries alphabetically by method name

When multiple no-range entries with different original method names all
have line mappings, sort them alphabetically. Bare method entries (no
line mapping) preserve original mapping file order.

Fixes test_single_line_no_line_number_stacktrace — all 10 R8 line
number handling tests now pass.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: romtsn

src/cache/mod.rs

@@ -1197,6 +1197,7 @@ fn resolve_base_entries<'a>(
     let mut no_range_count = 0usize;
     let mut first_no_range_offset: Option<u32> = None;
     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
@@ -1206,6 +1207,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 => {
@@ -1218,6 +1222,7 @@ fn resolve_base_entries<'a>(
 
     let mut frames = Vec::new();
     let mut no_range_emitted = false;
+    let no_range_start = 0usize;
     for member in base_entries {
         if member.startline().is_some() {
             let line = if any_zero_zero_has_range {
@@ -1254,6 +1259,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[no_range_start..].sort_by(|a, b| a.method.cmp(b.method));
+    }
+
     frames
 }
 

src/mapper.rs

@@ -348,6 +348,7 @@ fn resolve_base_entries<'s>(
     let mut no_range_count = 0usize;
     let mut first_no_range_name: Option<&str> = None;
     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()
@@ -357,6 +358,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,
@@ -366,6 +370,7 @@ fn resolve_base_entries<'s>(
     }
 
     let mut no_range_emitted = false;
+    let no_range_start = collected.frames.len();
     for member in base_entries {
         if member.startline.is_some() {
             let line = if any_zero_zero_has_range {
@@ -403,6 +408,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[no_range_start..].sort_by_key(|f| f.method);
+    }
 }
 
 /// A Proguard Remapper.