Signature data deduplication sort based off symbols before processing

Vector35 · Nov 8, 2024 · b4d59ec · b4d59ec
1 parent 2d296ad
commit b4d59ec
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/rust/signature.rs b/rust/signature.rs
@@ -38,7 +38,8 @@ impl Data {
         self.types.sort_by_key(|ty| ty.guid);
         self.types.dedup_by_key(|ty| ty.guid);
         // Sort and remove functions with the same symbol and guid.
-        self.functions.sort_by_key(|func| func.guid);
+        self.functions
+            .sort_by(|a, b| a.guid.cmp(&b.guid).then_with(|| a.symbol.cmp(&b.symbol)));
         self.functions.dedup_by(|a, b| {
             if a.guid == b.guid && a.symbol == b.symbol {
                 // Keep `a`s constraints.
@@ -182,6 +183,7 @@ mod tests {
             vec![
                 create_sample_function("func2", FUNC3_GUID),
                 create_sample_function("func3", FUNC2_GUID),
+                create_sample_function("func2", FUNC2_GUID),
             ],
             vec![
                 create_sample_computed_type(TYPE1_GUID),

diff --git a/rust/symbol.rs b/rust/symbol.rs
@@ -6,7 +6,7 @@ use flatbuffers::{FlatBufferBuilder, WIPOffset};
 
 pub use fb::SymbolModifiers;
 
-#[derive(Clone, Debug, Eq, PartialEq, Hash)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash, Ord, PartialOrd)]
 pub struct Symbol {
     pub name: String,
     pub modifiers: SymbolModifiers,

diff --git a/rust/symbol/class.rs b/rust/symbol/class.rs
@@ -30,7 +30,7 @@ impl DataSymbolClass {
     }
 }
 
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash, Ord, PartialOrd)]
 pub enum SymbolClass {
     Function,
     Data,