9 files changed, 79 insertions, 6 deletions
diff --git a/test/debugInfo.fromasm.read-written b/test/debugInfo.fromasm.read-written
index 797d990e7..cd7402cb1 100644
--- a/test/debugInfo.fromasm.read-written
+++ b/test/debugInfo.fromasm.read-written
@@ -73,8 +73,8 @@
   (local $4 i32)
   ;;@ fib.c:8:0
   (set_local $4
+   ;;@ fib.c:3:0
    (if (result i32)
-    ;;@ fib.c:3:0
     (i32.gt_s
      (get_local $0)
      (i32.const 0)
@@ -96,7 +96,6 @@
     )
    )
   )
-  ;;@ fib.c:3:0
   (loop $label$3
    ;;@ fib.c:4:0
    (set_local $1
diff --git a/test/fib-dbg.wasm.fromBinary b/test/fib-dbg.wasm.fromBinary
index ecb9d7efd..9e1bf0d53 100644
--- a/test/fib-dbg.wasm.fromBinary
+++ b/test/fib-dbg.wasm.fromBinary
@@ -122,7 +122,6 @@
   (local $9 i32)
   (local $10 i32)
   (local $11 i32)
-  ;;@ fib.c:8:0
   (block $label$1
    (set_local $11
     (get_global $global$3)
@@ -134,9 +133,7 @@
      (i32.const 0)
     )
    )
-   ;;@ fib.c:8:0
    (if
-    ;;@ fib.c:3:0
     (get_local $6)
     (block
      (set_local $1
@@ -159,7 +156,6 @@
      )
     )
    )
-   ;;@ fib.c:3:0
    (loop $label$4
     (block $label$5
      ;;@ fib.c:4:0
diff --git a/test/fn_prolog_epilog.debugInfo.wasm b/test/fn_prolog_epilog.debugInfo.wasm
new file mode 100644
index 000000000..414fe9661
--- /dev/null
+++ b/test/fn_prolog_epilog.debugInfo.wasm
diff --git a/test/fn_prolog_epilog.debugInfo.wasm.fromBinary b/test/fn_prolog_epilog.debugInfo.wasm.fromBinary
new file mode 100644
index 000000000..2681f8bb4
--- /dev/null
+++ b/test/fn_prolog_epilog.debugInfo.wasm.fromBinary
@@ -0,0 +1,18 @@
+(module
+ (type $0 (func))
+ ;;@ src.cpp:1:1
+ (func $0 (; 0 ;) (type $0)
+  (nop)
+  ;;@ src.cpp:2:1
+  (block $label$1
+   ;;@ src.cpp:2:2
+   (block $label$2
+    (br $label$2)
+   )
+  )
+  ;;@ src.cpp:3:1
+  (return)
+  ;;@ src.cpp:3:2
+ )
+)
+
diff --git a/test/fn_prolog_epilog.debugInfo.wasm.map b/test/fn_prolog_epilog.debugInfo.wasm.map
new file mode 100644
index 000000000..593e21430
--- /dev/null
+++ b/test/fn_prolog_epilog.debugInfo.wasm.map
@@ -0,0 +1 @@
+{"version":3,"sources":["src.cpp"],"names":[],"mappings":"sBAAC,EACA,EAAC,MACD,CAAC"}
+\ No newline at end of file
diff --git a/test/fn_prolog_epilog.debugInfo.wast b/test/fn_prolog_epilog.debugInfo.wast
new file mode 100644
index 000000000..39c893fbb
--- /dev/null
+++ b/test/fn_prolog_epilog.debugInfo.wast
@@ -0,0 +1,16 @@
+(module
+  ;;@ src.cpp:1:1
+  (func
+    (nop)
+    ;;@ src.cpp:2:1
+    (block $l0
+      ;;@ src.cpp:2:2
+      (block $l1
+        (br $l1)
+      )
+    )
+    ;;@ src.cpp:3:1
+    (return)
+    ;;@ src.cpp:3:2
+  )
+)
diff --git a/test/fn_prolog_epilog.debugInfo.wast.from-wast b/test/fn_prolog_epilog.debugInfo.wast.from-wast
new file mode 100644
index 000000000..ba4fdc8d1
--- /dev/null
+++ b/test/fn_prolog_epilog.debugInfo.wast.from-wast
@@ -0,0 +1,17 @@
+(module
+ (type $0 (func))
+ ;;@ src.cpp:1:1
+ (func $0 (; 0 ;) (type $0)
+  (nop)
+  ;;@ src.cpp:2:1
+  (block $l0
+   ;;@ src.cpp:2:2
+   (block $l1
+    (br $l1)
+   )
+  )
+  ;;@ src.cpp:3:1
+  (return)
+  ;;@ src.cpp:3:2
+ )
+)
diff --git a/test/fn_prolog_epilog.debugInfo.wast.fromBinary b/test/fn_prolog_epilog.debugInfo.wast.fromBinary
new file mode 100644
index 000000000..735a9dbcf
--- /dev/null
+++ b/test/fn_prolog_epilog.debugInfo.wast.fromBinary
@@ -0,0 +1,13 @@
+(module
+ (type $0 (func))
+ (func $0 (; 0 ;) (type $0)
+  (nop)
+  (block $label$1
+   (block $label$2
+    (br $label$2)
+   )
+  )
+  (return)
+ )
+)
+
diff --git a/test/fn_prolog_epilog.debugInfo.wast.fromBinary.noDebugInfo b/test/fn_prolog_epilog.debugInfo.wast.fromBinary.noDebugInfo
new file mode 100644
index 000000000..735a9dbcf
--- /dev/null
+++ b/test/fn_prolog_epilog.debugInfo.wast.fromBinary.noDebugInfo
@@ -0,0 +1,13 @@
+(module
+ (type $0 (func))
+ (func $0 (; 0 ;) (type $0)
+  (nop)
+  (block $label$1
+   (block $label$2
+    (br $label$2)
+   )
+  )
+  (return)
+ )
+)
+