authorgravatar for spexguy070@gmail.comMartin Wickham <spexguy070@gmail.com> 2021-07-05 19:41:48-05:00
committergravatar for spexguy070@gmail.comMartin Wickham <spexguy070@gmail.com> 2021-07-05 19:41:48-05:00
log149ecdfe1b5149c46a58dffe670b36319983ad7f
tree206a786670fb24584bf11eb3bacbc2f39ab5faa5
parentb3225a755a78502245bc9c7d7419ebeb67201320

Remove debug checks, audit field accesses

3 files changed, 76 insertions(+), 40 deletions(-)

src/stage1/analyze.cpp+15-12
......@@ -5668,14 +5668,6 @@ static uint32_t hash_combine_const_val(uint32_t hash_val, ZigValue *const_val) {
56685668 if (const_val->special == ConstValSpecialUndef) {
56695669 return hash_val;
56705670 }
5671 // if (const_val->special == ConstValSpecialLazy ||
5672 // const_val->special == ConstValSpecialRuntime) {
5673 // // NO_COMMIT verify this is correct
5674 // return hash_combine(hash_val, &const_val);
5675 // }
5676 if (const_val->special != ConstValSpecialStatic) {
5677 fprintf(stderr, "\nInvalid special: %d\n", const_val->special);
5678 }
56795671 assert(const_val->special == ConstValSpecialStatic);
56805672 hash_val = hash_combine(hash_val, &const_val->type->id);
56815673 switch (const_val->type->id) {
......@@ -5718,13 +5710,13 @@ static uint32_t hash_combine_const_val(uint32_t hash_val, ZigValue *const_val) {
57185710 case ZigTypeIdStruct: {
57195711 size_t field_count = const_val->type->data.structure.src_field_count;
57205712 for (size_t i = 0; i < field_count; i += 1) {
5721 ZigValue *field = const_val->data.x_struct.fields[i];
57225713 if (const_val->type->data.structure.fields[i]->is_comptime) {
57235714 // The values of comptime struct fields are part of the
57245715 // type, not the value, so they do not participate in equality
57255716 // or hash of comptime values.
57265717 continue;
57275718 }
5719 ZigValue *field = const_val->data.x_struct.fields[i];
57285720 hash_val = hash_combine_const_val(hash_val, field);
57295721 }
57305722 return hash_val;
......@@ -6179,7 +6171,8 @@ ZigValue *get_the_one_possible_value(CodeGen *g, ZigType *type_entry) {
61796171 for (size_t i = 0; i < field_count; i += 1) {
61806172 TypeStructField *field = struct_type->data.structure.fields[i];
61816173 if (field->is_comptime) {
6182 copy_const_val(g, result->data.x_struct.fields[i], field->init_val);
6174 // Comptime fields are part of the type, and do not need to
6175 // be initialized.
61836176 continue;
61846177 }
61856178 ZigType *field_type = resolve_struct_field_type(g, field);
......@@ -7958,6 +7951,13 @@ static void init_const_undefined(CodeGen *g, ZigValue *const_val) {
79587951 size_t field_count = wanted_type->data.structure.src_field_count;
79597952 const_val->data.x_struct.fields = alloc_const_vals_ptrs(g, field_count);
79607953 for (size_t i = 0; i < field_count; i += 1) {
7954 TypeStructField *field = wanted_type->data.structure.fields[i];
7955 if (field->is_comptime) {
7956 // Comptime fields are part of the type, and do not need to
7957 // be initialized.
7958 continue;
7959 }
7960
79617961 ZigValue *field_val = const_val->data.x_struct.fields[i];
79627962 field_val->type = resolve_struct_field_type(g, wanted_type->data.structure.fields[i]);
79637963 assert(field_val->type);
......@@ -10174,8 +10174,11 @@ static void dump_value_indent(ZigValue *val, int indent) {
1017410174 for (int j = 0; j < indent; j += 1) {
1017510175 fprintf(stderr, " ");
1017610176 }
10177 fprintf(stderr, "%s: ", buf_ptr(val->type->data.structure.fields[i]->name));
10178 if (val->data.x_struct.fields == nullptr) {
10177 TypeStructField *field = val->type->data.structure.fields[i];
10178 fprintf(stderr, "%s: ", buf_ptr(field->name));
10179 if (field->is_comptime) {
10180 fprintf(stderr, "<comptime field>");
10181 } else if (val->data.x_struct.fields == nullptr) {
1017910182 fprintf(stderr, "<null>\n");
1018010183 } else {
1018110184 dump_value_indent(val->data.x_struct.fields[i], 1);
src/stage1/codegen.cpp+9-3
......@@ -3778,6 +3778,12 @@ static bool value_is_all_undef(CodeGen *g, ZigValue *const_val) {
37783778 case ConstValSpecialStatic:
37793779 if (const_val->type->id == ZigTypeIdStruct) {
37803780 for (size_t i = 0; i < const_val->type->data.structure.src_field_count; i += 1) {
3781 TypeStructField *field = const_val->type->data.structure.fields[i];
3782 if (field->is_comptime) {
3783 // Comptime fields are part of the type, may be uninitialized,
3784 // and should not be inspected.
3785 continue;
3786 }
37813787 if (!value_is_all_undef(g, const_val->data.x_struct.fields[i]))
37823788 return false;
37833789 }
......@@ -7285,7 +7291,7 @@ static LLVMValueRef pack_const_int(CodeGen *g, LLVMTypeRef big_int_type_ref, Zig
72857291 size_t used_bits = 0;
72867292 for (size_t i = 0; i < type_entry->data.structure.src_field_count; i += 1) {
72877293 TypeStructField *field = type_entry->data.structure.fields[i];
7288 if (field->gen_index == SIZE_MAX) {
7294 if (field->gen_index == SIZE_MAX || field->is_comptime) {
72897295 continue;
72907296 }
72917297 LLVMValueRef child_val = pack_const_int(g, big_int_type_ref, const_val->data.x_struct.fields[i]);
......@@ -7573,7 +7579,7 @@ static LLVMValueRef gen_const_val(CodeGen *g, ZigValue *const_val, const char *n
75737579 size_t src_field_index = 0;
75747580 while (src_field_index < src_field_count) {
75757581 TypeStructField *type_struct_field = type_entry->data.structure.fields[src_field_index];
7576 if (type_struct_field->gen_index == SIZE_MAX) {
7582 if (type_struct_field->gen_index == SIZE_MAX || type_struct_field->is_comptime) {
75777583 src_field_index += 1;
75787584 continue;
75797585 }
......@@ -7642,7 +7648,7 @@ static LLVMValueRef gen_const_val(CodeGen *g, ZigValue *const_val, const char *n
76427648 } else {
76437649 for (uint32_t i = 0; i < src_field_count; i += 1) {
76447650 TypeStructField *type_struct_field = type_entry->data.structure.fields[i];
7645 if (type_struct_field->gen_index == SIZE_MAX) {
7651 if (type_struct_field->gen_index == SIZE_MAX || type_struct_field->is_comptime) {
76467652 continue;
76477653 }
76487654 ZigValue *field_val = const_val->data.x_struct.fields[i];
src/stage1/ir.cpp+52-25
......@@ -272,8 +272,8 @@ static bool value_cmp_numeric_val_all(ZigValue *left, Cmp predicate, ZigValue *r
272272static void memoize_field_init_val(CodeGen *codegen, ZigType *container_type, TypeStructField *field);
273273static void value_to_bigfloat(BigFloat *out, ZigValue *val);
274274
275static Error ir_resolve_lazy_recurse(IrAnalyze *ira, AstNode *source_node, ZigValue *val);
276static Error ir_resolve_lazy_recurse_array(IrAnalyze *ira, AstNode *source_node, ZigValue *val, size_t len);
275static Error ir_resolve_lazy_recurse(AstNode *source_node, ZigValue *val);
276static Error ir_resolve_lazy_recurse_array(AstNode *source_node, ZigValue *val, size_t len);
277277
278278
279279static void ir_assert_impl(bool ok, IrInstGen *source_instruction, char const *file, unsigned int line) {
......@@ -558,7 +558,10 @@ static ZigValue *const_ptr_pointee_unchecked_no_isf(CodeGen *g, ZigValue *const_
558558 case ConstPtrSpecialBaseStruct: {
559559 ZigValue *struct_val = const_val->data.x_ptr.data.base_struct.struct_val;
560560 expand_undef_struct(g, struct_val);
561 result = struct_val->data.x_struct.fields[const_val->data.x_ptr.data.base_struct.field_index];
561 size_t field_index = const_val->data.x_ptr.data.base_struct.field_index;
562 assert(struct_val->type->id == ZigTypeIdStruct);
563 assert(!struct_val->type->data.structure.fields[field_index]->is_comptime);
564 result = struct_val->data.x_struct.fields[field_index];
562565 break;
563566 }
564567 case ConstPtrSpecialBaseErrorUnionCode:
......@@ -7022,6 +7025,17 @@ static IrInstGen *ir_analyze_struct_literal_to_struct(IrAnalyze *ira, Scope *sco
70227025 buf_sprintf("field '%s' declared here", buf_ptr(src_field->name)));
70237026 return ira->codegen->invalid_inst_gen;
70247027 }
7028 if (dst_field->is_comptime) {
7029 ErrorMsg *msg = ir_add_error_node(ira, source_node, buf_sprintf("field '%s' in struct '%s' is comptime, it cannot be assigned",
7030 buf_ptr(src_field->name), buf_ptr(&wanted_type->name)));
7031 if (wanted_type->data.structure.decl_node) {
7032 add_error_note(ira->codegen, msg, wanted_type->data.structure.decl_node,
7033 buf_sprintf("struct '%s' declared here", buf_ptr(&wanted_type->name)));
7034 }
7035 add_error_note(ira->codegen, msg, src_field->decl_node,
7036 buf_sprintf("field '%s' declared here", buf_ptr(src_field->name)));
7037 return ira->codegen->invalid_inst_gen;
7038 }
70257039
70267040 src_assert(src_field->decl_node != nullptr, source_node);
70277041 AstNode *existing_assign_node = field_assign_nodes[dst_field->src_index];
......@@ -7066,6 +7080,7 @@ static IrInstGen *ir_analyze_struct_literal_to_struct(IrAnalyze *ira, Scope *sco
70667080
70677081 // look for a default field value
70687082 TypeStructField *field = wanted_type->data.structure.fields[i];
7083 assert(!field->is_comptime); // field_assign_nodes[i] should be null for comptime fields
70697084 memoize_field_init_val(ira->codegen, wanted_type, field);
70707085 if (field->init_val == nullptr) {
70717086 ir_add_error_node(ira, source_node,
......@@ -7101,6 +7116,9 @@ static IrInstGen *ir_analyze_struct_literal_to_struct(IrAnalyze *ira, Scope *sco
71017116
71027117 for (size_t i = 0; i < actual_field_count; i += 1) {
71037118 TypeStructField *field = wanted_type->data.structure.fields[i];
7119 if (field->is_comptime)
7120 continue;
7121
71047122 IrInstGen *field_ptr = ir_analyze_struct_field_ptr(ira, scope, source_node, field, result_loc_inst, wanted_type, true);
71057123 if (type_is_invalid(field_ptr->value->type))
71067124 return ira->codegen->invalid_inst_gen;
......@@ -12762,7 +12780,7 @@ static IrInstGen *ir_analyze_fn_call(IrAnalyze *ira, Scope *scope, AstNode *sour
1276212780 while (scope) {
1276312781 if (scope->id == ScopeIdVarDecl) {
1276412782 ScopeVarDecl *var_scope = (ScopeVarDecl *)scope;
12765 if ((err = ir_resolve_lazy_recurse(ira,
12783 if ((err = ir_resolve_lazy_recurse(
1276612784 var_scope->var->decl_node,
1276712785 var_scope->var->const_value)))
1276812786 {
......@@ -12968,7 +12986,7 @@ static IrInstGen *ir_analyze_fn_call(IrAnalyze *ira, Scope *scope, AstNode *sour
1296812986 for (size_t i = 0; i < generic_id->param_count; i += 1) {
1296912987 ZigValue *generic_param = &generic_id->params[i];
1297012988 if (generic_param->special != ConstValSpecialRuntime) {
12971 if ((err = ir_resolve_lazy_recurse(ira, source_node, generic_param))) {
12989 if ((err = ir_resolve_lazy_recurse(source_node, generic_param))) {
1297212990 return ira->codegen->invalid_inst_gen;
1297312991 }
1297412992 }
......@@ -14912,6 +14930,8 @@ static IrInstGen *ir_analyze_struct_field_ptr(IrAnalyze *ira, Scope *scope, AstN
1491214930 struct_val->data.x_struct.fields = alloc_const_vals_ptrs(ira->codegen, struct_type->data.structure.src_field_count);
1491314931 struct_val->special = ConstValSpecialStatic;
1491414932 for (size_t i = 0; i < struct_type->data.structure.src_field_count; i += 1) {
14933 if (struct_type->data.structure.fields[i]->is_comptime)
14934 continue;
1491514935 ZigValue *field_val = struct_val->data.x_struct.fields[i];
1491614936 field_val->special = ConstValSpecialUndef;
1491714937 field_val->type = resolve_struct_field_type(ira->codegen,
......@@ -18286,7 +18306,9 @@ static ZigValue *get_const_field(IrAnalyze *ira, AstNode *source_node, ZigValue
1828618306{
1828718307 Error err;
1828818308 ensure_field_index(struct_value->type, name, field_index);
18289 ZigValue *val = struct_value->data.x_struct.fields[field_index];
18309 TypeStructField *field = struct_value->type->data.structure.fields[field_index];
18310 ZigValue *val = field->is_comptime ? field->init_val :
18311 struct_value->data.x_struct.fields[field_index];
1829018312 if ((err = ir_resolve_const_val(ira->codegen, ira->new_irb.exec, source_node, val, UndefBad)))
1829118313 return nullptr;
1829218314 return val;
......@@ -22461,7 +22483,7 @@ static void buf_write_value_bytes(CodeGen *codegen, uint8_t *buf, ZigValue *val)
2246122483 size_t src_field_count = val->type->data.structure.src_field_count;
2246222484 for (size_t field_i = 0; field_i < src_field_count; field_i += 1) {
2246322485 TypeStructField *struct_field = val->type->data.structure.fields[field_i];
22464 if (struct_field->gen_index == SIZE_MAX)
22486 if (struct_field->gen_index == SIZE_MAX || struct_field->is_comptime)
2246522487 continue;
2246622488 ZigValue *field_val = val->data.x_struct.fields[field_i];
2246722489 size_t offset = struct_field->offset;
......@@ -22490,6 +22512,10 @@ static void buf_write_value_bytes(CodeGen *codegen, uint8_t *buf, ZigValue *val)
2249022512 size_t used_bits = 0;
2249122513 while (src_i < src_field_count) {
2249222514 TypeStructField *field = val->type->data.structure.fields[src_i];
22515 if (field->is_comptime) {
22516 src_i += 1;
22517 continue;
22518 }
2249322519 assert(field->gen_index != SIZE_MAX);
2249422520 if (field->gen_index != gen_i)
2249522521 break;
......@@ -22638,9 +22664,11 @@ static Error buf_read_value_bytes(IrAnalyze *ira, CodeGen *codegen, AstNode *sou
2263822664 size_t src_field_count = val->type->data.structure.src_field_count;
2263922665 val->data.x_struct.fields = alloc_const_vals_ptrs(codegen, src_field_count);
2264022666 for (size_t field_i = 0; field_i < src_field_count; field_i += 1) {
22667 TypeStructField *struct_field = val->type->data.structure.fields[field_i];
22668 if (struct_field->is_comptime)
22669 continue;
2264122670 ZigValue *field_val = val->data.x_struct.fields[field_i];
2264222671 field_val->special = ConstValSpecialStatic;
22643 TypeStructField *struct_field = val->type->data.structure.fields[field_i];
2264422672 field_val->type = struct_field->type_entry;
2264522673 if (struct_field->gen_index == SIZE_MAX)
2264622674 continue;
......@@ -22673,6 +22701,10 @@ static Error buf_read_value_bytes(IrAnalyze *ira, CodeGen *codegen, AstNode *sou
2267322701 uint64_t bit_offset = 0;
2267422702 while (src_i < src_field_count) {
2267522703 TypeStructField *field = val->type->data.structure.fields[src_i];
22704 if (field->is_comptime) {
22705 src_i += 1;
22706 continue;
22707 }
2267622708 src_assert(field->gen_index != SIZE_MAX, source_node);
2267722709 if (field->gen_index != gen_i)
2267822710 break;
......@@ -25554,7 +25586,7 @@ static Error ir_resolve_lazy_raw(AstNode *source_node, ZigValue *val) {
2555425586 zig_unreachable();
2555525587}
2555625588
25557static Error ir_resolve_lazy_recurse_array(IrAnalyze *ira, AstNode *source_node, ZigValue *val, size_t len) {
25589static Error ir_resolve_lazy_recurse_array(AstNode *source_node, ZigValue *val, size_t len) {
2555825590 Error err;
2555925591 switch (val->data.x_array.special) {
2556025592 case ConstArraySpecialUndef:
......@@ -25566,24 +25598,19 @@ static Error ir_resolve_lazy_recurse_array(IrAnalyze *ira, AstNode *source_node,
2556625598 ZigValue *elems = val->data.x_array.data.s_none.elements;
2556725599
2556825600 for (size_t i = 0; i < len; i += 1) {
25569 if ((err = ir_resolve_lazy_recurse(ira, source_node, &elems[i])))
25601 if ((err = ir_resolve_lazy_recurse(source_node, &elems[i])))
2557025602 return err;
2557125603 }
2557225604
2557325605 return ErrorNone;
2557425606}
2557525607
25576static Error ir_resolve_lazy_recurse(IrAnalyze *ira, AstNode *source_node, ZigValue *val) {
25608static Error ir_resolve_lazy_recurse(AstNode *source_node, ZigValue *val) {
2557725609 Error err;
2557825610 if ((err = ir_resolve_lazy_raw(source_node, val)))
2557925611 return err;
25580 if (val->special == ConstValSpecialRuntime) {
25581 // This shouldn't be possible, it indicates an ICE.
25582 // NO_COMMIT
25583 ir_add_error_node(ira, source_node,
25584 buf_sprintf("This is a bug in the Zig compiler. Runtime value found in comptime known value."));
25585 return ErrorSemanticAnalyzeFail;
25586 }
25612 assert(val->special != ConstValSpecialRuntime);
25613 assert(val->special != ConstValSpecialLazy);
2558725614 if (val->special != ConstValSpecialStatic)
2558825615 return ErrorNone;
2558925616 switch (val->type->id) {
......@@ -25611,12 +25638,12 @@ static Error ir_resolve_lazy_recurse(IrAnalyze *ira, AstNode *source_node, ZigVa
2561125638 zig_panic("TODO: ir_resolve_lazy_recurse ZigTypeIdFnFrame");
2561225639 case ZigTypeIdUnion: {
2561325640 ConstUnionValue *union_val = &val->data.x_union;
25614 return ir_resolve_lazy_recurse(ira, source_node, union_val->payload);
25641 return ir_resolve_lazy_recurse(source_node, union_val->payload);
2561525642 }
2561625643 case ZigTypeIdVector:
25617 return ir_resolve_lazy_recurse_array(ira, source_node, val, val->type->data.vector.len);
25644 return ir_resolve_lazy_recurse_array(source_node, val, val->type->data.vector.len);
2561825645 case ZigTypeIdArray:
25619 return ir_resolve_lazy_recurse_array(ira, source_node, val, val->type->data.array.len);
25646 return ir_resolve_lazy_recurse_array(source_node, val, val->type->data.array.len);
2562025647 case ZigTypeIdStruct:
2562125648 for (size_t i = 0; i < val->type->data.structure.src_field_count; i += 1) {
2562225649 ZigValue *field = val->data.x_struct.fields[i];
......@@ -25625,7 +25652,7 @@ static Error ir_resolve_lazy_recurse(IrAnalyze *ira, AstNode *source_node, ZigVa
2562525652 // they are not part of the value.
2562625653 continue;
2562725654 }
25628 if ((err = ir_resolve_lazy_recurse(ira, source_node, field)))
25655 if ((err = ir_resolve_lazy_recurse(source_node, field)))
2562925656 return err;
2563025657 }
2563125658 return ErrorNone;
......@@ -25635,13 +25662,13 @@ static Error ir_resolve_lazy_recurse(IrAnalyze *ira, AstNode *source_node, ZigVa
2563525662 if (val->data.x_optional == nullptr)
2563625663 return ErrorNone;
2563725664
25638 return ir_resolve_lazy_recurse(ira, source_node, val->data.x_optional);
25665 return ir_resolve_lazy_recurse(source_node, val->data.x_optional);
2563925666 case ZigTypeIdErrorUnion: {
2564025667 bool is_err = val->data.x_err_union.error_set->data.x_err_set != nullptr;
2564125668 if (is_err) {
25642 return ir_resolve_lazy_recurse(ira, source_node, val->data.x_err_union.error_set);
25669 return ir_resolve_lazy_recurse(source_node, val->data.x_err_union.error_set);
2564325670 } else {
25644 return ir_resolve_lazy_recurse(ira, source_node, val->data.x_err_union.payload);
25671 return ir_resolve_lazy_recurse(source_node, val->data.x_err_union.payload);
2564525672 }
2564625673 }
2564725674 }