motiejus/zig
1
Fork 0
Code Releases Activity

ir: Fix codegen of ?*T types where T is zero-sized

Browse Source 
* Fix codegen for optional types that decay to a pointer, the type
  behaves as a boolean
* Fix comptime evaluation of zero-sized arrays, always initialize the
  internal array elements

Closes #4673
This commit is contained in:
LemonBoy
2020-03-09 20:58:25 +01:00
committed by Andrew Kelley
parent 638d5c3aca
commit 1f44b29724
5 changed files with 77 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/codegen.cpp
View File

@@ -6902,8 +6902,18 @@ check: switch (const_val->special) {
case ZigTypeIdOptional:
{
ZigType *child_type = type_entry->data.maybe.child_type;
if (get_src_ptr_type(type_entry) != nullptr) {
return gen_const_val_ptr(g, const_val, name);
bool has_bits;
if ((err = type_has_bits2(g, child_type, &has_bits)))
codegen_report_errors_and_exit(g);
if (has_bits)
return gen_const_val_ptr(g, const_val, name);
// No bits, treat this value as a boolean
const unsigned bool_val = optional_value_is_null(const_val) ? 0 : 1;
return LLVMConstInt(LLVMInt1Type(), bool_val, false);
} else if (child_type->id == ZigTypeIdErrorSet) {
return gen_const_val_err_set(g, const_val, name);
} else if (!type_has_bits(g, child_type)) {