authorgravatar for alex_naskos@hotmail.comAlexandros Naskos <alex_naskos@hotmail.com> 2018-04-26 14:29:27+03:00
committergravatar for alex_naskos@hotmail.comAlexandros Naskos <alex_naskos@hotmail.com> 2018-04-26 14:29:27+03:00
log7a91e4736a4151bd41b65b6e3b395cc51c443162
tree700ba05610f280b9a4045929b7973d80a53fb58a
parentbb56360bfaa317809bd3c742a655b357bd5b6226

Reset parent on cached TypeInfo values if we need to.

2 files changed, 53 insertions(+), 7 deletions(-)

src/codegen.cpp+2-1
...@@ -6348,7 +6348,6 @@ static void define_builtin_compile_vars(CodeGen *g) {...@@ -6348,7 +6348,6 @@ static void define_builtin_compile_vars(CodeGen *g) {
6348 buf_appendf(contents, "};\n\n");6348 buf_appendf(contents, "};\n\n");
6349 }6349 }
6350 {6350 {
6351 // @TODO Add method info where methods are supported.
6352 // @TODO Add Namespace info.6351 // @TODO Add Namespace info.
6353 buf_appendf(contents,6352 buf_appendf(contents,
6354 "pub const TypeInfo = union(TypeId) {\n"6353 "pub const TypeInfo = union(TypeId) {\n"
...@@ -6449,6 +6448,7 @@ static void define_builtin_compile_vars(CodeGen *g) {...@@ -6449,6 +6448,7 @@ static void define_builtin_compile_vars(CodeGen *g) {
6449 " layout: ContainerLayout,\n"6448 " layout: ContainerLayout,\n"
6450 " tag_type: Int,\n"6449 " tag_type: Int,\n"
6451 " fields: []EnumField,\n"6450 " fields: []EnumField,\n"
6451 " methods: []Method,\n"
6452 " };\n"6452 " };\n"
6453 "\n"6453 "\n"
6454 " pub const UnionField = struct {\n"6454 " pub const UnionField = struct {\n"
...@@ -6461,6 +6461,7 @@ static void define_builtin_compile_vars(CodeGen *g) {...@@ -6461,6 +6461,7 @@ static void define_builtin_compile_vars(CodeGen *g) {
6461 " layout: ContainerLayout,\n"6461 " layout: ContainerLayout,\n"
6462 " tag_type: ?Enum,\n"6462 " tag_type: ?Enum,\n"
6463 " fields: []UnionField,\n"6463 " fields: []UnionField,\n"
6464 " methods: []Method,\n"
6464 " };\n"6465 " };\n"
6465 "\n"6466 "\n"
6466 " pub const CallingConvention = enum {\n"6467 " pub const CallingConvention = enum {\n"
src/ir.cpp+51-6
...@@ -15810,17 +15810,61 @@ static TypeTableEntry *ir_type_info_get_type(IrAnalyze *ira, const char *type_na...@@ -15810,17 +15810,61 @@ static TypeTableEntry *ir_type_info_get_type(IrAnalyze *ira, const char *type_na
15810static ConstExprValue *ir_make_type_info_value(IrAnalyze *ira, ConstExprValue *parent,15810static ConstExprValue *ir_make_type_info_value(IrAnalyze *ira, ConstExprValue *parent,
15811 ssize_t parent_field_index, TypeTableEntry *type_entry)15811 ssize_t parent_field_index, TypeTableEntry *type_entry)
15812{15812{
15813 assert(type_entry != nullptr);
15814 assert(!type_is_invalid(type_entry));
15815
15813 // Lookup an available value in our cache.15816 // Lookup an available value in our cache.
15814 auto entry = ira->codegen->type_info_cache.maybe_get(type_entry);15817 auto entry = ira->codegen->type_info_cache.maybe_get(type_entry);
15815 if (entry != nullptr)15818 if (entry != nullptr)
15816 return entry->value;15819 {
15820 // Override the parent if we need to.
15821 ConstExprValue *result = entry->value;
1581715822
15818 ConstExprValue *result = nullptr;15823 assert(result->type->id == TypeTableEntryIdStruct);
1581915824
15820 // @TODO15825 ConstParent *curr_parent = &result->data.x_struct.parent;
15821 // We should probably cache the values generated with a type_entry key.15826 if (curr_parent->id == ConstParentIdStruct)
15822 assert(type_entry != nullptr);15827 {
15823 assert(!type_is_invalid(type_entry));15828 if (curr_parent->data.p_struct.struct_val == parent &&
15829 parent_field_index != -1 &&
15830 curr_parent->data.p_struct.field_index == (size_t)parent_field_index)
15831 {
15832 return result;
15833 }
15834 ConstExprValue *new_result = create_const_vals(1);
15835 copy_const_val(new_result, result, true);
15836 ir_type_info_struct_set_parent(new_result, parent, parent_field_index);
15837 return new_result;
15838 }
15839 else if (curr_parent->id == ConstParentIdUnion)
15840 {
15841 if (curr_parent->data.p_union.union_val == parent)
15842 {
15843 return result;
15844 }
15845 ConstExprValue *new_result = create_const_vals(1);
15846 copy_const_val(new_result, result, true);
15847 ir_type_info_struct_set_parent(new_result, parent, parent_field_index);
15848 return new_result;
15849 }
15850 else if (curr_parent->id == ConstParentIdNone)
15851 {
15852 if (parent->type->id != TypeTableEntryIdStruct &&
15853 parent->type->id != TypeTableEntryIdArray &&
15854 parent->type->id != TypeTableEntryIdUnion)
15855 {
15856 return result;
15857 }
15858 ConstExprValue *new_result = create_const_vals(1);
15859 copy_const_val(new_result, result, true);
15860 ir_type_info_struct_set_parent(new_result, parent, parent_field_index);
15861 return new_result;
15862 }
15863
15864 return result;
15865 }
15866
15867 ConstExprValue *result = nullptr;
1582415868
15825 switch (type_entry->id)15869 switch (type_entry->id)
15826 {15870 {
...@@ -16042,6 +16086,7 @@ static ConstExprValue *ir_make_type_info_value(IrAnalyze *ira, ConstExprValue *p...@@ -16042,6 +16086,7 @@ static ConstExprValue *ir_make_type_info_value(IrAnalyze *ira, ConstExprValue *p
16042 zig_unreachable();16086 zig_unreachable();
16043 }16087 }
1604416088
16089 // Cache the returned value.
16045 assert(result != nullptr);16090 assert(result != nullptr);
16046 ira->codegen->type_info_cache.put(type_entry, result);16091 ira->codegen->type_info_cache.put(type_entry, result);
16047 return result;16092 return result;