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;
@@ -1044,7 +1044,7 @@ fn iterate_with_lines<'a>(
         // parents of inlined frames don't have an `endline`, and
         // the top inlined frame need to be correctly offset.
         let 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)
         {
             member.original_startline().unwrap_or(0) as usize
         } else {
@@ -1197,15 +1197,19 @@ 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
-                && member.original_endline != member.original_startline().unwrap_or(0) as u32
+                && member.original_endline != member.original_startline().unwrap_or(0)
             {
                 any_zero_zero_has_range = true;
             }
         } 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 => {
@@ -1235,11 +1239,13 @@ fn resolve_base_entries<'a>(
                 let line = if no_range_count > 1 {
                     Some(0)
                 } else {
-                    compute_member_output_line(member).or(if member.original_startline().is_none() {
-                        Some(0)
-                    } else {
-                        None
-                    })
+                    compute_member_output_line(member).or(
+                        if member.original_startline().is_none() {
+                            Some(0)
+                        } else {
+                            None
+                        },
+                    )
                 };
                 if let Some(f) =
                     map_member_without_lines(cache, frame, member, outer_source_file, line)
@@ -1254,6 +1260,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

@@ -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,
@@ -403,6 +407,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.
@@ -805,7 +815,10 @@ impl<'s> ProguardMapper<'s> {
             members.all_mappings.iter()
         };
 
-        let has_line_info = members.all_mappings.iter().any(|m| m.endline.unwrap_or(0) > 0);
+        let has_line_info = members
+            .all_mappings
+            .iter()
+            .any(|m| m.endline.unwrap_or(0) > 0);
         RemappedFrameIter::members(frame, mappings, has_line_info)
     }