authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-09-03 21:24:20-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-09-03 21:24:20-04:00
loge82cd53df483aa08354de935879a0f9935ba4a1b
tree67f249e4ac3728682975a97af5cbc47d3eb4b6f0
parenta11e73bee2266d4c568bdf9b23c891ac1365bb09
signaturelock-open Commit is signed but in an unrecognized format.

fix incorrect value for inline loop

09cc1dc66067f378 failed to handle mem_slot_index correctly closes #1436

2 files changed, 28 insertions(+), 11 deletions(-)

src/ir.cpp+19-11
......@@ -17,8 +17,7 @@
1717#include "util.hpp"
1818
1919struct IrExecContext {
20 ConstExprValue *mem_slot_list;
21 size_t mem_slot_count;
20 ZigList<ConstExprValue *> mem_slot_list;
2221};
2322
2423struct IrBuilder {
......@@ -12496,13 +12495,20 @@ static TypeTableEntry *ir_analyze_instruction_decl_var(IrAnalyze *ira, IrInstruc
1249612495 }
1249712496 }
1249812497
12499 if (var->value->type != nullptr && var->value->type != result_type && !is_comptime_var) {
12498 if (var->value->type != nullptr && !is_comptime_var) {
1250012499 // This is at least the second time we've seen this variable declaration during analysis.
1250112500 // This means that this is actually a different variable due to, e.g. an inline while loop.
1250212501 // We make a new variable so that it can hold a different type, and so the debug info can
1250312502 // be distinct.
1250412503 VariableTableEntry *new_var = create_local_var(ira->codegen, var->decl_node, var->child_scope,
1250512504 &var->name, var->src_is_const, var->gen_is_const, var->shadowable, var->is_comptime, true);
12505 new_var->owner_exec = var->owner_exec;
12506 if (var->mem_slot_index != SIZE_MAX) {
12507 ConstExprValue *vals = create_const_vals(1);
12508 new_var->mem_slot_index = ira->exec_context.mem_slot_list.length;
12509 ira->exec_context.mem_slot_list.append(vals);
12510 }
12511
1250612512 var->next_var = new_var;
1250712513 var = new_var;
1250812514 }
......@@ -12525,10 +12531,9 @@ static TypeTableEntry *ir_analyze_instruction_decl_var(IrAnalyze *ira, IrInstruc
1252512531
1252612532 if (casted_init_value->value.special != ConstValSpecialRuntime) {
1252712533 if (var->mem_slot_index != SIZE_MAX) {
12528 assert(var->mem_slot_index < ira->exec_context.mem_slot_count);
12529 ConstExprValue *mem_slot = &ira->exec_context.mem_slot_list[var->mem_slot_index];
12530 copy_const_val(mem_slot, &casted_init_value->value,
12531 !is_comptime_var || var->gen_is_const);
12534 assert(var->mem_slot_index < ira->exec_context.mem_slot_list.length);
12535 ConstExprValue *mem_slot = ira->exec_context.mem_slot_list.at(var->mem_slot_index);
12536 copy_const_val(mem_slot, &casted_init_value->value, !is_comptime_var || var->gen_is_const);
1253212537
1253312538 if (is_comptime_var || (var_class_requires_const && var->gen_is_const)) {
1253412539 ir_build_const_from(ira, &decl_var_instruction->base);
......@@ -13012,8 +13017,8 @@ static IrInstruction *ir_get_var_ptr(IrAnalyze *ira, IrInstruction *instruction,
1301213017 assert(var->owner_exec != nullptr);
1301313018 assert(var->owner_exec->analysis != nullptr);
1301413019 IrExecContext *exec_context = &var->owner_exec->analysis->exec_context;
13015 assert(var->mem_slot_index < exec_context->mem_slot_count);
13016 mem_slot = &exec_context->mem_slot_list[var->mem_slot_index];
13020 assert(var->mem_slot_index < exec_context->mem_slot_list.length);
13021 mem_slot = exec_context->mem_slot_list.at(var->mem_slot_index);
1301713022 }
1301813023 }
1301913024
......@@ -21228,8 +21233,11 @@ TypeTableEntry *ir_analyze(CodeGen *codegen, IrExecutable *old_exec, IrExecutabl
2122821233 ira->new_irb.codegen = codegen;
2122921234 ira->new_irb.exec = new_exec;
2123021235
21231 ira->exec_context.mem_slot_count = ira->old_irb.exec->mem_slot_count;
21232 ira->exec_context.mem_slot_list = create_const_vals(ira->exec_context.mem_slot_count);
21236 ConstExprValue *vals = create_const_vals(ira->old_irb.exec->mem_slot_count);
21237 ira->exec_context.mem_slot_list.resize(ira->old_irb.exec->mem_slot_count);
21238 for (size_t i = 0; i < ira->exec_context.mem_slot_list.length; i += 1) {
21239 ira->exec_context.mem_slot_list.items[i] = &vals[i];
21240 }
2123321241
2123421242 IrBasicBlock *old_entry_bb = ira->old_irb.exec->basic_block_list.at(0);
2123521243 IrBasicBlock *new_entry_bb = ir_get_new_bb(ira, old_entry_bb, nullptr);
test/cases/eval.zig+9
......@@ -665,3 +665,12 @@ fn testVarInsideInlineLoop(args: ...) void {
665665 if (i == 1) assert(x == 42);
666666 }
667667}
668
669test "inline for with same type but different values" {
670 var res: usize = 0;
671 inline for ([]type{ [2]u8, [1]u8, [2]u8 }) |T| {
672 var a: T = undefined;
673 res += a.len;
674 }
675 assert(res == 5);
676}