Commit 7e548af8b1527d2d04de1c12df9bf8afd1ad23ea | zig

author	Techatrix <techatrix@mailbox.org> 2025-02-19 09:03:56+01:00
committer	Techatrix <techatrix@mailbox.org> 2025-02-19 09:34:26+01:00
log	7e548af8b1527d2d04de1c12df9bf8afd1ad23ea
tree	4d0076eadb4163d6495d2e9dd7053378350f5da0
parent	c390f55e727c8f4ace2eb7992403bf8332a22126
signature	Signed by SSH key SHA256:HYC3SjXQcAt6uwv9pu/6OoVQ2rUH8rb5zKiUHSe9uxk

3 files changed, 17 insertions(+), 6 deletions(-)

lib/std/Build/Step/ConfigHeader.zig+11-6

 @@ -264,8 +264,11 @@ fn render_autoconf(
     values: std.StringArrayHashMap(Value),
     src_path: []const u8,
 ) !void {
-    var values_copy = try values.clone();
+    const build = step.owner;
-    defer values_copy.deinit();
+    const allocator = build.allocator;
+    var is_used: std.DynamicBitSetUnmanaged = try .initEmpty(allocator, values.count());
+    defer is_used.deinit(allocator);
     var any_errors = false;
     var line_index: u32 = 0;
 @@ -284,18 +287,20 @@ fn render_autoconf(
             continue;
         }
         const name = it.rest();
-        const kv = values_copy.fetchSwapRemove(name) orelse {
+        const index = values.getIndex(name) orelse {
             try step.addError("{s}:{d}: error: unspecified config header value: '{s}'", .{
                 src_path, line_index + 1, name,
             });
             any_errors = true;
             continue;
         };
-        try renderValueC(output, name, kv.value);
+        is_used.set(index);
+        try renderValueC(output, name, values.values()[index]);
     }
-    for (values_copy.keys()) |name| {
+    var unused_value_it = is_used.iterator(.{ .kind = .unset });
-        try step.addError("{s}: error: config header value unused: '{s}'", .{ src_path, name });
+    while (unused_value_it.next()) |index| {
+        try step.addError("{s}: error: config header value unused: '{s}'", .{ src_path, values.keys()[index] });
         any_errors = true;
     }

test/standalone/config_header/config.h+3

...	@@ -12,3 +12,6 @@ int foo();	...	@@ -12,3 +12,6 @@ int foo();
12	#define SOME_ENUM_LITERAL test	12	#define SOME_ENUM_LITERAL test
13	#define SOME_STRING "test"	13	#define SOME_STRING "test"
14		14
		15	// Used twice
		16	#define SOME_TRUE 1
		17

test/standalone/config_header/config.h.in+3