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

@@ -1005,7 +1005,7 @@ fn iterate_with_lines<'a>(
             // Span expansion: if the original range spans multiple lines,
             // emit one frame per original line.
             if member.original_endline != u32::MAX
-                && member.original_endline > member.original_startline().unwrap_or(0) as u32
+                && member.original_endline > member.original_startline().unwrap_or(0)
             {
                 let first_line = member.original_startline().unwrap_or(0) as usize;
                 let last_line = member.original_endline as usize;
@@ -1202,6 +1202,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
@@ -1211,6 +1212,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 => {
@@ -1262,6 +1266,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
 }
 

src/mapper.rs

@@ -353,6 +353,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()
@@ -362,6 +363,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,
@@ -409,6 +413,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.