Allow frames with the same address but different line numbers.

Author: mstange

fxprof-processed-profile/src/frame_table.rs

@@ -24,7 +24,7 @@ pub struct FrameTable {
     native_symbol_col: Vec<Option<NativeSymbolIndex>>,
     inline_depth_col: Vec<u16>,
 
-    frame_key_set: FastIndexSet<InternalFrameKey>,
+    frame_key_set: FastIndexSet<InternalFrame>,
 }
 
 impl FrameTable {
@@ -38,7 +38,7 @@ impl FrameTable {
         global_libs: &mut GlobalLibTable,
         string_table: &mut ThreadStringTable,
     ) -> usize {
-        let (frame_index, is_new) = self.frame_key_set.insert_full(frame.frame_key());
+        let (frame_index, is_new) = self.frame_key_set.insert_full(frame);
 
         if !is_new {
             return frame_index;
@@ -162,34 +162,6 @@ pub enum InternalFrameVariant {
 }
 
 impl InternalFrame {
-    pub fn frame_key(&self) -> InternalFrameKey {
-        let InternalFrame {
-            name,
-            variant,
-            subcategory,
-            file_path,
-            line,
-            col,
-            flags,
-        } = *self;
-        let variant = match variant {
-            InternalFrameVariant::Label => InternalFrameKeyVariant::Label(LabelFrameKey {
-                name,
-                file_path,
-                line,
-                col,
-            }),
-            InternalFrameVariant::Native(native_frame_data) => {
-                InternalFrameKeyVariant::Native(native_frame_data)
-            }
-        };
-        InternalFrameKey {
-            variant,
-            subcategory,
-            flags,
-        }
-    }
-
     pub fn func_key(&self) -> FuncKey {
         let InternalFrame {
             name,
@@ -211,27 +183,6 @@ impl InternalFrame {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialOrd, Ord, PartialEq, Eq, Hash)]
-pub struct InternalFrameKey {
-    pub variant: InternalFrameKeyVariant,
-    pub subcategory: SubcategoryHandle,
-    pub flags: FrameFlags,
-}
-
-#[derive(Debug, Clone, Copy, PartialOrd, Ord, PartialEq, Eq, Hash)]
-pub struct LabelFrameKey {
-    pub name: ThreadInternalStringIndex,
-    pub file_path: Option<ThreadInternalStringIndex>,
-    pub line: Option<u32>,
-    pub col: Option<u32>,
-}
-
-#[derive(Debug, Clone, Copy, PartialOrd, Ord, PartialEq, Eq, Hash)]
-pub enum InternalFrameKeyVariant {
-    Label(LabelFrameKey),
-    Native(NativeFrameData),
-}
-
 #[derive(Debug, Clone, PartialOrd, Ord, PartialEq, Eq, Hash)]
 pub enum InternalFrameAddress {
     Unknown(u64),

fxprof-processed-profile/src/profile.rs

@@ -105,14 +105,14 @@ pub struct StackHandle(ThreadHandle, usize);
 pub struct FrameSymbolInfo {
     /// The function name. If set to `None`, the name of the native symbol will be used.
     pub name: Option<StringHandle>,
-    /// The source location. All fields can be set to `None` if unknown.
-    pub source_location: SourceLocation,
     /// The native symbol for the function whose native code contains the frame address.
     pub native_symbol: NativeSymbolHandle,
+    /// The source location. All fields can be set to `None` if unknown.
+    pub source_location: SourceLocation,
 }
 
 /// Source code information (file path + line number + column number) for a frame.
-#[derive(Debug, Clone, Copy, PartialOrd, Ord, PartialEq, Eq, Hash)]
+#[derive(Debug, Default, Clone, Copy, PartialOrd, Ord, PartialEq, Eq, Hash)]
 pub struct SourceLocation {
     /// The [`StringHandle`] for the file path of the source file. Optional.
     pub file_path: Option<StringHandle>,