From 071453d5b9a8a48211c4517185df1b41d42107c7 Mon Sep 17 00:00:00 2001
From: xdBronch <51252236+xdBronch@users.noreply.github.com>
Date: Wed, 12 Nov 2025 10:12:07 -0500
Subject: [PATCH] fix 'redundant comptime keyword' error source location and
 add tests

---
 lib/std/zig/AstGen.zig                                | 10 +++++-----
 .../compile_errors/redundant_comptime_keyword.zig     | 11 +++++++++++
 2 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 test/cases/compile_errors/redundant_comptime_keyword.zig

diff --git a/lib/std/zig/AstGen.zig b/lib/std/zig/AstGen.zig
index 88570dc93d..614e3fb917 100644
--- a/lib/std/zig/AstGen.zig
+++ b/lib/std/zig/AstGen.zig
@@ -2117,10 +2117,10 @@ fn comptimeExprAst(
     node: Ast.Node.Index,
 ) InnerError!Zir.Inst.Ref {
     const astgen = gz.astgen;
-    if (gz.is_comptime) {
-        try astgen.appendErrorNode(node, "redundant comptime keyword in already comptime scope", .{});
-    }
     const tree = astgen.tree;
+    if (gz.is_comptime) {
+        try astgen.appendErrorTok(tree.nodeMainToken(node), "redundant comptime keyword in already comptime scope", .{});
+    }
     const body_node = tree.nodeData(node).node;
     return comptimeExpr2(gz, scope, ri, body_node, node, .comptime_keyword);
 }
@@ -3469,7 +3469,7 @@ fn assignDestructure(gz: *GenZir, scope: *Scope, node: Ast.Node.Index) InnerErro
 
     const full = tree.assignDestructure(node);
     if (full.comptime_token != null and gz.is_comptime) {
-        return astgen.appendErrorNode(node, "redundant comptime keyword in already comptime scope", .{});
+        return astgen.appendErrorTok(full.comptime_token.?, "redundant comptime keyword in already comptime scope", .{});
     }
 
     // If this expression is marked comptime, we must wrap the whole thing in a comptime block.
@@ -3525,7 +3525,7 @@ fn assignDestructureMaybeDecls(
 
     const full = tree.assignDestructure(node);
     if (full.comptime_token != null and gz.is_comptime) {
-        try astgen.appendErrorNode(node, "redundant comptime keyword in already comptime scope", .{});
+        try astgen.appendErrorTok(full.comptime_token.?, "redundant comptime keyword in already comptime scope", .{});
     }
 
     const is_comptime = full.comptime_token != null or gz.is_comptime;
diff --git a/test/cases/compile_errors/redundant_comptime_keyword.zig b/test/cases/compile_errors/redundant_comptime_keyword.zig
new file mode 100644
index 0000000000..8f1b1da9be
--- /dev/null
+++ b/test/cases/compile_errors/redundant_comptime_keyword.zig
@@ -0,0 +1,11 @@
+comptime {
+    _ = comptime 0;
+}
+comptime {
+    comptime _, _ = .{ 0, 0 };
+}
+
+// error
+//
+// :2:9: error: redundant comptime keyword in already comptime scope
+// :5:5: error: redundant comptime keyword in already comptime scope