Ekdohibs
/
zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "contains_comptime_undefined_value should not follow pointers" 

This reverts commit 58b1692182.
master
Jimmi Holst Christensen 2018-06-30 17:35:05 +02:00
parent 58b1692182
commit 616fe798c8
1 changed files with 71 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/analyze.cpp
View File

@ -5296,6 +5296,41 @@ bool contains_comptime_undefined_value(ConstExprValue *value) {
switch (value->type->id) {
case TypeTableEntryIdInvalid:
zig_unreachable();
case TypeTableEntryIdPointer: {
ConstPtrValue *ptr = &value->data.x_ptr;
if (ptr->mut == ConstPtrMutRuntimeVar)
return false;
switch (ptr->special) {
case ConstPtrSpecialInvalid:
zig_unreachable();
case ConstPtrSpecialRef:
return contains_comptime_undefined_value(ptr->data.ref.pointee);
case ConstPtrSpecialBaseArray: {
size_t index = ptr->data.base_array.elem_index;
ConstExprValue *arr = ptr->data.base_array.array_val;
if (arr->special == ConstValSpecialUndef)
return true;
if (arr->data.x_array.special == ConstArraySpecialUndef)
return true;
return contains_comptime_undefined_value(&arr->data.x_array.s_none.elements[index]);
}
case ConstPtrSpecialBaseStruct: {
size_t index = ptr->data.base_struct.field_index;
ConstExprValue *str = ptr->data.base_struct.struct_val;
if (str->special == ConstValSpecialUndef)
return true;
return contains_comptime_undefined_value(&str->data.x_struct.fields[index]);
}
case ConstPtrSpecialFunction: // TODO: Can a fn ptr have an undefined value?
case ConstPtrSpecialDiscard:
case ConstPtrSpecialHardCodedAddr:
return false;
}
}
case TypeTableEntryIdArray: {
ConstArrayValue *arr = &value->data.x_array;
if (arr->special == ConstArraySpecialUndef)
@ -5309,6 +5344,42 @@ bool contains_comptime_undefined_value(ConstExprValue *value) {
}
case TypeTableEntryIdStruct: {
ConstStructValue *str = &value->data.x_struct;
if (value->type->data.structure.is_slice) {
ConstExprValue *len = &str->fields[slice_len_index];
ConstExprValue *ptr = &str->fields[slice_ptr_index];
if (len->special == ConstValSpecialUndef)
return true;
if (ptr->special == ConstValSpecialUndef)
return true;
switch (ptr->data.x_ptr.special) {
case ConstPtrSpecialRef:
return contains_comptime_undefined_value(ptr->data.x_ptr.data.ref.pointee);
case ConstPtrSpecialBaseArray: {
size_t offset = ptr->data.x_ptr.data.base_array.elem_index;
ConstExprValue *arr = ptr->data.x_ptr.data.base_array.array_val;
if (arr->special == ConstValSpecialUndef)
return true;
if (arr->data.x_array.special == ConstArraySpecialUndef)
return true;
uint64_t slice_len = bigint_as_unsigned(&len->data.x_bigint);
for (size_t i = 0; i < slice_len; ++i) {
if (contains_comptime_undefined_value(&arr->data.x_array.s_none.elements[i + offset]))
return true;
}
return false;
}
case ConstPtrSpecialBaseStruct:
case ConstPtrSpecialInvalid:
case ConstPtrSpecialFunction:
case ConstPtrSpecialDiscard:
case ConstPtrSpecialHardCodedAddr:
zig_unreachable();
}
}
for (size_t i = 0; i < value->type->data.structure.src_field_count; ++i) {
if (contains_comptime_undefined_value(&str->fields[i]))
return true;
@ -5329,7 +5400,6 @@ bool contains_comptime_undefined_value(ConstExprValue *value) {
case TypeTableEntryIdUnion:
return contains_comptime_undefined_value(value->data.x_union.payload);
case TypeTableEntryIdPointer:
case TypeTableEntryIdArgTuple:
case TypeTableEntryIdVoid:
case TypeTableEntryIdBool: