zig

commit 83a668b9caac7a9ae7ed2b2e9bf87f34ec2ab1eb (tree)
parent 9f08bfb38ddbe4b066953d68f2f10e9d83ad4e74
Author: Andrew Kelley <superjoe30@gmail.com>
Date:   Sun, 18 Dec 2016 00:25:07 -0500

IR: unreachable has lowest priority when resolving peer types

Diffstat:
M
src/ir.cpp
 | 
8
++++----

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/ir.cpp b/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)