ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-07 16:18:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow trivial optimizations for switch statements of typeid

Browse Source
This commit is contained in:
gingerBill
2021-06-09 23:05:37 +01:00
parent 7b88bed098
commit b0e21bd616
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/check_stmt.cpp
+2 -2
View File
@@ -1092,7 +1092,7 @@ void check_switch_stmt(CheckerContext *ctx, Ast *node, u32 mod_flags) {
} }
error_line("\n"); error_line("\n");
error_line("\tSuggestion: Was '#partial switch' wanted? This replaces the previous '#complete switch'.\n"); error_line("\tSuggestion: Was '#partial switch' wanted?\n");
} }
} }
} }
@@ -1324,7 +1324,7 @@ void check_type_switch_stmt(CheckerContext *ctx, Ast *node, u32 mod_flags) {
} }
} }
error_line("\n"); error_line("\n");
error_line("\tSuggestion: Was '#partial switch' wanted? This replaces the previous '#complete switch'.\n"); error_line("\tSuggestion: Was '#partial switch' wanted?\n");
} }
} }
} }
src/llvm_backend.cpp
+19 -7
View File
@@ -4730,8 +4730,14 @@ bool lb_switch_stmt_can_be_trivial_jump_table(AstSwitchStmt *ss, bool *default_f
if (ss->tag == nullptr) { if (ss->tag == nullptr) {
return false; return false;
} }
bool is_typeid = false;
TypeAndValue tv = type_and_value_of_expr(ss->tag); TypeAndValue tv = type_and_value_of_expr(ss->tag);
if (!is_type_integer(core_type(tv.type))) { if (is_type_integer(core_type(tv.type))) {
// okay
} else if (is_type_typeid(tv.type)) {
// okay
is_typeid = true;
} else {
return false; return false;
} }
@@ -4751,7 +4757,8 @@ bool lb_switch_stmt_can_be_trivial_jump_table(AstSwitchStmt *ss, bool *default_f
return false; return false;
} }
if (expr->tav.mode == Addressing_Type) { if (expr->tav.mode == Addressing_Type) {
return false; GB_ASSERT(is_typeid);
continue;
} }
tv = type_and_value_of_expr(expr); tv = type_and_value_of_expr(expr);
if (tv.mode != Addressing_Constant) { if (tv.mode != Addressing_Constant) {
@@ -4780,18 +4787,14 @@ void lb_build_switch_stmt(lbProcedure *p, AstSwitchStmt *ss, Scope *scope) {
} }
lbBlock *done = lb_create_block(p, "switch.done"); // NOTE(bill): Append later lbBlock *done = lb_create_block(p, "switch.done"); // NOTE(bill): Append later
ast_node(body, BlockStmt, ss->body); ast_node(body, BlockStmt, ss->body);
isize case_count = body->stmts.count; isize case_count = body->stmts.count;
Slice<Ast *> default_stmts = {}; Slice<Ast *> default_stmts = {};
lbBlock *default_fall = nullptr; lbBlock *default_fall = nullptr;
lbBlock *default_block = nullptr; lbBlock *default_block = nullptr;
lbBlock *fall = nullptr; lbBlock *fall = nullptr;
bool default_found = false; bool default_found = false;
bool is_trivial = lb_switch_stmt_can_be_trivial_jump_table(ss, &default_found); bool is_trivial = lb_switch_stmt_can_be_trivial_jump_table(ss, &default_found);
@@ -4815,6 +4818,7 @@ void lb_build_switch_stmt(lbProcedure *p, AstSwitchStmt *ss, Scope *scope) {
switch_instr = LLVMBuildSwitch(p->builder, tag.value, end_block, cast(unsigned)num_cases); switch_instr = LLVMBuildSwitch(p->builder, tag.value, end_block, cast(unsigned)num_cases);
} }
for_array(i, body->stmts) { for_array(i, body->stmts) {
Ast *clause = body->stmts[i]; Ast *clause = body->stmts[i];
ast_node(cc, CaseClause, clause); ast_node(cc, CaseClause, clause);
@@ -4847,10 +4851,18 @@ void lb_build_switch_stmt(lbProcedure *p, AstSwitchStmt *ss, Scope *scope) {
Ast *expr = unparen_expr(cc->list[j]); Ast *expr = unparen_expr(cc->list[j]);
if (switch_instr != nullptr) { if (switch_instr != nullptr) {
lbValue on_val = {};
if (expr->tav.mode == Addressing_Type) {
GB_ASSERT(is_type_typeid(tag.type));
lbValue e = lb_typeid(p->module, expr->tav.type);
on_val = lb_emit_conv(p, e, tag.type);
} else {
GB_ASSERT(expr->tav.mode == Addressing_Constant); GB_ASSERT(expr->tav.mode == Addressing_Constant);
GB_ASSERT(!is_ast_range(expr)); GB_ASSERT(!is_ast_range(expr));
lbValue on_val = lb_build_expr(p, expr); on_val = lb_build_expr(p, expr);
}
GB_ASSERT(LLVMIsConstant(on_val.value)); GB_ASSERT(LLVMIsConstant(on_val.value));
LLVMAddCase(switch_instr, on_val.value, body->block); LLVMAddCase(switch_instr, on_val.value, body->block);
continue; continue;