Add test for Gsym inlined function lookup

This change adds a test for the Gsym inlined function lookup logic.

Signed-off-by: Daniel Müller <[email protected]>

data/test-stable-addresses.c

@@ -16,6 +16,22 @@ factorial_wrapper() {
   factorial(5);
 }
 
+__attribute__((always_inline)) static void
+factorial_2nd_layer_inline_wrapper() {
+  factorial(6);
+}
+
+__attribute__((always_inline)) static void
+factorial_inline_wrapper() {
+  factorial_2nd_layer_inline_wrapper();
+}
+
+__attribute__((section(".text.inline")))
+__attribute__((noinline)) static void
+factorial_inline_test() {
+  factorial_inline_wrapper();
+}
+
 // A dummy function that should not actually be called. It just contains a bunch
 // of signature bytes that we use for offset verification later on.
 asm(
@@ -33,6 +49,7 @@ extern void dummy(void);
 __attribute__((section(".text.main"))) int
 main(int argc, const char *argv[]) {
   factorial_wrapper();
+  factorial_inline_test();
   foo();
   dummy();
   return 0;

data/test-stable-addresses.ld

@@ -4,6 +4,8 @@ SECTIONS {
     *(.text)
     . = ABSOLUTE(0x2000100);
     *(.text.factorial)
+    . = ABSOLUTE(0x2000200);
+    *(.text.inline)
   }
   .data : {
     *(.data)

src/gsym/resolver.rs

@@ -338,13 +338,41 @@ mod tests {
         // `main` resides at address 0x2000000, and it's located at the given
         // line.
         let info = resolver.find_line_info(0x2000000).unwrap().unwrap();
-        assert_eq!(info.direct.line, Some(34));
+        assert_eq!(info.direct.line, Some(50));
         assert_eq!(info.direct.file, "test-stable-addresses.c");
+        assert_eq!(info.inlined, Vec::new());
 
         // `factorial` resides at address 0x2000100, and it's located at the
         // given line.
         let info = resolver.find_line_info(0x2000100).unwrap().unwrap();
         assert_eq!(info.direct.line, Some(8));
         assert_eq!(info.direct.file, "test-stable-addresses.c");
+        assert_eq!(info.inlined, Vec::new());
+
+        // Address is hopefully sufficiently far into `factorial_inline_test` to
+        // always fall into the inlined region, no matter toolchain. If not, add
+        // padding bytes/dummy instructions and adjust some more.
+        let addr = 0x200020a;
+        let syms = resolver.find_syms(addr).unwrap();
+        assert_eq!(syms.len(), 1);
+        let sym = &syms[0];
+        assert_eq!(sym.name, "factorial_inline_test");
+
+        let info = resolver.find_line_info(addr).unwrap().unwrap();
+        assert_eq!(info.direct.line, Some(21));
+        assert_eq!(info.direct.file, "test-stable-addresses.c");
+        assert_eq!(info.inlined.len(), 2);
+
+        let name = &info.inlined[0].0;
+        assert_eq!(*name, "factorial_inline_wrapper");
+        let frame = info.inlined[0].1.as_ref().unwrap();
+        assert_eq!(frame.file, "test-stable-addresses.c");
+        assert_eq!(frame.line, Some(32));
+
+        let name = &info.inlined[1].0;
+        assert_eq!(*name, "factorial_2nd_layer_inline_wrapper");
+        let frame = info.inlined[1].1.as_ref().unwrap();
+        assert_eq!(frame.file, "test-stable-addresses.c");
+        assert_eq!(frame.line, Some(26));
     }
 }

src/symbolize/mod.rs

@@ -86,13 +86,15 @@ pub use symbolizer::Sym;
 pub use symbolizer::Symbolizer;
 
 
+#[derive(Debug, PartialEq)]
 pub(crate) struct FrameCodeInfo<'src> {
     pub dir: &'src Path,
     pub file: &'src OsStr,
     pub line: Option<u32>,
     pub column: Option<u16>,
 }
 
+#[derive(Debug, PartialEq)]
 pub(crate) struct AddrCodeInfo<'src> {
     /// Source information about the top-level frame belonging to an address.
     pub direct: FrameCodeInfo<'src>,