Mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2026-04-26 13:01:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

configurer: fix bad serialization of strings in run args

Browse Source
This commit is contained in:
Andrew Kelley
2026-04-19 12:45:35 -07:00
parent 05ae86bc6b
commit 5c7343bdbf
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/compiler/Maker/ScannedConfig.zig
+5
View File
@@ -74,6 +74,11 @@ fn printValue(sc: *const ScannedConfig, s: *Serializer, comptime Field: type, fi
Configuration.MaxRss => {
try s.value(field_value.toBytes(), .{});
},
Configuration.Step.Run.Arg.Index => {
var sub_struct = try s.beginStruct(.{});
try printStruct(sc, &sub_struct, Configuration.Step.Run.Arg, field_value.get(c));
try sub_struct.end();
},
else => switch (@typeInfo(Field)) {
.int => try s.int(field_value),
.pointer => |info| switch (info.size) {
lib/compiler/configurer.zig
+9 -9
View File
@@ -376,7 +376,7 @@ const Serialize = struct {
.generated = false,
.dep_file = false,
},
.prefix = .{ .value = try s.addOptionalString(a.prefix) },
.prefix = .{ .value = if (a.prefix.len != 0) try wc.addString(a.prefix) else null },
.suffix = .{ .value = null },
.basename = .{ .value = null },
.path = .{ .value = null },
@@ -394,7 +394,7 @@ const Serialize = struct {
.generated = false,
.dep_file = false,
},
.prefix = .{ .value = try s.addOptionalString(a.prefix) },
.prefix = .{ .value = if (a.prefix.len != 0) try wc.addString(a.prefix) else null },
.suffix = .{ .value = null },
.basename = .{ .value = null },
.path = .{ .value = try addLazyPath(s, a.lazy_path) },
@@ -412,7 +412,7 @@ const Serialize = struct {
.generated = false,
.dep_file = false,
},
.prefix = .{ .value = try addOptionalString(s, a.prefix) },
.prefix = .{ .value = if (a.prefix.len != 0) try wc.addString(a.prefix) else null },
.suffix = .{ .value = try addOptionalString(s, a.suffix) },
.basename = .{ .value = null },
.path = .{ .value = try addLazyPath(s, a.lazy_path) },
@@ -430,7 +430,7 @@ const Serialize = struct {
.generated = false,
.dep_file = false,
},
.prefix = .{ .value = try addOptionalString(s, a.prefix) },
.prefix = .{ .value = if (a.prefix.len != 0) try wc.addString(a.prefix) else null },
.suffix = .{ .value = null },
.basename = .{ .value = null },
.path = .{ .value = try addLazyPath(s, a.lazy_path) },
@@ -448,7 +448,7 @@ const Serialize = struct {
.generated = false,
.dep_file = false,
},
.prefix = .{ .value = try addOptionalString(s, a) },
.prefix = .{ .value = try wc.addString(a) },
.suffix = .{ .value = null },
.basename = .{ .value = null },
.path = .{ .value = null },
@@ -466,9 +466,9 @@ const Serialize = struct {
.generated = true,
.dep_file = false,
},
.prefix = .{ .value = try addOptionalString(s, a.prefix) },
.prefix = .{ .value = if (a.prefix.len != 0) try wc.addString(a.prefix) else null },
.suffix = .{ .value = null },
.basename = .{ .value = try addOptionalString(s, a.basename) },
.basename = .{ .value = if (a.basename.len != 0) try wc.addString(a.basename) else null },
.path = .{ .value = null },
.producer = .{ .value = null },
.generated = .{ .value = a.generated_file },
@@ -484,9 +484,9 @@ const Serialize = struct {
.generated = true,
.dep_file = false,
},
.prefix = .{ .value = try addOptionalString(s, a.prefix) },
.prefix = .{ .value = if (a.prefix.len != 0) try wc.addString(a.prefix) else null },
.suffix = .{ .value = null },
.basename = .{ .value = try addOptionalString(s, a.basename) },
.basename = .{ .value = if (a.basename.len != 0) try wc.addString(a.basename) else null },
.path = .{ .value = null },
.producer = .{ .value = null },
.generated = .{ .value = a.generated_file },