diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2017-01-05 19:05:48 -0500 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2017-01-05 19:05:48 -0500 |
| commit | 837cc467f7796bd098acce64f77b82060f4921e4 (patch) | |
| tree | facf21b4501670fa2e87bae28076456ba00b442e /src/ir.cpp | |
| parent | e621ad014e919521268d3e2c94afadbdadadb59f (diff) | |
| download | zig-837cc467f7796bd098acce64f77b82060f4921e4.tar.gz zig-837cc467f7796bd098acce64f77b82060f4921e4.zip | |
pass array access compile error tests
Diffstat (limited to 'src/ir.cpp')
| -rw-r--r-- | src/ir.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/ir.cpp b/src/ir.cpp index 0e918e9a88..824c3ec2a1 100644 --- a/src/ir.cpp +++ b/src/ir.cpp @@ -119,7 +119,7 @@ static void ir_ref_bb(IrBasicBlock *bb) { static void ir_ref_instruction(IrInstruction *instruction, IrBasicBlock *cur_bb) { assert(instruction->id != IrInstructionIdInvalid); instruction->ref_count += 1; - if (instruction->owner_bb != cur_bb) + if (instruction->owner_bb != cur_bb && !instr_is_comptime(instruction)) ir_ref_bb(instruction->owner_bb); } @@ -3112,12 +3112,10 @@ static IrInstruction *ir_gen_bin_op_id(IrBuilder *irb, Scope *scope, AstNode *no static IrInstruction *ir_gen_assign(IrBuilder *irb, Scope *scope, AstNode *node) { IrInstruction *lvalue = ir_gen_node_extra(irb, node->data.bin_op_expr.op1, scope, LValPurposeAssign); - if (lvalue == irb->codegen->invalid_instruction) - return lvalue; - IrInstruction *rvalue = ir_gen_node(irb, node->data.bin_op_expr.op2, scope); - if (rvalue == irb->codegen->invalid_instruction) - return rvalue; + + if (lvalue == irb->codegen->invalid_instruction || rvalue == irb->codegen->invalid_instruction) + return irb->codegen->invalid_instruction; ir_build_store_ptr(irb, scope, node, lvalue, rvalue); return ir_build_const_void(irb, scope, node); |
