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

Sema: simplify comptime @intFromPtr logic

Browse source
This commit is contained in:
David Rubin 2025-05-26 12:20:14 -07:00 • committed by Matthew Lugg
parent ef35c3d5fe
commit 3ed9155f10
2 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Sema.zig
View file

@ -2287,19 +2287,6 @@ fn resolveValueResolveLazy(sema: *Sema, inst: Air.Inst.Ref) CompileError!?Value
return try sema.resolveLazyValue((try sema.resolveValue(inst)) orelse return null); return try sema.resolveLazyValue((try sema.resolveValue(inst)) orelse return null);
} }
/// Like `resolveValue`, but any pointer value which does not correspond
/// to a comptime-known integer (e.g. a decl pointer) returns `null`.
/// Lazy values are recursively resolved.
fn resolveValueIntable(sema: *Sema, inst: Air.Inst.Ref) CompileError!?Value {
const val = (try sema.resolveValue(inst)) orelse return null;
if (sema.pt.zcu.intern_pool.getBackingAddrTag(val.toIntern())) |addr| switch (addr) {
.nav, .uav, .comptime_alloc, .comptime_field => return null,
.int => {},
.eu_payload, .opt_payload, .arr_elem, .field => unreachable,
};
return try sema.resolveLazyValue(val);
}
/// Value Tag may be `undef` or `variable`. /// Value Tag may be `undef` or `variable`.
pub fn resolveFinalDeclValue( pub fn resolveFinalDeclValue(
sema: *Sema, sema: *Sema,
@ -10144,14 +10131,19 @@ fn zirIntFromPtr(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!
} }
const len = if (is_vector) operand_ty.vectorLen(zcu) else undefined; const len = if (is_vector) operand_ty.vectorLen(zcu) else undefined;
const dest_ty: Type = if (is_vector) try pt.vectorType(.{ .child = .usize_type, .len = len }) else .usize; const dest_ty: Type = if (is_vector) try pt.vectorType(.{ .child = .usize_type, .len = len }) else .usize;
if (try sema.resolveValueIntable(operand)) |operand_val| ct: {
if (try sema.resolveValue(operand)) |operand_val| ct: {
if (!is_vector) { if (!is_vector) {
if (operand_val.isUndef(zcu)) { if (operand_val.isUndef(zcu)) {
return Air.internedToRef((try pt.undefValue(Type.usize)).toIntern()); return Air.internedToRef((try pt.undefValue(Type.usize)).toIntern());
} }
const addr = try operand_val.getUnsignedIntSema(pt) orelse {
// Wasn't an integer pointer. This is a runtime operation.
break :ct;
};
return Air.internedToRef((try pt.intValue( return Air.internedToRef((try pt.intValue(
Type.usize, Type.usize,
(try operand_val.toUnsignedIntSema(pt)), addr,
)).toIntern()); )).toIntern());
} }
const new_elems = try sema.arena.alloc(InternPool.Index, len); const new_elems = try sema.arena.alloc(InternPool.Index, len);

13
test/cases/compile_errors/int_from_ptr_to_optional.zig Normal file
View file

@ -0,0 +1,13 @@
comptime {
const num: usize = 4;
const y: ?*const usize = #
_ = @intFromPtr(y);
}
// error
// backend=stage2
// target=native
//
// :4:9: error: unable to evaluate comptime expression
// :4:21: note: operation is runtime due to this operand
// :1:1: note: 'comptime' keyword forces comptime evaluation