From fc69529dab66254d353975844034dab545a7335b Mon Sep 17 00:00:00 2001 From: Ryan Liptak Date: Mon, 4 Sep 2023 01:33:53 -0700 Subject: [PATCH] ErrorBundle.addOtherSourceLocation: Fix source_line ending up as garbage when source_line is 0 The zero value needs special handling since it means 'no source line' and should be preserved through the copy. --- lib/std/zig/ErrorBundle.zig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/std/zig/ErrorBundle.zig b/lib/std/zig/ErrorBundle.zig index 24d3045436..31a706b8e4 100644 --- a/lib/std/zig/ErrorBundle.zig +++ b/lib/std/zig/ErrorBundle.zig @@ -474,7 +474,10 @@ pub const Wip = struct { .span_start = other_sl.span_start, .span_main = other_sl.span_main, .span_end = other_sl.span_end, - .source_line = try wip.addString(other.nullTerminatedString(other_sl.source_line)), + .source_line = if (other_sl.source_line != 0) + try wip.addString(other.nullTerminatedString(other_sl.source_line)) + else + 0, .reference_trace_len = other_sl.reference_trace_len, });