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

Generating TypeInfo's now forces definitions to be resolved.

Browse Source
This commit is contained in:
Alexandros Naskos 2018-04-28 18:38:38 +03:00
parent 61b0180596
commit 9ba400673d
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/ir.cpp
View File

@ -15804,9 +15804,26 @@ static void ir_make_type_info_defs(IrAnalyze *ira, ConstExprValue *out_val, Scop
while ((curr_entry = decl_it.next()) != nullptr) while ((curr_entry = decl_it.next()) != nullptr)
{ {
// Skip comptime blocks. // If the definition is unresolved, force it to be resolved again.
if (curr_entry->value->resolution == TldResolutionUnresolved)
{
resolve_top_level_decl(ira->codegen, curr_entry->value, false, curr_entry->value->source_node);
if (curr_entry->value->resolution != TldResolutionOk)
{
return;
}
}
// Skip comptime blocks and test functions.
if (curr_entry->value->id != TldIdCompTime) if (curr_entry->value->id != TldIdCompTime)
{ {
if (curr_entry->value->id == TldIdFn)
{
FnTableEntry *fn_entry = ((TldFn *)curr_entry->value)->fn_entry;
if (fn_entry->is_test)
continue;
}
definition_count += 1; definition_count += 1;
} }
} }
@ -15825,9 +15842,15 @@ static void ir_make_type_info_defs(IrAnalyze *ira, ConstExprValue *out_val, Scop
int definition_index = 0; int definition_index = 0;
while ((curr_entry = decl_it.next()) != nullptr) while ((curr_entry = decl_it.next()) != nullptr)
{ {
// Skip comptime blocks // Skip comptime blocks and test functions.
if (curr_entry->value->id == TldIdCompTime) if (curr_entry->value->id == TldIdCompTime)
continue; continue;
else if (curr_entry->value->id == TldIdFn)
{
FnTableEntry *fn_entry = ((TldFn *)curr_entry->value)->fn_entry;
if (fn_entry->is_test)
continue;
}
ConstExprValue *definition_val = &definition_array->data.x_array.s_none.elements[definition_index]; ConstExprValue *definition_val = &definition_array->data.x_array.s_none.elements[definition_index];
@ -15878,7 +15901,10 @@ static void ir_make_type_info_defs(IrAnalyze *ira, ConstExprValue *out_val, Scop
{ {
// 2: Data.Fn: Data.FnDef // 2: Data.Fn: Data.FnDef
bigint_init_unsigned(&inner_fields[2].data.x_union.tag, 2); bigint_init_unsigned(&inner_fields[2].data.x_union.tag, 2);
// @TODO Data.FnDef
FnTableEntry *fn_entry = ((TldFn *)curr_entry->value)->fn_entry;
assert(!fn_entry->is_test);
inner_fields[2].data.x_union.payload = nullptr; inner_fields[2].data.x_union.payload = nullptr;
break; break;
} }