Move is_name_compiler_generated into SymbolFlag & filter out File symbols

Author: encounter

objdiff-core/src/diff/mod.rs

@@ -699,7 +699,7 @@ fn find_symbol(
 
     // Match compiler-generated symbols against each other (e.g. @251 -> @60)
     // If they are in the same section and have the same value
-    if in_symbol.is_name_compiler_generated
+    if in_symbol.flags.contains(SymbolFlag::CompilerGenerated)
         && matches!(section_kind, SectionKind::Code | SectionKind::Data | SectionKind::Bss)
     {
         let mut closest_match_symbol_idx = None;
@@ -711,7 +711,7 @@ fn find_symbol(
             if obj.sections[section_index].name != section_name {
                 continue;
             }
-            if !symbol.is_name_compiler_generated {
+            if !symbol.flags.contains(SymbolFlag::CompilerGenerated) {
                 continue;
             }
             match section_kind {

objdiff-core/src/obj/mod.rs

@@ -37,7 +37,7 @@ pub enum SectionKind {
 
 flags! {
     #[derive(Hash)]
-    pub enum SymbolFlag: u8 {
+    pub enum SymbolFlag: u16 {
         Global,
         Local,
         Weak,
@@ -50,6 +50,8 @@ flags! {
         SizeInferred,
         /// Symbol should be ignored by any diffing
         Ignored,
+        /// Symbol name is compiler-generated; compare by value instead of name
+        CompilerGenerated,
     }
 }
 
@@ -265,7 +267,6 @@ pub struct Symbol {
     pub name: String,
     pub demangled_name: Option<String>,
     pub normalized_name: Option<String>,
-    pub is_name_compiler_generated: bool,
     pub address: u64,
     pub size: u64,
     pub kind: SymbolKind,
@@ -406,7 +407,6 @@ static DUMMY_SYMBOL: Symbol = Symbol {
     name: String::new(),
     demangled_name: None,
     normalized_name: None,
-    is_name_compiler_generated: false,
     address: 0,
     size: 0,
     kind: SymbolKind::Unknown,

objdiff-core/src/obj/read.rs

@@ -3,6 +3,7 @@ use alloc::{
     collections::BTreeMap,
     format,
     string::{String, ToString},
+    vec,
     vec::Vec,
 };
 use core::{cmp::Ordering, num::NonZeroU64};
@@ -138,13 +139,14 @@ fn map_symbol(
         .and_then(|v| v.get(symbol.index().0).cloned());
     let section = symbol.section_index().and_then(|i| section_indices.get(i.0).copied());
     let normalized_name = get_normalized_symbol_name(&name);
-    let is_name_compiler_generated = is_symbol_name_compiler_generated(&name);
+    if is_symbol_name_compiler_generated(&name) {
+        flags |= SymbolFlag::CompilerGenerated;
+    }
 
     Ok(Symbol {
         name,
         demangled_name,
         normalized_name,
-        is_name_compiler_generated,
         address,
         size,
         kind,
@@ -169,6 +171,7 @@ fn map_symbols(
     let mut max_index = 0;
     let mut obj_symbols = obj_file
         .symbols()
+        .filter(|s| s.kind() != object::SymbolKind::File)
         .inspect(|sym| max_index = max_index.max(sym.index().0))
         .collect::<Vec<_>>();
     obj_symbols.sort_by(|a, b| {
@@ -241,7 +244,6 @@ fn add_section_symbols(sections: &[Section], symbols: &mut Vec<Symbol>) {
             name,
             demangled_name: None,
             normalized_name: None,
-            is_name_compiler_generated: false,
             address: 0,
             size,
             kind: SymbolKind::Section,

objdiff-core/src/obj/snapshots/objdiff_core__obj__read__test__combine_sections.snap

@@ -115,7 +115,6 @@ expression: "(sections, symbols)"
             name: ".data",
             demangled_name: None,
             normalized_name: None,
-            is_name_compiler_generated: false,
             address: 0,
             size: 0,
             kind: Section,
@@ -130,7 +129,6 @@ expression: "(sections, symbols)"
             name: "symbol",
             demangled_name: None,
             normalized_name: None,
-            is_name_compiler_generated: false,
             address: 4,
             size: 4,
             kind: Object,
@@ -145,7 +143,6 @@ expression: "(sections, symbols)"
             name: "function",
             demangled_name: None,
             normalized_name: None,
-            is_name_compiler_generated: false,
             address: 0,
             size: 8,
             kind: Function,
@@ -160,7 +157,6 @@ expression: "(sections, symbols)"
             name: ".data",
             demangled_name: None,
             normalized_name: None,
-            is_name_compiler_generated: false,
             address: 0,
             size: 0,
             kind: Unknown,

objdiff-core/tests/snapshots/arch_arm__combine_text_sections-2.snap

@@ -4,4 +4,4 @@ expression: output
 ---
 [(Line(90), Dim, 5), (Address(0), Dim, 5), (Spacing(4), Normal, 0), (Opcode("ldr", 32792), Normal, 10), (Argument(Opaque("r12")), Normal, 0), (Basic(", "), Normal, 0), (Basic("["), Normal, 0), (Argument(Opaque("pc")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Signed(0)), Normal, 0), (Basic("]"), Normal, 0), (Basic(" (->"), Normal, 0), (BranchDest(8), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)]
 [(Line(90), Dim, 5), (Address(4), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bx", 32777), Normal, 10), (Argument(Opaque("r12")), Normal, 0), (Eol, Normal, 0)]
-[(Line(90), Dim, 5), (Address(8), Dim, 5), (Spacing(4), Normal, 0), (Opcode(".word", 65534), Normal, 10), (Symbol(Symbol { name: "esEnemyDraw", demangled_name: None, normalized_name: None, is_name_compiler_generated: false, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)]
+[(Line(90), Dim, 5), (Address(8), Dim, 5), (Spacing(4), Normal, 0), (Opcode(".word", 65534), Normal, 10), (Symbol(Symbol { name: "esEnemyDraw", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)]