From beee98e246d2684dc0d1fa42ef9c77c59a381733 Mon Sep 17 00:00:00 2001
From: Nikolay Nikolov <nickysn@gmail.com>
Date: Sun, 15 Sep 2024 11:15:11 +0300
Subject: [PATCH] * WebAssembly debug info: make wasmtime happy by not emitting
 line info end   sequences for procedures that lack any debug lines emitted
 previously

---
 compiler/dbgdwarf.pas | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/compiler/dbgdwarf.pas b/compiler/dbgdwarf.pas
index 8ed136782f..46997119f9 100644
--- a/compiler/dbgdwarf.pas
+++ b/compiler/dbgdwarf.pas
@@ -3533,6 +3533,7 @@ implementation
         nolineinfolevel : Integer;
         prevlabel,
         currlabel     : tasmlabel;
+        haslineinfo: Boolean = false;
       begin
 {$ifdef OMFOBJSUPPORT}
         if ds_dwarf_omf_linnum in current_settings.debugswitches then
@@ -3625,6 +3626,7 @@ implementation
                 { line changed ? }
                 if (lastfileinfo.line<>currfileinfo.line) and ((currfileinfo.line<>0) or (nolineinfolevel>0)) then
                   begin
+                    haslineinfo:=true;
                     { set address }
                     current_asmdata.getlabel(currlabel, alt_dbgline);
                     list.insertbefore(tai_label.create(currlabel), hp);
@@ -3722,10 +3724,15 @@ implementation
           end;
 
         { end sequence }
-        asmline.concat(tai_const.Create_8bit(DW_LNS_extended_op));
-        asmline.concat(tai_const.Create_8bit(1));
-        asmline.concat(tai_const.Create_8bit(DW_LNE_end_sequence));
-        asmline.concat(tai_comment.Create(strpnew('###################')));
+        if haslineinfo or
+           { WasmTime doesn't like it when we emit an end sequence without any previous lines }
+           not (target_info.system in systems_wasm) then
+          begin
+            asmline.concat(tai_const.Create_8bit(DW_LNS_extended_op));
+            asmline.concat(tai_const.Create_8bit(1));
+            asmline.concat(tai_const.Create_8bit(DW_LNE_end_sequence));
+            asmline.concat(tai_comment.Create(strpnew('###################')));
+          end;
       end;