AssemblyScript
diff --git a/‎src/passes/shadowstack.ts‎
Lines changed: 6 additions & 2 deletions b/‎src/passes/shadowstack.ts‎
Lines changed: 6 additions & 2 deletions
diff --git a/‎src/program.ts‎
Lines changed: 20 additions & 1 deletion b/‎src/program.ts‎
Lines changed: 20 additions & 1 deletion
@@ -132,7 +132,7 @@ import {
   ExternalKind,
   ExportRef,
   expandType,
-  isConstZero
+  isConstZero,
 } from "../module";
 
 import {
@@ -477,7 +477,11 @@ export class ShadowStackPass extends Pass {
     let moduleRef = this.module.ref;
     _BinaryenRemoveFunction(moduleRef, name);
     let cArr = allocPtrArray(vars);
-    _BinaryenAddFunction(moduleRef, name, params, results, cArr, vars.length, body);
+    let newFuncRef = _BinaryenAddFunction(moduleRef, name, params, results, cArr, vars.length, body);
+    if (this.options.sourceMap || this.options.debugInfo) {
+      let func = this.compiler.program.searchFunctionByRef(newFuncRef);
+      if (func) func.addDebugInfo(this.module, newFuncRef);
+    }
     _free(cArr);
   }
 
 
@@ -117,7 +117,8 @@ import {
 import {
   Module,
   FunctionRef,
-  MemorySegment
+  MemorySegment,
+  getFunctionName
 } from "./module";
 
 import {
@@ -812,6 +813,20 @@ export class Program extends DiagnosticEmitter {
     return this.blockOverhead + this.objectOverhead;
   }
 
+  searchFunctionByRef(ref: FunctionRef): Function | null {
+    const modifiedFunctionName = getFunctionName(ref);
+    if (modifiedFunctionName) {
+      const instancesByName = this.instancesByName;
+      if (instancesByName.has(modifiedFunctionName)) {
+        const element = assert(instancesByName.get(modifiedFunctionName));
+        if (element.kind == ElementKind.FUNCTION) {
+          return <Function>element;
+        }
+      }
+    }
+    return null;
+  }
+
   /** Computes the next properly aligned offset of a memory manager block, given the current bump offset. */
   computeBlockStart(currentOffset: i32): i32 {
     var blockOverhead = this.blockOverhead;
@@ -3763,6 +3778,10 @@ export class Function extends TypedElement {
     this.breakStack = breakStack = null;
     this.breakLabel = null;
     this.tempI32s = this.tempI64s = this.tempF32s = this.tempF64s = null;
+    this.addDebugInfo(module, ref);
+  }
+
+  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) {