Use the raw_lines field in stackprof for more precise lines

Since tmm1/stackprof#213 the actual source line within
the method, not just the method start line, should be available.

src/import/stackprof.test.ts

@@ -38,3 +38,48 @@ describe('importCpuProfileWithProperWeights', () => {
     }
   })
 })
+
+describe('reads correct line numbers', () => {
+  test('falls back to method start line if raw lines not available', async () => {
+    // this was recorded with an older version of stackprof that does not have the raw_lines field
+    const profileFile = readFileSync('./sample/profiles/stackprof/simple-cpu-stackprof.json')
+    const profileGroup = await importProfileGroupFromText(
+      'simple-cpu-stackprof.json',
+      profileFile.toString(),
+    )
+    expect(profileGroup).not.toBeNull()
+
+    if (profileGroup) {
+      const profile = profileGroup.profiles[profileGroup.indexToView]
+      expect(profile).not.toBeNull()
+
+      if (profile) {
+        expect(
+          profile.getGroupedCalltreeRoot().children[0].children[0].children[0].frame.line,
+        ).toBe(37)
+      }
+    }
+  })
+  test('uses the most precise iseq line if raw_lines is available', async () => {
+    const profileFile = readFileSync('./sample/profiles/stackprof/wall_with_raw_lines.json')
+    const profileGroup = await importProfileGroupFromText(
+      'wall_with_raw_lines.json',
+      profileFile.toString(),
+    )
+    expect(profileGroup).not.toBeNull()
+
+    if (profileGroup) {
+      const profile = profileGroup.profiles[profileGroup.indexToView]
+      expect(profile).not.toBeNull()
+
+      if (profile) {
+        // note that line 5 of simple.rb is *inside* the function body, proving this works as previously it would only ever show the start line
+        // {"col": undefined, "file": ".../sample/programs/ruby/simple.rb", "key": 4826695720, "line": 5, "name": "Object#a", "selfWeight": 0, "totalWeight": 6231645}
+        expect(
+          profile.getGroupedCalltreeRoot().children[0].children[0].children[0].children[0].frame
+            .line,
+        ).toBe(5)
+      }
+    }
+  })
+})

src/import/stackprof.ts

@@ -13,13 +13,14 @@ export interface StackprofProfile {
   frames: {[number: string]: StackprofFrame}
   mode: string
   raw: number[]
+  raw_lines: number[]
   raw_timestamp_deltas: number[]
   samples: number
   interval: number
 }
 
 export function importFromStackprof(stackprofProfile: StackprofProfile): Profile {
-  const {frames, mode, raw, raw_timestamp_deltas, interval} = stackprofProfile
+  const {frames, mode, raw, raw_lines, raw_timestamp_deltas, interval} = stackprofProfile
   const profile = new StackListProfileBuilder()
   profile.setValueFormatter(new TimeFormatter('microseconds')) // default to time format unless we're in object mode
 
@@ -33,13 +34,15 @@ export function importFromStackprof(stackprofProfile: StackprofProfile): Profile
     let stack: FrameInfo[] = []
     for (let j = 0; j < stackHeight; j++) {
       const id = raw[i++]
+      const lineNo = raw_lines ? raw_lines[i - 1] : frames[id].line
       let frameName = frames[id].name
       if (frameName == null) {
         frameName = '(unknown)'
       }
       const frame = {
         key: id,
         ...frames[id],
+        line: lineNo,
         name: frameName,
       }
       stack.push(frame)