From: David Given <dg@cowlark.com>
Date: Wed, 5 Sep 2018 21:53:08 +0000 (+0200)
Subject: (Slightly) better errors on phi congruence group mismatches.
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=fc0b0ae1780b39b14a226276cf051d2966d629a8;p=ack.git

(Slightly) better errors on phi congruence group mismatches.
---

diff --git a/mach/proto/mcg/pass_phigroups.c b/mach/proto/mcg/pass_phigroups.c
index dfff73faa..e57378ad4 100644
--- a/mach/proto/mcg/pass_phigroups.c
+++ b/mach/proto/mcg/pass_phigroups.c
@@ -36,8 +36,10 @@ static void recursively_associate_group(struct phicongruence* c, struct vreg* vr
         struct constraint* constraint = pmap_findleft(&vreg->defined->constraints, vreg);
         if (c->type == 0)
             c->type = vreg->type;
-            
-        assert(c->type == vreg->type);
+
+        if (c->type != vreg->type)
+            fatal("tried to add register %%%d of type 0x%x to a phi congruence group of type 0x%x",
+                vreg->id, vreg->type, c->type);
 
         array_appendu(&c->definitions, vreg->defined);
     }