Parse module references in symbol data

Author: jan-auer

src/symbol/mod.rs

@@ -476,8 +476,10 @@ pub struct ProcedureReferenceSymbol<'t> {
     ///
     /// Note that this symbol might be located in a different module.
     pub symbol_index: SymbolIndex,
-    /// Index of the module containing the actual symbol.
-    pub module: u16,
+    /// Index of the module in [`DebugInformation::modules`] containing the actual symbol.
+    ///
+    /// [`DebugInformation::modules`]: struct.DebugInformation.html#method.modules
+    pub module: Option<usize>,
     /// Name of the procedure reference.
     pub name: Option<RawString<'t>>,
 }
@@ -492,7 +494,7 @@ impl<'t> TryFromCtx<'t, SymbolKind> for ProcedureReferenceSymbol<'t> {
             global: matches!(kind, S_PROCREF | S_PROCREF_ST),
             sum_name: buf.parse()?,
             symbol_index: buf.parse()?,
-            module: buf.parse()?,
+            module: buf.parse::<u16>()?.checked_sub(1).map(usize::from),
             name: parse_optional_name(&mut buf, kind)?,
         };
 
@@ -511,8 +513,10 @@ pub struct DataReferenceSymbol<'t> {
     ///
     /// Note that this symbol might be located in a different module.
     pub symbol_index: SymbolIndex,
-    /// Index of the module containing the actual symbol.
-    pub module: u16,
+    /// Index of the module in [`DebugInformation::modules`] containing the actual symbol.
+    ///
+    /// [`DebugInformation::modules`]: struct.DebugInformation.html#method.modules
+    pub module: Option<usize>,
     /// Name of the data reference.
     pub name: Option<RawString<'t>>,
 }
@@ -526,7 +530,7 @@ impl<'t> TryFromCtx<'t, SymbolKind> for DataReferenceSymbol<'t> {
         let symbol = DataReferenceSymbol {
             sum_name: buf.parse()?,
             symbol_index: buf.parse()?,
-            module: buf.parse()?,
+            module: buf.parse::<u16>()?.checked_sub(1).map(usize::from),
             name: parse_optional_name(&mut buf, kind)?,
         };
 
@@ -545,8 +549,10 @@ pub struct AnnotationReferenceSymbol<'t> {
     ///
     /// Note that this symbol might be located in a different module.
     pub symbol_index: SymbolIndex,
-    /// Index of the module containing the actual symbol.
-    pub module: u16,
+    /// Index of the module in [`DebugInformation::modules`] containing the actual symbol.
+    ///
+    /// [`DebugInformation::modules`]: struct.DebugInformation.html#method.modules
+    pub module: Option<usize>,
     /// Name of the annotation reference.
     pub name: RawString<'t>,
 }
@@ -560,7 +566,7 @@ impl<'t> TryFromCtx<'t, SymbolKind> for AnnotationReferenceSymbol<'t> {
         let symbol = AnnotationReferenceSymbol {
             sum_name: buf.parse()?,
             symbol_index: buf.parse()?,
-            module: buf.parse()?,
+            module: buf.parse::<u16>()?.checked_sub(1).map(usize::from),
             name: parse_symbol_name(&mut buf, kind)?,
         };
 
@@ -1764,7 +1770,7 @@ mod tests {
                     global: true,
                     sum_name: 0,
                     symbol_index: SymbolIndex(108),
-                    module: 1,
+                    module: Some(0),
                     name: Some("Baz::f_public".into()),
                 })
             );
@@ -1878,7 +1884,7 @@ mod tests {
                     global: false,
                     sum_name: 0,
                     symbol_index: SymbolIndex(1152),
-                    module: 182,
+                    module: Some(181),
                     name: Some("capture_current_context".into()),
                 })
             );