Add sourceMapURL to source table

This will allow us to resolve the source maps later.

Author: canova

src/profile-logic/data-structures.ts

@@ -352,6 +352,7 @@ export function getEmptySourceTable(): SourceTable {
     filename: [],
     startLine: [],
     startColumn: [],
+    sourceMapURL: [],
     length: 0,
   };
 }

src/profile-logic/global-data-collector.ts

@@ -119,7 +119,8 @@ export class GlobalDataCollector {
     uuid: string | null,
     filename: string,
     startLine: number = 1,
-    startColumn: number = 1
+    startColumn: number = 1,
+    sourceMapURL: string | null = null
   ): IndexIntoSourceTable {
     let index: IndexIntoSourceTable | undefined;
 
@@ -134,10 +135,15 @@ export class GlobalDataCollector {
     if (index === undefined) {
       index = this._sources.length;
       const filenameIndex = this._stringTable.indexForString(filename);
+      const sourceMapURLIndex =
+        sourceMapURL !== null
+          ? this._stringTable.indexForString(sourceMapURL)
+          : null;
       this._sources.uuid[index] = uuid;
       this._sources.filename[index] = filenameIndex;
       this._sources.startLine[index] = startLine;
       this._sources.startColumn[index] = startColumn;
+      this._sources.sourceMapURL[index] = sourceMapURLIndex;
       this._sources.length++;
 
       if (uuid !== null) {

src/profile-logic/merge-compare.ts

@@ -560,6 +560,12 @@ function mergeSources(
       const originalUrlIndex = sources.filename[i];
       const newUrlIndex = oldStringToNewStringPlusOne[originalUrlIndex] - 1;
 
+      const originalSourceMapURLIndex = sources.sourceMapURL[i];
+      const newSourceMapURLIndex =
+        originalSourceMapURLIndex !== null
+          ? oldStringToNewStringPlusOne[originalSourceMapURLIndex] - 1
+          : null;
+
       const sourceKey = uuid ?? `null-uuid-${newUrlIndex}`;
       let insertedSourceIndex = mapOfInsertedSources.get(sourceKey);
       if (insertedSourceIndex === undefined) {
@@ -569,6 +575,7 @@ function mergeSources(
         newSources.filename[insertedSourceIndex] = newUrlIndex;
         newSources.startLine[insertedSourceIndex] = sources.startLine[i];
         newSources.startColumn[insertedSourceIndex] = sources.startColumn[i];
+        newSources.sourceMapURL[insertedSourceIndex] = newSourceMapURLIndex;
         newSources.length++;
         mapOfInsertedSources.set(sourceKey, insertedSourceIndex);
       }

src/profile-logic/process-profile.ts

@@ -437,16 +437,20 @@ function _extractJsFunction(
       const filenameIndex = geckoSourceTable.schema.filename;
       const startLineIndex = geckoSourceTable.schema.startLine;
       const startColumnIndex = geckoSourceTable.schema.startColumn;
+      const sourceMapURLIndex = geckoSourceTable.schema.sourceMapURL;
       const uuid = geckoSourceTable.data[geckoSourceIdx][uuidIndex];
       const filename = geckoSourceTable.data[geckoSourceIdx][filenameIndex];
       const startLine = geckoSourceTable.data[geckoSourceIdx][startLineIndex];
       const startColumn =
         geckoSourceTable.data[geckoSourceIdx][startColumnIndex];
+      const sourceMapURL =
+        geckoSourceTable.data[geckoSourceIdx][sourceMapURLIndex];
       processedSourceIndex = globalDataCollector.indexForSource(
         uuid,
         filename,
         startLine,
-        startColumn
+        startColumn,
+        sourceMapURL
       );
     }
   }

src/profile-logic/profile-compacting.ts

@@ -746,6 +746,11 @@ function _gatherReferencesInSources(
     }
 
     referencedStrings[sources.filename[i]] = 1;
+
+    const sourceMapURL = sources.sourceMapURL[i];
+    if (sourceMapURL !== null) {
+      referencedStrings[sourceMapURL] = 1;
+    }
   }
 }
 
@@ -769,6 +774,15 @@ function _createCompactedSources(
     newSources.startLine[newIndex] = sources.startLine[i];
     newSources.startColumn[newIndex] = sources.startColumn[i];
 
+    // Translate the sourceMapURL string index if present.
+    // The old string indexes are no longer valid since we compacted the
+    // string array. All the indexes that reference them need to be updated.
+    const oldSourceMapURLIndex = sources.sourceMapURL[i];
+    newSources.sourceMapURL[newIndex] =
+      oldSourceMapURLIndex !== null
+        ? oldStringToNewStringPlusOne[oldSourceMapURLIndex] - 1
+        : null;
+
     oldSourceToNewSourcePlusOne[i] = newIndex + 1;
   }
 

src/profile-logic/symbolication.ts

@@ -818,6 +818,7 @@ function _partiallyApplySymbolicationStep(
             sources.uuid.push(null);
             sources.startLine.push(1);
             sources.startColumn.push(1);
+            sources.sourceMapURL.push(null);
             sources.length++;
           }
           funcTable.source[funcIndex] = sourceIndex;

src/test/fixtures/profiles/gecko-profile.ts

@@ -53,6 +53,7 @@ export function getEmptySourceTable(): GeckoSourceTable {
       filename: 1 as const,
       startLine: 2 as const,
       startColumn: 3 as const,
+      sourceMapURL: 4 as const,
     },
     data: [],
   };

src/test/fixtures/utils.ts

@@ -651,7 +651,8 @@ export function addSourceToTable(
   urlStringIndex: number,
   uuid: string | null = null,
   startLine: number = 1,
-  startColumn: number = 1
+  startColumn: number = 1,
+  sourceMapURLStringIndex: number | null = null
 ): number {
   // Check if source already exists
   for (let i = 0; i < sources.filename.length; i++) {
@@ -666,6 +667,7 @@ export function addSourceToTable(
   sources.uuid.push(uuid);
   sources.startLine.push(startLine);
   sources.startColumn.push(startColumn);
+  sources.sourceMapURL.push(sourceMapURLStringIndex);
   sources.length = sources.filename.length;
 
   return sourceIndex;

src/test/store/__snapshots__/profile-view.test.ts.snap

@@ -636,6 +636,7 @@ Object {
     "sources": Object {
       "filename": Array [],
       "length": 0,
+      "sourceMapURL": Array [],
       "startColumn": Array [],
       "startLine": Array [],
       "uuid": Array [],
@@ -2626,6 +2627,7 @@ CallTree {
     "sources": Object {
       "filename": Array [],
       "length": 0,
+      "sourceMapURL": Array [],
       "startColumn": Array [],
       "startLine": Array [],
       "uuid": Array [],
@@ -2976,6 +2978,7 @@ Object {
   "sources": Object {
     "filename": Array [],
     "length": 0,
+    "sourceMapURL": Array [],
     "startColumn": Array [],
     "startLine": Array [],
     "uuid": Array [],
@@ -3394,6 +3397,7 @@ Object {
   "sources": Object {
     "filename": Array [],
     "length": 0,
+    "sourceMapURL": Array [],
     "startColumn": Array [],
     "startLine": Array [],
     "uuid": Array [],
@@ -3742,6 +3746,7 @@ Object {
   "sources": Object {
     "filename": Array [],
     "length": 0,
+    "sourceMapURL": Array [],
     "startColumn": Array [],
     "startLine": Array [],
     "uuid": Array [],
@@ -4090,6 +4095,7 @@ Object {
   "sources": Object {
     "filename": Array [],
     "length": 0,
+    "sourceMapURL": Array [],
     "startColumn": Array [],
     "startLine": Array [],
     "uuid": Array [],