diff --git a/modules/dbgfmts/dwarf2/dwarf2-line.c b/modules/dbgfmts/dwarf2/dwarf2-line.c
index d2f55e55..a1b0fe51 100644
--- a/modules/dbgfmts/dwarf2/dwarf2-line.c
+++ b/modules/dbgfmts/dwarf2/dwarf2-line.c
@@ -621,6 +621,7 @@ dwarf2_generate_line_section(yasm_section *sect, /*@null@*/ void *d)
         bcinfo.lastfile = 0;
         bcinfo.loc.isa_change = 0;
         bcinfo.loc.column = 0;
+        bcinfo.loc.discriminator = 0;
         bcinfo.loc.is_stmt = IS_STMT_NOCHANGE;
         bcinfo.loc.basic_block = 0;
         bcinfo.loc.prologue_end = 0;
diff --git a/modules/dbgfmts/dwarf2/tests/gen64/dwarf64_pathname.hex b/modules/dbgfmts/dwarf2/tests/gen64/dwarf64_pathname.hex
index 10ae2c38..c67b19de 100644
--- a/modules/dbgfmts/dwarf2/tests/gen64/dwarf64_pathname.hex
+++ b/modules/dbgfmts/dwarf2/tests/gen64/dwarf64_pathname.hex
@@ -38,7 +38,7 @@
 00 
 00 
 00 
-80 
+60 
 03 
 00 
 00 
@@ -97,7 +97,7 @@ ec
 83 
 ec 
 40 
-78 
+4c 
 00 
 00 
 00 
@@ -151,10 +151,6 @@ fb
 04 
 02 
 00 
-02 
-04 
-5b 
-00 
 09 
 02 
 00 
@@ -166,55 +162,15 @@ fb
 00 
 00 
 01 
-00 
-02 
-04 
-5b 
 2e 
-00 
-02 
-04 
-5b 
 58 
-00 
-02 
-04 
-5b 
 3c 
-00 
-02 
-04 
-5b 
 3c 
-00 
-02 
-04 
-5b 
 74 
-00 
-02 
-04 
-5b 
 2e 
-00 
-02 
-04 
-5b 
 20 
-00 
-02 
-04 
-5b 
 20 
-00 
-02 
-04 
-5b 
 3c 
-00 
-02 
-04 
-5b 
 4b 
 02 
 04 
@@ -222,7 +178,7 @@ fb
 01 
 01 
 00 
-3c 
+38 
 00 
 00 
 00 
@@ -414,6 +370,18 @@ fb
 00 
 00 
 00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
 2c 
 00 
 00 
@@ -982,8 +950,8 @@ ff
 00 
 00 
 00 
-00 
-02 
+e0 
+01 
 00 
 00 
 00 
@@ -1046,7 +1014,7 @@ ff
 00 
 00 
 00 
-8c 
+6c 
 02 
 00 
 00 
@@ -1110,7 +1078,7 @@ ff
 00 
 00 
 00 
-9c 
+7c 
 02 
 00 
 00 
@@ -1246,7 +1214,7 @@ d8
 00 
 00 
 00 
-7c 
+50 
 00 
 00 
 00 
@@ -1302,7 +1270,7 @@ d8
 00 
 00 
 00 
-e0 
+b4 
 00 
 00 
 00 
@@ -1366,7 +1334,7 @@ e0
 00 
 00 
 00 
-f8 
+cc 
 00 
 00 
 00 
@@ -1430,8 +1398,8 @@ f8
 00 
 00 
 00 
-0c 
-01 
+e0 
+00 
 00 
 00 
 00 
@@ -1494,7 +1462,7 @@ f8
 00 
 00 
 00 
-40 
+14 
 01 
 00 
 00 
@@ -1558,7 +1526,7 @@ f8
 00 
 00 
 00 
-a0 
+80 
 01 
 00 
 00 
@@ -1622,7 +1590,7 @@ a0
 00 
 00 
 00 
-d0 
+b0 
 01 
 00 
 00