authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-12-05 22:39:36-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-12-05 22:39:36-05:00
log249cb2aa30bbdd0c30f24ef18097e3b1cd3e0da5
tree99ddfe68d9814a30323c53dc8e8c7399cbe06186
parentf464fe14f4ece387935dbe2bb6b73ecf466c3f83

fix regressions from previous commit

c49ee9f632dd5ee7f341e9093234f39c19a32115 broke the tests and this fixes them

1 files changed, 3 insertions(+), 3 deletions(-)

src/ir.cpp+3-3
...@@ -7526,6 +7526,7 @@ static TypeTableEntry *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_nod...@@ -7526,6 +7526,7 @@ static TypeTableEntry *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_nod
75267526
7527 if (prev_type->id == TypeTableEntryIdUnreachable) {7527 if (prev_type->id == TypeTableEntryIdUnreachable) {
7528 prev_inst = cur_inst;7528 prev_inst = cur_inst;
7529 continue;
7529 }7530 }
75307531
7531 if (cur_type->id == TypeTableEntryIdUnreachable) {7532 if (cur_type->id == TypeTableEntryIdUnreachable) {
...@@ -7574,12 +7575,11 @@ static TypeTableEntry *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_nod...@@ -7574,12 +7575,11 @@ static TypeTableEntry *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_nod
7574 continue;7575 continue;
7575 }7576 }
75767577
7577 if (prev_type->id == TypeTableEntryIdFloat &&7578 if (prev_type->id == TypeTableEntryIdFloat && cur_type->id == TypeTableEntryIdFloat) {
7578 cur_type->id == TypeTableEntryIdFloat)
7579 {
7580 if (cur_type->data.floating.bit_count > prev_type->data.floating.bit_count) {7579 if (cur_type->data.floating.bit_count > prev_type->data.floating.bit_count) {
7581 prev_inst = cur_inst;7580 prev_inst = cur_inst;
7582 }7581 }
7582 continue;
7583 }7583 }
75847584
7585 if (prev_type->id == TypeTableEntryIdErrorUnion &&7585 if (prev_type->id == TypeTableEntryIdErrorUnion &&