mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 05:44:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Sema: fix handling of @This() on opaques

Browse source 
Resolves: #22869
This commit is contained in:
mlugg 2025-03-10 22:18:56 +00:00 • committed by Matthew Lugg
parent 7e751e8040
commit 423907c270
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/Sema.zig
View file

@ -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 {

10
test/behavior/this.zig
View file

@ -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);
}