Commit 83a668b9ca

Andrew Kelley <superjoe30@gmail.com>
2016-12-18 06:25:07
IR: unreachable has lowest priority when resolving peer types
master
1 parent 9f08bfb
Changed files (1)
src
ir.cpp
src/ir.cpp
@@ -4248,6 +4248,10 @@ static TypeTableEntry *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_nod
         TypeTableEntry *prev_type = prev_inst->type_entry;
         if (cur_type->id == TypeTableEntryIdInvalid) {
             return cur_type;
+        } else if (prev_type->id == TypeTableEntryIdUnreachable) {
+            prev_inst = cur_inst;
+        } else if (cur_type->id == TypeTableEntryIdUnreachable) {
+            continue;
         } else if (prev_type->id == TypeTableEntryIdPureError) {
             prev_inst = cur_inst;
             continue;
@@ -4265,10 +4269,6 @@ static TypeTableEntry *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_nod
         } else if (types_match_const_cast_only(cur_type, prev_type)) {
             prev_inst = cur_inst;
             continue;
-        } else if (prev_type->id == TypeTableEntryIdUnreachable) {
-            prev_inst = cur_inst;
-        } else if (cur_type->id == TypeTableEntryIdUnreachable) {
-            continue;
         } else if (prev_type->id == TypeTableEntryIdInt &&
                    cur_type->id == TypeTableEntryIdInt &&
                    prev_type->data.integral.is_signed == cur_type->data.integral.is_signed)