mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-06-08 03:24:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compound literals for constant procedure fields

Browse Source
This commit is contained in:
gingerBill
2020-06-11 16:11:54 +01:00
parent 82b559c32b
commit 01d12770fa
3 changed files with 46 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ir.cpp
View File

@@ -1615,10 +1615,10 @@ irDefer ir_add_defer_proc(irProcedure *proc, isize scope_index, irValue *deferre
}
void ir_check_compound_lit_constant(irModule *m, Ast *expr) {
irValue *ir_check_compound_lit_constant(irModule *m, Ast *expr) {
expr = unparen_expr(expr);
if (expr == nullptr) {
return;
return nullptr;
}
if (expr->kind == Ast_CompoundLit) {
ast_node(cl, CompoundLit, expr);
@@ -1633,8 +1633,9 @@ void ir_check_compound_lit_constant(irModule *m, Ast *expr) {
}
}
if (expr->kind == Ast_ProcLit) {
ir_gen_anonymous_proc_lit(m, str_lit("_proclit"), expr);
return ir_gen_anonymous_proc_lit(m, str_lit("_proclit"), expr);
}
return nullptr;
}
irValue *ir_add_module_constant(irModule *m, Type *type, ExactValue value) {
@@ -1674,7 +1675,11 @@ irValue *ir_add_module_constant(irModule *m, Type *type, ExactValue value) {
}
if (value.kind == ExactValue_Compound) {
ir_check_compound_lit_constant(m, value.value_compound);
// NOTE(bill): Removed for numerous reasons
irValue *lit = ir_check_compound_lit_constant(m, value.value_compound);
if (lit != nullptr) {
return lit;
}
}
return ir_value_constant(type, value);
@@ -6530,6 +6535,11 @@ void ir_pop_target_list(irProcedure *proc) {
irValue *ir_gen_anonymous_proc_lit(irModule *m, String prefix_name, Ast *expr, irProcedure *proc) {
auto *found = map_get(&m->anonymous_proc_lits, hash_pointer(expr));
if (found != nullptr) {
return *found;
}
ast_node(pl, ProcLit, expr);
// NOTE(bill): Generate a new name