zig

commit 8878f085dccaf9efe89a04b458205fddc215e095 (tree)
parent f6aaab9406807305c2b48fcd742449c9e91f1851
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Tue,  1 Mar 2022 15:26:31 -0700

Sema: correct implementation of comptimeOnly for tuples

This makes formatted printing work when mixing comptime and runtime
fields.

Diffstat:
M
src/Sema.zig
 | 
5
+++--
M
src/type.zig
 | 
5
+++--
M
test/behavior/tuple.zig
 | 
2
+-

3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/Sema.zig b/src/Sema.zig
@@ -19585,8 +19585,9 @@ fn typeRequiresComptime(sema: *Sema, block: *Block, src: LazySrcLoc, ty: Type) C
 
         .tuple => {
             const tuple = ty.castTag(.tuple).?.data;
-            for (tuple.types) |field_ty| {
-                if (try sema.typeRequiresComptime(block, src, field_ty)) {
+            for (tuple.types) |field_ty, i| {
+                const have_comptime_val = tuple.values[i].tag() != .unreachable_value;
+                if (!have_comptime_val and try sema.typeRequiresComptime(block, src, field_ty)) {
                     return true;
                 }
             }
diff --git a/src/type.zig b/src/type.zig
@@ -4050,8 +4050,9 @@ pub const Type = extern union {
 
             .tuple => {
                 const tuple = ty.castTag(.tuple).?.data;
-                for (tuple.types) |field_ty| {
-                    if (field_ty.comptimeOnly()) return true;
+                for (tuple.types) |field_ty, i| {
+                    const have_comptime_val = tuple.values[i].tag() != .unreachable_value;
+                    if (!have_comptime_val and field_ty.comptimeOnly()) return true;
                 }
                 return false;
             },
diff --git a/test/behavior/tuple.zig b/test/behavior/tuple.zig
@@ -45,7 +45,7 @@ test "tuple multiplication" {
     comptime try S.doTheTest();
 }
 
-test "tuple concatenation" {
+test "more tuple concatenation" {
     if (builtin.zig_backend != .stage1) return error.SkipZigTest; // TODO
 
     const T = struct {