Fix reloc_eq not ignoring compiler-generated names

Author: LagoLunatic

objdiff-core/src/diff/code.rs

@@ -16,7 +16,7 @@ use crate::{
     diff::{address_eq, section_name_eq, symbol_name_matches},
     obj::{
         InstructionArg, InstructionArgValue, InstructionRef, Object, ResolvedInstructionRef,
-        ResolvedRelocation, ResolvedSymbol, SymbolKind,
+        ResolvedRelocation, ResolvedSymbol, SymbolFlag, SymbolKind,
     },
 };
 
@@ -322,6 +322,11 @@ fn reloc_eq(
             if diff_config.function_reloc_diffs == FunctionRelocDiffs::DataValue {
                 // Ignore names entirely
                 name_ok = true;
+            } else if left_reloc.symbol.flags.contains(SymbolFlag::CompilerGenerated)
+                && right_reloc.symbol.flags.contains(SymbolFlag::CompilerGenerated)
+            {
+                // Match if both symbol names are fully compiler-generated
+                name_ok = true;
             } else if symbol_name_addend_matches || address_eq(left_reloc, right_reloc) {
                 // Match if name+addend or address match
                 name_ok = true;

objdiff-core/src/diff/data.rs

@@ -54,8 +54,17 @@ fn reloc_eq(
             if !section_name_eq(left_obj, right_obj, sl, sr) {
                 return false;
             };
-            // Match if name+addend or address match
-            symbol_name_addend_matches || address_eq(left_reloc, right_reloc)
+            let mut name_ok = false;
+            if left_reloc.symbol.flags.contains(SymbolFlag::CompilerGenerated)
+                && right_reloc.symbol.flags.contains(SymbolFlag::CompilerGenerated)
+            {
+                // Match if both symbol names are fully compiler-generated
+                name_ok = true;
+            } else if symbol_name_addend_matches || address_eq(left_reloc, right_reloc) {
+                // Match if name+addend or address match
+                name_ok = true;
+            }
+            name_ok
         }
         (Some(_), None) | (None, Some(_)) | (None, None) => symbol_name_addend_matches,
     }