fix according to review

Author: Jesse Chen

src/compiler.ts

@@ -9830,8 +9830,7 @@ export class Compiler extends DiagnosticEmitter {
     let targetFunction = this.currentFlow.targetFunction;
     let source = range.source;
     if (source.debugInfoIndex < 0) source.debugInfoIndex = this.module.addDebugInfoFile(source.normalizedPath);
-    range.debugInfo.set(targetFunction.internalName, expr);
-    targetFunction.debugLocations.push(range);
+    targetFunction.debugLocations.set(expr, range);
   }
 
   /** Checks whether a particular function signature is supported. */

src/diagnostics.ts

@@ -11,7 +11,6 @@ import {
   DiagnosticCode,
   diagnosticCodeToString
 } from "./diagnosticMessages.generated";
-import { ExpressionRef } from "./module";
 
 import {
   isLineBreak,
@@ -46,7 +45,6 @@ export const enum DiagnosticCategory {
 export class Range {
 
   source!: Source;
-  debugInfo: Map<string, ExpressionRef> = new Map<string, ExpressionRef>();
 
   constructor(public start: i32, public end: i32) {}
 

src/program.ts

@@ -3746,7 +3746,7 @@ export class Function extends TypedElement {
   /** Default control flow. */
   flow!: Flow;
   /** Remembered debug locations. */
-  debugLocations: Range[] = [];
+  debugLocations: Map<ExpressionRef, Range> = new Map<ExpressionRef, Range>();
   /** Function reference, if compiled. */
   ref: FunctionRef = 0;
   /** Varargs stub for calling with omitted arguments. */
@@ -3913,15 +3913,11 @@ export class Function extends TypedElement {
 
   addDebugInfo(module: Module, ref: FunctionRef): void {
     if (this.program.options.sourceMap) {
-      let debugLocations = this.debugLocations;
-      for (let i = 0, k = debugLocations.length; i < k; ++i) {
-        let range = debugLocations[i];
+      for (const [expressRef, range] of this.debugLocations) {
         let source = range.source;
-        const debugInfo = range.debugInfo.get(this.internalName);
-        assert(debugInfo);
         module.setDebugLocation(
           ref,
-          debugInfo as ExpressionRef,
+          expressRef,
           source.debugInfoIndex,
           source.lineAt(range.start),
           source.columnAt() - 1 // source maps are 0-based

tests/compiler/template-debuginfo.debug.sourcemap.wat

@@ -1277,17 +1277,24 @@
     (local.set $block|3
      (local.get $block)
     )
+    ;;@ ~lib/rt/tlsf.ts:97:2
     (br $label$3
+     ;;@ ~lib/rt/tlsf.ts:97:9
      (i32.add
+      ;;@ ~lib/rt/tlsf.ts:97:27
       (i32.add
        (local.get $block|3)
+       ;;@ ~lib/rt/tlsf.ts:97:54
        (i32.const 4)
       )
+      ;;@ ~lib/rt/tlsf.ts:97:72
       (i32.and
        (call $~lib/rt/common/BLOCK#get:mmInfo
         (local.get $block|3)
        )
+       ;;@ ~lib/rt/tlsf.ts:97:87
        (i32.xor
+        ;;@ ~lib/rt/tlsf.ts:97:88
         (i32.const 3)
         (i32.const -1)
        )
@@ -3480,12 +3487,17 @@
      (local.set $fl|6
       (local.get $fl)
      )
+     ;;@ ~lib/rt/tlsf.ts:145:2
      (br $label$8
+      ;;@ ~lib/rt/tlsf.ts:145:9
       (i32.load offset=4
+       ;;@ ~lib/rt/tlsf.ts:146:4
        (i32.add
         (local.get $root|5)
+        ;;@ ~lib/rt/tlsf.ts:146:31
         (i32.shl
          (local.get $fl|6)
+         ;;@ ~lib/rt/tlsf.ts:146:37
          (i32.const 2)
         )
        )
@@ -3631,19 +3643,27 @@
           (local.get $slMap)
          )
         )
-        ;;@ ~lib/rt/tlsf.ts:344:31
+        ;;@ ~lib/rt/tlsf.ts:164:2
         (br $label$14
+         ;;@ ~lib/rt/tlsf.ts:164:9
          (i32.load offset=96
+          ;;@ ~lib/rt/tlsf.ts:165:4
           (i32.add
            (local.get $root|12)
+           ;;@ ~lib/rt/tlsf.ts:165:31
            (i32.shl
+            ;;@ ~lib/rt/tlsf.ts:165:32
             (i32.add
+             ;;@ ~lib/rt/tlsf.ts:165:33
              (i32.shl
               (local.get $fl|13)
+              ;;@ ~lib/rt/tlsf.ts:165:39
               (i32.const 4)
              )
+             ;;@ ~lib/rt/tlsf.ts:165:50
              (local.get $sl|14)
             )
+            ;;@ ~lib/rt/tlsf.ts:165:64
             (i32.const 2)
            )
           )
@@ -4076,22 +4096,29 @@
      (i32.and
       ;;@ ~lib/rt/tlsf.ts:371:4
       (call $~lib/rt/common/BLOCK#get:mmInfo
-       ;;@ ~lib/rt/tlsf.ts:97:2
        (block $label$5 (result i32)
+        ;;@ ~lib/rt/tlsf.ts:371:13
         (local.set $block|6
          (local.get $block)
         )
+        ;;@ ~lib/rt/tlsf.ts:97:2
         (br $label$5
+         ;;@ ~lib/rt/tlsf.ts:97:9
          (i32.add
+          ;;@ ~lib/rt/tlsf.ts:97:27
           (i32.add
            (local.get $block|6)
+           ;;@ ~lib/rt/tlsf.ts:97:54
            (i32.const 4)
           )
+          ;;@ ~lib/rt/tlsf.ts:97:72
           (i32.and
            (call $~lib/rt/common/BLOCK#get:mmInfo
             (local.get $block|6)
            )
+           ;;@ ~lib/rt/tlsf.ts:97:87
            (i32.xor
+            ;;@ ~lib/rt/tlsf.ts:97:88
             (i32.const 3)
             (i32.const -1)
            )