zig

commit 423907c2700ae5812a6abccca8cf6db29c7dad9e (tree)
parent 7e751e8040ad6afb9ae0a040ae4080c2f4b2f443
Author: mlugg <mlugg@mlugg.co.uk>
Date:   Mon, 10 Mar 2025 22:18:56 +0000

Sema: fix handling of `@This()` on opaques

Resolves: #22869

Diffstat:
M
src/Sema.zig
 | 
18
++++++++++++------
M
test/behavior/this.zig
 | 
10
+++++++++-

2 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/Sema.zig b/src/Sema.zig
@@ -17841,11 +17841,18 @@ fn zirThis(
     const zcu = pt.zcu;
     const namespace = pt.zcu.namespacePtr(block.namespace);
 
-    const new_ty = try pt.ensureTypeUpToDate(namespace.owner_type);
-
-    switch (pt.zcu.intern_pool.indexToKey(new_ty)) {
-        .struct_type, .union_type => try sema.declareDependency(.{ .interned = new_ty }),
+    switch (pt.zcu.intern_pool.indexToKey(namespace.owner_type)) {
+        .opaque_type => {
+            // Opaque types are never outdated since they don't undergo type resolution, so nothing to do!
+            return Air.internedToRef(namespace.owner_type);
+        },
+        .struct_type, .union_type => {
+            const new_ty = try pt.ensureTypeUpToDate(namespace.owner_type);
+            try sema.declareDependency(.{ .interned = new_ty });
+            return Air.internedToRef(new_ty);
+        },
         .enum_type => {
+            const new_ty = try pt.ensureTypeUpToDate(namespace.owner_type);
             try sema.declareDependency(.{ .interned = new_ty });
             // Since this is an enum, it has to be resolved immediately.
             // `ensureTypeUpToDate` has resolved the new type if necessary.
@@ -17854,11 +17861,10 @@ fn zirThis(
             if (zcu.failed_analysis.contains(ty_unit) or zcu.transitive_failed_analysis.contains(ty_unit)) {
                 return error.AnalysisFail;
             }
+            return Air.internedToRef(new_ty);
         },
-        .opaque_type => {},
         else => unreachable,
     }
-    return Air.internedToRef(new_ty);
 }
 
 fn zirClosureGet(sema: *Sema, block: *Block, extended: Zir.Inst.Extended.InstData) CompileError!Air.Inst.Ref {
diff --git a/test/behavior/this.zig b/test/behavior/this.zig
@@ -1,4 +1,5 @@
-const expect = @import("std").testing.expect;
+const std = @import("std");
+const expect = std.testing.expect;
 const builtin = @import("builtin");
 
 const module = @This();
@@ -55,3 +56,10 @@ test "this used as optional function parameter" {
     global.enter = prev;
     global.enter(null);
 }
+
+test "@This() in opaque" {
+    const T = opaque {
+        const Self = @This();
+    };
+    comptime std.debug.assert(T.Self == T);
+}