diff --git a/src/ir.cpp b/src/ir.cpp index 8e1a974359..669de6e281 100644 --- a/src/ir.cpp +++ b/src/ir.cpp @@ -11119,10 +11119,9 @@ static TypeTableEntry *ir_analyze_instruction_unwrap_maybe(IrAnalyze *ira, ConstExprValue *val = ir_resolve_const(ira, value, UndefBad); if (!val) return ira->codegen->builtin_types.entry_invalid; - assert(val->data.x_ptr.special == ConstPtrSpecialRef); - ConstExprValue *maybe_val = val->data.x_ptr.data.ref.pointee; + ConstExprValue *maybe_val = const_ptr_pointee(ira->codegen, val); - if (maybe_val->special != ConstValSpecialRuntime) { + if (val->data.x_ptr.mut != ConstPtrMutRuntimeVar) { if (!maybe_val->data.x_maybe) { ir_add_error(ira, &unwrap_maybe_instruction->base, buf_sprintf("unable to unwrap null")); return ira->codegen->builtin_types.entry_invalid; diff --git a/test/cases/null.zig b/test/cases/null.zig index 2b3b9aa13e..484e3a076c 100644 --- a/test/cases/null.zig +++ b/test/cases/null.zig @@ -122,3 +122,24 @@ fn bar(x: ?void) -> ?void { return null; } } + + + +const StructWithNullable = struct { + field: ?i32, +}; + +var struct_with_nullable: StructWithNullable = undefined; + +test "unwrap nullable which is field of global var" { + struct_with_nullable.field = null; + if (struct_with_nullable.field) |payload| { + unreachable; + } + struct_with_nullable.field = 1234; + if (struct_with_nullable.field) |payload| { + assert(payload == 1234); + } else { + unreachable; + } +}